Fix Solaris break for case-sensitive file name

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

mozilla/extensions/psm-glue/Makefile.in

@@ -1,29 +1,32 @@
-#!nmake
-# 
-# The contents of this file are subject to the Mozilla Public
+#
+# 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/MPL/
-# 
+# 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) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s): 
-# Srilatha Moturi <srilatha@netscape.com>
 #
+# 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=..\..\..\..
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
 
-include <$(DEPTH)\config\rules.mak>
+include $(DEPTH)/config/autoconf.mk
+
+DIRS		= public src res
+
+include $(topsrcdir)/config/rules.mk
 
-chrome::
-    $(REGCHROME) content messenger-mapi messenger.jar

mozilla/extensions/psm-glue/makefile.win

@@ -17,11 +17,11 @@
 # Copyright (C) 1998 Netscape Communications Corporation. All
 # Rights Reserved.
 #
-# Contributor(s): Srilatha Moturi  <srilatha@netscape.com>
-#                 Krishna Mohan Khandrika <kkhandrika@netscape.com>
+# Contributor(s): 
 
 DEPTH=..\..
+include <$(DEPTH)/config/config.mak>
 
-DIRS=mapihook resources mapiDll
+DIRS = public src res
 
 include <$(DEPTH)\config\rules.mak>

mozilla/extensions/psm-glue/public/MANIFEST

@@ -0,0 +1,4 @@
+nsIPSMComponent.idl
+nsIPSMUIHandler.idl
+nsISecureBrowserUI.idl
+nsISSLSocketProvider.idl

mozilla/extensions/psm-glue/public/Makefile.in

@@ -0,0 +1,45 @@
+#
+# 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): 
+#   Hubbie Shaw
+#   Doug Turner <dougt@netscape.com>
+#   Terry Hayes <thayes@netscape.com>
+# 
+
+MODULE = psmglue
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+XPIDLSRCS = \
+	nsIPSMComponent.idl \
+	nsIPSMUIHandler.idl \
+	nsISecureBrowserUI.idl \
+    nsIPSMSocketInfo.idl \
+	nsISSLSocketProvider.idl \
+	nsISecretDecoderRing.idl \
+	$(NULL)
+
+PREF_JS_EXPORTS	= $(srcdir)/psm-glue.js
+
+include $(topsrcdir)/config/rules.mk

mozilla/extensions/psm-glue/public/makefile.win

@@ -0,0 +1,53 @@
+#!nmake
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+# 
+# Contributor(s):
+#   Hubbie Shaw
+#   Doug Turner <dougt@netscape.com>
+#   Terry Hayes <thayes@netscape.com>
+#
+
+MODULE = psmglue
+
+DEPTH=..\..\..
+IGNORE_MANIFEST=1
+
+DLLNAME       = psmglue
+PDBFILE       = $(DLLNAME).pdb
+MAPFILE       = $(DLLNAME).map
+DLL           = .\$(OBJDIR)\$(DLLNAME).dll
+MAKE_OBJ_TYPE = DLL
+
+include <$(DEPTH)/config/config.mak>
+
+XPIDL_INCLUDES=-I$(DEPTH)\..\mozilla\dist\idl
+
+XPIDLSRCS= \
+    .\nsIPSMComponent.idl \
+    .\nsIPSMUIHandler.idl \
+    .\nsISecureBrowserUI.idl \
+    .\nsISSLSocketProvider.idl \
+    .\nsIPSMSocketInfo.idl \
+    .\nsISecretDecoderRing.idl \
+    $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+install::
+    $(MAKE_INSTALL) .\psm-glue.js $(DIST)\bin\defaults\pref

mozilla/extensions/psm-glue/public/nsIPSMComponent.idl

@@ -0,0 +1,58 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+ *   Mitch Stoltz <mstoltz@netscape.com>
+*/
+
+#include "nsISupports.idl"
+interface nsIPrincipal;
+
+%{C++
+#include "cmtcmn.h"
+%}
+
+[ptr] native nsCMTControlStar(CMT_CONTROL);
+
+[scriptable, uuid(9e482670-5412-11d3-bbc8-0000861d1237)]
+interface nsIPSMComponent : nsISupports 
+{
+
+  [noscript] nsCMTControlStar getControlConnection( );
+
+  /**
+   *  Display the Security Advisor.  PickledStatus and hostName can be null. 
+   *  If they are, the "Selected Info" dialog will be empty.
+   */
+
+  void displaySecurityAdvisor(in string pickledStatus, in string hostName);
+
+  /**
+   *  This will send PSM all preferences that we know about.
+   */
+  void passPrefs();
+};
+
+%{C++
+#define PSM_COMPONENT_PROGID "component://netscape/psm"
+#define PSM_COMPONENT_CLASSNAME "Mozilla PSM Component"
+%}
+

mozilla/extensions/psm-glue/public/nsIPSMSocketInfo.idl

@@ -0,0 +1,50 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Doug Turner <dougt@netscape.com>
+*/
+
+#include "nsISupports.idl"
+
+%{C++
+#include "cmtcmn.h"
+#include "nsPSMShimLayer.h"
+%}
+
+[ptr] native psmtControlStar(CMT_CONTROL);
+[ptr] native cmSocketStar(CMSocket);
+[ptr] native nsFileDescStar(PRFileDesc);
+
+[noscript, uuid(deeb8dfc-fb7a-11d3-ac84-00c04fa0d26b)]
+interface nsIPSMSocketInfo : nsISupports {
+    
+    readonly attribute string           hostName;
+    readonly attribute PRInt32          hostPort;
+    
+    readonly attribute string           proxyName;
+    readonly attribute PRInt32          proxyPort;
+
+    readonly attribute psmtControlStar  controlPtr;
+    readonly attribute cmSocketStar     socketPtr;
+    readonly attribute nsFileDescStar   fileDescPtr;
+    
+    void getPickledStatus(out charPtr pickledStatus);
+};
+

mozilla/extensions/psm-glue/public/nsIPSMUIHandler.idl

@@ -0,0 +1,36 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Mozilla browser.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications, Inc.  Portions created by Netscape are
+ * Copyright (C) 1999, Mozilla.  All Rights Reserved.
+ * 
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+ */
+
+#include "nsISupports.idl"
+
+[scriptable, uuid(d92be9b0-601b-11d3-8c4a-000064657374)]
+interface nsIPSMUIHandler : nsISupports
+{
+    void DisplayURI(in long width, in long height, in PRBool modal, in string urlStr);
+    void PromptForFile(in wstring prompt, in string fileRegEx, in boolean shouldFileExist, out string outFile);
+};
+
+%{C++
+#define PSM_UI_HANLDER_PROGID "component://netscape/psm/ui"
+#define PSM_UI_HANLDER_CLASSNAME "Mozilla PSM UI Handler"
+%}

mozilla/extensions/psm-glue/public/nsISSLSocketProvider.idl

@@ -0,0 +1,35 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+*/
+
+#include "nsISocketProvider.idl"
+
+[noscript, uuid(856a93d0-5415-11d3-bbc8-0000861d1237)]
+interface nsISSLSocketProvider : nsISocketProvider {
+};
+
+%{C++
+#define NS_ISSLSOCKETPROVIDER_PROGID     NS_NETWORK_SOCKET_PROGID_PREFIX "ssl"
+#define NS_ISSLSOCKETPROVIDER_CLASSNAME  "Mozilla SSL Socket Provider Component"
+
+%}

mozilla/extensions/psm-glue/public/nsISecretDecoderRing.idl

@@ -0,0 +1,63 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *  thayes@netscape.com
+ *
+ */
+
+#include "nsISupports.idl"
+
+/* Buffer type - for storing 8-bit octet values */
+[ptr] native buffer(unsigned char);
+
+[scriptable, uuid(0EC80360-075C-11d4-9FD4-00C04F1B83D8)]
+interface nsISecretDecoderRing: nsISupports {
+
+  /* Encrypt a buffer - callable only from C++ */
+  [noscript] long encrypt(in buffer data, in long dataLen, out buffer result);
+
+  /* Decrypt a buffer - callable only from C++ */
+  [noscript] long decrypt(in buffer data, in long dataLen, out buffer result);
+
+  /* Encrypt nul-terminated string to BASE64 output */
+  string encryptString(in string text);
+
+  /* Decrypt BASE64 input to nul-terminated string output */
+  /* There is no check for embedded nul values in the decrypted output */
+  string decryptString(in string crypt);
+
+  /* Prompt the user to change the password on the SDR key */
+  void changePassword();
+
+  /* Logout of the security device that protects the SDR key */
+  void logout();
+};
+
+/*
+ * Configuration interface for the Secret Decoder Ring
+ *  - this interface allows setting the window that will be
+ *    used as parent for dialog windows (such as password prompts)
+ */
+[scriptable, uuid(01D8C0F0-0CCC-11d4-9FDD-000064657374)]
+interface nsISecretDecoderRingConfig: nsISupports {
+  void setWindow(in nsISupports w);
+};
+
+

mozilla/extensions/psm-glue/public/nsISecureBrowserUI.idl

@@ -0,0 +1,44 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+*/
+
+#include "nsISupports.idl"
+
+interface nsIDOMWindow;
+interface nsIDOMElement;
+
+[scriptable, uuid(081e31e0-a144-11d3-8c7c-00609792278c)]
+interface nsSecureBrowserUI : nsISupports
+{
+	void init(in nsIDOMWindow window, in nsIDOMElement button);
+    void displayPageInfoUI();
+};
+
+%{C++
+#define NS_SECURE_BROWSER_UI_PROGID "component://netscape/secure_browser_ui"
+#define NS_SECURE_BROWSER_UI_CLASSNAME "Mozilla Secure Browser UI Handler"
+
+#define NS_SECURE_BROWSER_UI_CID \
+{ 0x10fe7ea0, 0xa10a, 0x11d3, {0x8c, 0x7c, 0x00, 0x60, 0x97, 0x92, 0x27, 0x8c}}
+
+%}

mozilla/extensions/psm-glue/public/psm-glue.js

@@ -0,0 +1,11 @@
+pref("general.useragent.security",       "U");
+
+pref("security.enable_ssl2",             true);
+pref("security.enable_ssl3",             true);
+pref("security.default_personal_cert",   "Select Automatically");
+pref("security.ask_for_password",        0);
+pref("security.password_lifetime",       30);
+pref("security.warn_entering_secure",    true);
+pref("security.warn_leaving_secure",     true);
+pref("security.warn_viewing_mixed",      true);
+pref("security.warn_submit_insecure",    true);

mozilla/extensions/psm-glue/res/Makefile.in

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

mozilla/extensions/psm-glue/res/content/MANIFEST

@@ -0,0 +1,3 @@
+securityOverlay.xul
+securityUI.js
+PSMTaskMenu.xul

mozilla/extensions/psm-glue/res/content/Makefile.in

@@ -0,0 +1,38 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+# 
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+include $(topsrcdir)/config/rules.mk
+
+COMMUNICATOR_CONTENT_DIR = $(DIST)/bin/chrome/packages/core/communicator/content/
+COMMUNICATOR_EXPORT_CONTENT = \
+  $(srcdir)/securityOverlay.xul \
+  $(srcdir)/securityUI.js       \
+  $(srcdir)/PSMTaskMenu.xul \
+  $(NULL)
+
+install::
+	$(INSTALL) $(COMMUNICATOR_EXPORT_CONTENT) $(COMMUNICATOR_CONTENT_DIR)

mozilla/extensions/psm-glue/res/content/PSMTaskMenu.xul

@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE window SYSTEM "chrome://communicator/locale/PSMTaskMenu.dtd" >
+
+<overlay id="psmTaskMenuID"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <script language="JavaScript">
+    function displaySecurityAdvisor()
+    {
+      var psm = Components.classes["component://netscape/psm"].getService();
+      psm = psm.QueryInterface(Components.interfaces.nsIPSMComponent);
+      psm.displaySecurityAdvisor( null, null );
+    }
+  </script>
+
+  <menupopup id="personalManagers">
+    <menuitem id="PSMMentItem" position="1" value="&PSMCmd.label;" oncommand="displaySecurityAdvisor()"/>
+  </menupopup>
+
+</overlay>

mozilla/extensions/psm-glue/res/content/makefile.win

@@ -0,0 +1,35 @@
+#!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=..\..\..\..
+include <$(DEPTH)/config/config.mak>
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(DLL)
+    $(MAKE_INSTALL) securityOverlay.xul     $(DIST)\bin\chrome\packages\core\communicator\content
+    $(MAKE_INSTALL) securityUI.js           $(DIST)\bin\chrome\packages\core\communicator\content
+    $(MAKE_INSTALL) PSMTaskMenu.xul	$(DIST)\bin\chrome\packages\core\communicator\content
+    
+clobber::
+    $(RM) $(DIST)\bin\chrome\packages\core\communicator\content\securityOverlay.xul
+    $(RM) $(DIST)\bin\chrome\packages\core\communicator\content\securityUI.js
+    $(RM) $(DIST)\bin\chrome\packages\core\communicator\content\PSMTaskMenu.xul
+

mozilla/extensions/psm-glue/res/content/securityOverlay.xul

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://communicator/skin/securityOverlay.css" type="text/css"?> 
+
+<!DOCTYPE window SYSTEM "chrome://communicator/locale/securityOverlay.dtd">
+
+<overlay id="NavSecurityOverlay"
+         xmlns:html="http://www.w3.org/TR/REC-html40"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <script language="JavaScript" src="chrome://communicator/content/securityUI.js" />
+
+  <statusbarpanel id="security-button" onclick="displayPageInfo()" tooltip="aToolTip" tooltiptext="&lockIcon.label;"/>    
+      
+</overlay>

mozilla/extensions/psm-glue/res/content/securityUI.js

@@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+*/
+
+window.addEventListener("load", SetSecurityButton, false);
+
+var securityUI;
+
+function SetSecurityButton()
+{
+    dump("in SetSecurityButton\n");
+
+    var ui = Components.classes["component://netscape/secure_browser_ui"].createInstance();
+    securityUI = ui.QueryInterface(Components.interfaces.nsSecureBrowserUI);
+
+    var button  = document.getElementById('security-button');
+	if (button && window.content)
+		securityUI.init(window.content, button);
+}
+
+function displayPageInfo()
+{
+   if (securityUI)
+     securityUI.displayPageInfoUI();
+}
+
+

mozilla/extensions/psm-glue/res/locale/Makefile.in

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

mozilla/extensions/psm-glue/res/locale/en-US/MANIFEST

@@ -0,0 +1,3 @@
+PSMTaskMenu.dtd
+securityOverlay.dtd
+security.properties

mozilla/extensions/psm-glue/res/locale/en-US/Makefile.in

@@ -0,0 +1,41 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+COMMUNICATOR_RESOURCE_CONTENT = \
+	$(srcdir)/PSMTaskMenu.dtd \
+	$(srcdir)/security.properties \
+	$(srcdir)/securityOverlay.dtd \
+	$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+
+install:: 
+	$(INSTALL) $(COMMUNICATOR_RESOURCE_CONTENT) $(DIST)/bin/chrome/locales/en-US/communicator/locale
+
+
+

mozilla/extensions/psm-glue/res/locale/en-US/PSMTaskMenu.dtd

@@ -0,0 +1 @@
+<!ENTITY PSMCmd.label     "Security Manager">

mozilla/extensions/psm-glue/res/locale/en-US/makefile.win

@@ -0,0 +1,37 @@
+#!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=..\..\..\..\..
+
+include <$(DEPTH)\config\rules.mak>
+
+COMMUNICATOR_DIST=$(DIST)\bin\chrome\locales\en-US\communicator\locale
+
+
+install::
+	$(MAKE_INSTALL) PSMTaskMenu.dtd $(COMMUNICATOR_DIST)
+	$(MAKE_INSTALL) security.properties $(COMMUNICATOR_DIST)
+	$(MAKE_INSTALL) securityOverlay.dtd $(COMMUNICATOR_DIST)
+
+clobber::
+  $(RM) -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\PSMTaskMenu.dtd
+  $(RM) -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\security.properties
+  $(RM) -f $(DIST)\bin\chrome\locales\en-US\communicator\locale\securityOverlay.dtd

mozilla/extensions/psm-glue/res/locale/en-US/security.properties

@@ -0,0 +1,29 @@
+#
+# 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): 
+# 
+
+Title=Security Warning
+MixedContentMessage=You have requested a secure document that contains some insecure information.
+LeaveSiteMessage=You have requested an insecure document. The document and any information you send back could be observed by a third party while in transit.
+EnterSiteMessage=You have requested a secure document. The document and any information you send back are encrypted for privacy while in transit.
+PostToInsecure=Warning! Although this document is secure, the information you have submitted is insecure and could be observed by a third party while in transit. If you are submitting passwords, credit card numbers, or other information you would like to keep private, it would be safer for you to cancel the submission.
+PostToInsecureFromInsecure=Any information you submit is insecure and could be observed by a third party while in transit. If you are submitting passwords, credit card numbers, or other information you would like to keep private, it would be safer for you to cancel the submission. 
+DontShowAgain=Show Me This Alert Next Time.
+FindText=Please find the Personal Security Manager application

mozilla/extensions/psm-glue/res/locale/en-US/securityOverlay.dtd

@@ -0,0 +1,2 @@
+
+<!ENTITY  lockIcon.label  "Show security information for this window">

mozilla/extensions/psm-glue/res/locale/makefile.win

@@ -1,28 +1,27 @@
 #!nmake
-# 
-# The contents of this file are subject to the Mozilla Public
+#
+# 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/MPL/
-# 
+# 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) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s): 
-# Srilatha Moturi <srilatha@netscape.com>
 #
+# 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=en-US
 
 include <$(DEPTH)\config\rules.mak>
+

mozilla/extensions/psm-glue/res/makefile.win

@@ -1,27 +1,27 @@
-# 
-# The contents of this file are subject to the Mozilla Public
+#!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/MPL/
-# 
+# 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) 2001 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s): 
-# Srilatha Moturi <srilatha@netscape.com>
 #
+# 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=..\..\..
+include <$(DEPTH)/config/config.mak>
 
-DIRS=content locale
+DIRS = content locale
 
 include <$(DEPTH)\config\rules.mak>

mozilla/extensions/psm-glue/src/Makefile.in

@@ -0,0 +1,66 @@
+#
+# 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): 
+#   Hubbie Shaw
+#   Doug Turner <dougt@netscape.com>
+# 
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE = psmglue
+
+IS_COMPONENT	= 1
+LIBRARY_NAME	= psmglue
+
+
+CPPSRCS	= \
+	nsPSMComponent.cpp \
+	nsPSMUICallbacks.cpp \
+	nsSSLSocketProvider.cpp \
+	nsPSMModule.cpp \
+	nsSSLIOLayer.cpp \
+	nsSecureBrowserUIImpl.cpp \
+	nsSDR.cpp \
+	nsFSDR.cpp \
+	nsCrypto.cpp \
+	nsKeygenHandler.cpp \
+	$(NULL)
+
+CSRCS = \
+	nsPSMMutex.c	\
+	nsPSMShimLayer.c	\
+	$(NULL)
+
+EXTRA_DSO_LDOPTS = \
+	$(MOZ_COMPONENT_LIBS) \
+	-lcmt \
+	-lprotocol \
+	$(MOZ_JS_LIBS) \
+	$(NULL)
+
+include $(topsrcdir)/config/rules.mk
+
+INCLUDES	+= \
+		-I$(srcdir) \
+		$(NULL)

mozilla/extensions/psm-glue/src/makefile.win

@@ -0,0 +1,72 @@
+#!nmake
+#
+# The contents of this file are subject to the Mozilla Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+# 
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# 
+# The Original Code is mozilla.org code.
+# 
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+# 
+# Contributor(s):
+#   Hubbie Shaw
+#   Doug Turner <dougt@netscape.com>
+#
+
+MODULE = psmglue
+
+DEPTH=..\..\..
+IGNORE_MANIFEST=1
+
+DLLNAME       = psmglue
+PDBFILE       = $(DLLNAME).pdb
+MAPFILE       = $(DLLNAME).map
+DLL           = .\$(OBJDIR)\$(DLLNAME).dll
+MAKE_OBJ_TYPE = DLL
+
+include <$(DEPTH)/config/config.mak>
+
+LINCS = $(LINCS)     \
+    -I$(PUBLIC)      \
+    -I$(PUBLIC)/security \
+    $(NULL)
+
+LLIBS   = \
+    $(LIBNSPR) \
+    $(DIST)\lib\neckobase_s.lib \
+    $(DIST)\lib\xpcom.lib \
+    $(DIST)\lib\js3250.lib \
+    $(DIST)\lib\cmt.lib       \
+    $(DIST)\lib\protocol.lib  \
+    $(DIST)\lib\mozreg.lib       \
+    $(DIST)\lib\jsdom.lib \
+    $(NULL)
+
+OBJS = \
+    .\$(OBJDIR)\nsPSMMutex.obj \
+    .\$(OBJDIR)\nsPSMShimLayer.obj \
+    .\$(OBJDIR)\nsPSMComponent.obj \
+    .\$(OBJDIR)\nsPSMUICallbacks.obj \
+    .\$(OBJDIR)\nsPSMModule.obj \
+    .\$(OBJDIR)\nsSecureBrowserUIImpl.obj \
+    .\$(OBJDIR)\nsSSLIOLayer.obj \
+    .\$(OBJDIR)\nsSSLSocketProvider.obj \
+    .\$(OBJDIR)\nsSDR.obj \
+    .\$(OBJDIR)\nsFSDR.obj \
+    .\$(OBJDIR)\nsCrypto.obj \
+    .\$(OBJDIR)\nsKeygenHandler.obj \
+    $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(DLL)
+    $(MAKE_INSTALL) .\$(OBJDIR)\$(DLLNAME).dll $(DIST)\bin\components

mozilla/extensions/psm-glue/src/nsCrypto.h

@@ -0,0 +1,112 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ */
+#ifndef _nsCrypto_h_
+#define _nsCrypto_h_
+#include "nsIDOMCRMFObject.h"
+#include "nsIDOMCrypto.h"
+#include "nsIScriptObjectOwner.h"
+#include "nsIDOMPkcs11.h"
+
+#define NS_CRYPTO_CLASSNAME "Crypto JavaScript Class"
+#define NS_CRYPTO_CID \
+  {0x929d9320, 0x251e, 0x11d4, { 0x8a, 0x7c, 0x00, 0x60, 0x08, 0xc8, 0x44, 0xc3} }
+
+#define NS_PKCS11_CLASSNAME "Pkcs11 JavaScript Class"
+#define NS_PKCS11_CID \
+  {0x74b7a390, 0x3b41, 0x11d4, { 0x8a, 0x80, 0x00, 0x60, 0x08, 0xc8, 0x44, 0xc3} }
+
+class nsIPSMComponent;
+class nsIDOMScriptObjectFactory;
+
+
+class nsCRMFObject : public nsIDOMCRMFObject,
+                     public nsIScriptObjectOwner {
+public:
+  nsCRMFObject();
+  virtual ~nsCRMFObject();
+  NS_DECL_IDOMCRMFOBJECT
+  NS_DECL_ISUPPORTS
+
+  NS_IMETHOD GetScriptObject(nsIScriptContext *aContext, void** aScriptObject);
+  NS_IMETHOD SetScriptObject(void* aScriptObject);
+
+  nsresult init();
+
+  nsresult SetCRMFRequest(char *inRequest);
+private:
+
+  nsString mBase64Request;
+  void *mScriptObject;
+};
+
+
+class nsCrypto: public nsIDOMCrypto,
+                public nsIScriptObjectOwner {
+public:
+  nsCrypto();
+  virtual ~nsCrypto();
+  nsresult init();
+  
+  NS_IMETHOD GetScriptObject(nsIScriptContext *aContext, void** aScriptObject);
+  NS_IMETHOD SetScriptObject(void* aScriptObject);
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_IDOMCRYPTO
+
+  static nsresult GetScriptObjectFactory(nsIDOMScriptObjectFactory **aResult);
+  static nsIDOMScriptObjectFactory *gScriptObjectFactory;
+  static nsIPrincipal* GetScriptPrincipal(JSContext *cx);
+  static const char *kPSMComponentProgID;
+
+ private:
+
+  nsIPSMComponent *mPSM;
+  nsString         mVersionString;
+  PRBool           mVersionStringSet;
+  void            *mScriptObject;
+};
+
+class nsPkcs11 : public nsIDOMPkcs11,
+                 public nsIScriptObjectOwner {
+public:
+  nsPkcs11();
+  virtual ~nsPkcs11();
+
+  nsresult init();
+  NS_DECL_ISUPPORTS
+  NS_DECL_IDOMPKCS11
+  NS_IMETHOD GetScriptObject(nsIScriptContext *aContext, void** aScriptObject);
+  NS_IMETHOD SetScriptObject(void* aScriptObject);
+
+private:
+  nsIPSMComponent *mPSM;
+  void            *mScriptObject;
+};
+
+nsresult
+getPSMComponent(nsIPSMComponent ** retPSM);
+
+#endif //_nsCrypto_h_
+
+
+
+

mozilla/extensions/psm-glue/src/nsFSDR.h

@@ -0,0 +1,60 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Terry Hayes <thayes@netscape.com>
+ *   Steve Morse <morse@netscape.com>
+ */
+
+#ifndef _NSFSDR_H_
+#define _NSFSDR_H_
+
+#include "nsISecretDecoderRing.h"
+
+// ===============================================
+// nsFSecretDecoderRing - "fake" implementation of nsISecretDecoderRing
+// ===============================================
+
+#define NS_FSDR_CLASSNAME "Fake Secret Decoder Ring"
+#define NS_FSDR_CID \
+  { 0x1ee28720, 0x2b93, 0x11d4, { 0xa0, 0xa4, 0x0, 0x0, 0x64, 0x65, 0x73, 0x74 } }
+
+#define NS_FSDR_PROGID "netscape.security.fsdr"
+
+class nsFSecretDecoderRing : public nsISecretDecoderRing
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSISECRETDECODERRING
+
+  nsFSecretDecoderRing();
+  virtual ~nsFSecretDecoderRing();
+
+  nsresult init();
+
+private:
+  nsIPSMComponent *mPSM;
+
+  static const char *kPSMComponentProgID;
+
+  nsresult encode(const unsigned char *data, PRInt32 dataLen, char **_retval);
+  nsresult decode(const char *data, unsigned char **result, PRInt32 * _retval);
+};
+
+#endif /* _NSFSDR_H_ */

mozilla/extensions/psm-glue/src/nsKeygenHandler.cpp

@@ -0,0 +1,255 @@
+//For some weird reason, nsProxiedService has to be the first file 
+//included.  Don't ask me, I'm just the messenger.
+#include "nsProxiedService.h"
+#include "nsKeygenHandler.h"
+#include "nsVoidArray.h"
+#include "nsSecureBrowserUIImpl.h"
+#include "nsIServiceManager.h"
+#include "nsIDOMHTMLSelectElement.h"
+#include "nsIContent.h"
+#include "nsIPSMComponent.h"
+#include "nsIPSMUIHandler.h"
+#include "nsPSMUICallbacks.h"
+#include "nsCrypto.h"
+#include "cmtcmn.h"
+#include "cmtjs.h"
+
+//These defines are taken from the PKCS#11 spec
+#define CKM_RSA_PKCS_KEY_PAIR_GEN     0x00000000
+#define CKM_DH_PKCS_KEY_PAIR_GEN      0x00000020
+#define CKM_DSA_KEY_PAIR_GEN          0x00000010
+
+static NS_DEFINE_IID(kFormProcessorIID,   NS_IFORMPROCESSOR_IID); 
+static NS_DEFINE_IID(kIDOMHTMLSelectElementIID, NS_IDOMHTMLSELECTELEMENT_IID);
+
+static const char *mozKeyGen = "-mozilla-keygen";
+
+NS_IMPL_ADDREF(nsKeygenFormProcessor); 
+NS_IMPL_RELEASE(nsKeygenFormProcessor); 
+NS_IMPL_QUERY_INTERFACE(nsKeygenFormProcessor, kFormProcessorIID); 
+
+nsKeygenFormProcessor::nsKeygenFormProcessor() 
+{ 
+   NS_INIT_REFCNT(); 
+   getPSMComponent(&mPSM);
+} 
+
+char *
+nsKeygenFormProcessor::ChooseToken(PCMT_CONTROL control, 
+				   CMKeyGenTagArg *psmarg,
+				   CMKeyGenTagReq *reason)
+{
+  CMUint32 resID;
+  CMTStatus crv;
+  CMTItem url;
+  char *keyString = nsnull;
+  nsresult rv = NS_OK;
+  NameList *tokenNames;
+  int i;
+
+  // In this case, PSM provided us with a list of potential tokens to choose
+  // from, but we're gonna make it use it's UI for now, so let's delte the
+  // memory associated with the structure it sent back.
+  tokenNames = (NameList*)psmarg->current;
+  for (i=0; i < tokenNames->numitems; i++) {
+    nsCRT::free(tokenNames->names[i]);
+  }
+  nsCRT::free((char*)tokenNames);
+  resID = psmarg->rid;
+  memset(&url, 0, sizeof(CMTItem));
+  NS_WITH_PROXIED_SERVICE(nsIPSMUIHandler, handler, nsPSMUIHandlerImpl::GetCID(), NS_UI_THREAD_EVENTQ, &rv);
+  crv = CMT_GetStringAttribute(control, resID, SSM_FID_CHOOSE_TOKEN_URL, &url);
+  if (crv != CMTSuccess) {
+    goto loser;
+  }
+  if (NS_SUCCEEDED(rv)) {
+    handler->DisplayURI(400, 300, PR_TRUE, (char*)url.data);
+  } else {
+    goto loser;
+  }
+  return CMT_GetGenKeyResponse(control, psmarg, reason);
+ loser:
+  if (keyString)
+    nsCRT::free(keyString);
+  return nsnull;
+}
+
+char *
+nsKeygenFormProcessor::SetUserPassword(PCMT_CONTROL control, 
+				       CMKeyGenTagArg *psmarg,
+				       CMKeyGenTagReq *reason)
+{
+  nsresult rv;
+  CMTStatus crv;
+  CMTItem url;
+  char *keystring=nsnull;
+
+  // We need to delete the memory the PSM client API allocated for us since
+  // we're just gonna tell it to use it's own UI.
+  nsCRT::free((char*)psmarg->current);
+  NS_WITH_PROXIED_SERVICE(nsIPSMUIHandler, handler, nsPSMUIHandlerImpl::GetCID(), NS_UI_THREAD_EVENTQ, &rv);
+  memset (&url, 0, sizeof(CMTItem));
+  crv = CMT_GetStringAttribute(control,psmarg->rid, SSM_FID_INIT_DB_URL, &url);
+  if (crv != CMTSuccess || NS_FAILED(rv)){
+    goto loser;
+  }
+
+  handler->DisplayURI(500, 450, PR_TRUE, (char*)url.data);
+  
+  return CMT_GetGenKeyResponse(control, psmarg, reason);
+ loser:
+  if (keystring)
+    nsCRT::free(keystring);
+  return nsnull;
+}
+
+nsresult
+nsKeygenFormProcessor::GetPublicKey(nsString& value, nsString& challenge, 
+				    nsString& keyType,
+				    nsString& outPublicKey, nsString& pqg)
+{
+    PCMT_CONTROL control;
+    nsresult rv;
+    CMKeyGenParams *params = nsnull;
+    CMKeyGenTagArg *psmarg = nsnull;
+    CMKeyGenTagReq reason;
+    char *emptyCString = "null";
+    char *keystring = nsnull;
+
+    rv = mPSM->GetControlConnection(&control);
+    if (NS_FAILED(rv)) {
+	goto loser;
+    }
+    params = new CMKeyGenParams;
+    if (params == nsnull) {
+      goto loser;
+    }
+    params->typeString = (keyType.IsEmpty()) ? emptyCString : 
+                                               keyType.ToNewCString();
+    params->challenge  = (challenge.IsEmpty()) ? emptyCString : 
+                                                 challenge.ToNewCString();
+    params->choiceString = value.ToNewCString();
+    params->pqgString = (pqg.IsEmpty()) ? emptyCString : pqg.ToNewCString();
+    psmarg = new CMKeyGenTagArg;
+    if (psmarg == nsnull) {
+      goto loser;
+    }
+    // ARGH, while this is going on, we need to lock the control
+    // connection so that the event loop doesn't drop our response on
+    // the floor.
+    CMT_LockConnection(control);
+    psmarg->op = CM_KEYGEN_START;
+    psmarg->rid = 0;
+    psmarg->tokenName = NULL;
+    psmarg->current = params;
+    keystring = CMT_GenKeyOldStyle(control, psmarg, &reason);
+    while (!keystring) {
+      psmarg->op = reason;
+      switch (psmarg->op) {
+      case CM_KEYGEN_PICK_TOKEN:
+	keystring = ChooseToken(control, psmarg, &reason);
+	break;
+      case CM_KEYGEN_SET_PASSWORD:
+	keystring = SetUserPassword(control, psmarg, &reason);
+	break;
+      case CM_KEYGEN_ERR:
+      default:
+	goto loser;
+      }
+    }
+    CMT_UnlockConnection(control);
+    outPublicKey.AssignWithConversion(keystring);
+    nsCRT::free(keystring);
+    return NS_OK;
+ loser:
+    return NS_ERROR_FAILURE;
+}
+
+NS_METHOD 
+nsKeygenFormProcessor::ProcessValue(nsIDOMHTMLElement *aElement, 
+				    const nsString& aName, 
+				    nsString& aValue) 
+{ 
+#ifdef DEBUG_javi
+  char *name = aName.ToNewCString(); 
+  char *value = aValue.ToNewCString(); 
+  printf("ProcessValue: name %s value %s\n",  name, value); 
+  delete [] name; 
+  delete [] value; 
+#endif 
+  nsresult rv = NS_OK;
+  nsCOMPtr<nsIDOMHTMLSelectElement>selectElement;
+  nsresult res = aElement->QueryInterface(kIDOMHTMLSelectElementIID, 
+					  getter_AddRefs(selectElement));
+  if (NS_SUCCEEDED(res)) {
+    nsAutoString keygenvalue;
+    nsAutoString challengeValue;
+    nsString publicKey;
+    nsString mozillaKeygen;
+    nsString mozType;
+
+    mozType.AssignWithConversion("_moz-type");
+    mozillaKeygen.AssignWithConversion(mozKeyGen);
+    res = selectElement->GetAttribute(mozType, keygenvalue);
+
+    if (NS_CONTENT_ATTR_HAS_VALUE == res && keygenvalue.Equals(mozillaKeygen)) {
+      nsString challenge;
+      nsString keyType;
+      nsString keyTypeValue;
+      nsString pqg, pqgValue;
+
+      challenge.AssignWithConversion("challenge");
+      pqg.AssignWithConversion("pqg");
+      res = selectElement->GetAttribute(pqg, pqgValue);
+      keyType.AssignWithConversion("keytype");
+      res = selectElement->GetAttribute(keyType, keyTypeValue);
+      if (NS_FAILED(res) || keyTypeValue.IsEmpty()) {
+	// If this field is not present, we default to rsa.
+	keyTypeValue.AssignWithConversion("rsa");
+      }
+      res = selectElement->GetAttribute(challenge, challengeValue);
+      rv = GetPublicKey(aValue, challenge, keyTypeValue, 
+			publicKey, pqgValue);
+      aValue = publicKey;
+    }
+  }
+
+  return rv; 
+} 
+
+NS_METHOD nsKeygenFormProcessor::ProvideContent(const nsString& aFormType, 
+						nsVoidArray& aContent, 
+						nsString& aAttribute) 
+{ 
+  nsString selectString;
+  nsresult rv;
+  PCMT_CONTROL control;
+  PRUint32 i;
+
+  selectString.AssignWithConversion("SELECT");
+  if (aFormType.EqualsIgnoreCase(selectString)) {
+    nsString *selectString;
+    char **result;
+
+    rv = mPSM->GetControlConnection(&control);
+    if (NS_FAILED(rv)) {
+	goto loser;
+    }
+    result = CMT_GetKeyChoiceList(control, "rsa"/*Need to figure out if DSA*/,
+				  nsnull);
+    for (i=0; result[i] != nsnull; i++) {
+	selectString = new nsString;
+	selectString->AssignWithConversion(result[i]);
+	aContent.AppendElement(selectString);
+	delete []result[i];
+    }
+    delete []result;
+    aAttribute.AssignWithConversion(mozKeyGen);
+  }
+  return NS_OK;
+ loser:
+  return NS_ERROR_FAILURE; 
+} 
+
+
+

mozilla/extensions/psm-glue/src/nsKeygenHandler.h

@@ -0,0 +1,32 @@
+#ifndef _NSKEYGENHANDLER_H_
+#define _NSKEYGENHANDLER_H_
+// Form Processor 
+#include "nsIFormProcessor.h" 
+#include "ssmdefs.h"
+#include "cmtcmn.h"
+
+class nsIPSMComponent;
+
+class nsKeygenFormProcessor : public nsIFormProcessor { 
+public: 
+  nsKeygenFormProcessor(); 
+  NS_IMETHOD ProcessValue(nsIDOMHTMLElement *aElement, 
+                          const nsString& aName, 
+                          nsString& aValue); 
+
+  NS_IMETHOD ProvideContent(const nsString& aFormType, 
+                            nsVoidArray& aContent, 
+                            nsString& aAttribute); 
+  NS_DECL_ISUPPORTS 
+protected:
+  nsresult GetPublicKey(nsString& value, nsString& challenge, 
+			nsString& keyType, nsString& outPublicKey,
+			nsString& pqg);
+  char * ChooseToken(PCMT_CONTROL control, CMKeyGenTagArg *psmarg,  
+		     CMKeyGenTagReq *reason);
+  char * SetUserPassword(PCMT_CONTROL control, CMKeyGenTagArg *psmarg,  
+		     CMKeyGenTagReq *reason);
+  nsIPSMComponent *mPSM;
+}; 
+
+#endif //_NSKEYGENHANDLER_H_

mozilla/extensions/psm-glue/src/nsPSMComponent.cpp

@@ -0,0 +1,935 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+ *   Mitch Stoltz <mstoltz@netscape.com>
+*/
+
+#include "nsProxiedService.h"
+#include "nsPSMUICallbacks.h"
+#include "VerReg.h"
+
+#include "nspr.h"
+#include "nsPSMComponent.h"
+
+#include "nsCRT.h"
+
+#include "nsNetUtil.h"
+#include "nsIURI.h"
+#include "nsIChannel.h"
+#include "nsIInputStream.h"
+#include "nsIStreamListener.h"
+
+#include "nsIPref.h"
+#include "nsIProfile.h"
+#include "nsILocalFile.h"
+
+#include "nsDirectoryService.h"
+
+#include "rsrcids.h"
+
+#include "nsPSMMutex.h"
+#include "nsPSMShimLayer.h"
+#include "nsPSMUICallbacks.h"
+
+#include "nsISecureBrowserUI.h"
+#include "nsIDocumentLoaderObserver.h"
+#include "nsIScriptSecurityManager.h"
+#include "nsICertificatePrincipal.h"
+
+#include "nsIProtocolProxyService.h"
+
+#define PSM_VERSION_REG_KEY "/Netscape/Personal Security Manager"
+
+#ifdef WIN32
+#define PSM_FILE_NAME "psm.exe"
+#elif XP_UNIX
+#define PSM_FILE_NAME "start-psm"
+#else
+#define PSM_FILE_NAME "psm"
+#endif
+
+
+static NS_DEFINE_CID(kCStringBundleServiceCID,  NS_STRINGBUNDLESERVICE_CID);
+static NS_DEFINE_CID(kProfileCID, NS_PROFILE_CID);
+static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
+static NS_DEFINE_CID(kProtocolProxyServiceCID, NS_PROTOCOLPROXYSERVICE_CID);
+
+nsPSMComponent* nsPSMComponent::mInstance = nsnull;
+
+nsPSMComponent::nsPSMComponent()
+{
+    NS_INIT_REFCNT();
+    mControl = nsnull;
+}
+
+nsPSMComponent::~nsPSMComponent()
+{
+    if (mControl)
+    {
+        CMT_CloseControlConnection(mControl);
+        mControl = nsnull;
+    }
+}
+
+
+NS_IMETHODIMP      
+nsPSMComponent::CreatePSMComponent(nsISupports* aOuter, REFNSIID aIID, void **aResult)
+{                                                                  
+    if (!aResult) {                                                
+        return NS_ERROR_INVALID_POINTER;                           
+    }                                                              
+    if (aOuter) {                                                  
+        *aResult = nsnull;                                         
+        return NS_ERROR_NO_AGGREGATION;                              
+    }                                                                
+    
+    if (mInstance == nsnull) 
+    {
+        mInstance = new nsPSMComponent();
+    }
+
+    if (mInstance == nsnull)
+        return NS_ERROR_OUT_OF_MEMORY;
+    
+    nsresult rv = mInstance->QueryInterface(aIID, aResult);                        
+    if (NS_FAILED(rv)) 
+    {                                             
+        *aResult = nsnull;                                           
+    }                                                                
+    return rv;                                                       
+}
+
+/* nsISupports Implementation for the class */
+NS_IMPL_THREADSAFE_ISUPPORTS3(nsPSMComponent, 
+                              nsIPSMComponent, 
+                              nsIContentHandler,
+                              nsISignatureVerifier);
+
+#define INIT_NUM_PREFS 100
+/* preference types */
+#define STRING_PREF 0
+#define BOOL_PREF 1
+#define INT_PREF 2
+
+
+/* resizable list struct that contains pref items */
+typedef struct CMSetPrefList {
+    int n; /* number of filled items */
+    int capacity; /* allocated memory */
+    CMTSetPrefElement* list; /* actual list */
+} CMSetPrefList;
+
+static void get_pack_bool_pref(nsIPref *prefManager, char* key, CMTSetPrefElement* list, int* n)
+{
+    PRBool boolpref;
+
+    list[*n].key = nsCRT::strdup(key);
+    list[*n].type = BOOL_PREF;
+
+    if ((prefManager->GetBoolPref(key, &boolpref) != 0) || boolpref) 
+    {
+        list[*n].value = nsCRT::strdup("true");
+    }
+    else 
+    {
+        list[*n].value = nsCRT::strdup("false");
+    }
+
+    (*n)++;    /* increment the counter after done packing */
+
+    return;
+}
+
+static void SaveAllPrefs(int number, CMTSetPrefElement* list)
+{
+    nsCOMPtr<nsIPref> prefManager;
+
+    nsresult res = nsServiceManager::GetService(kPrefCID, 
+                                                nsIPref::GetIID(), 
+                                                getter_AddRefs(prefManager));
+    
+    if (NS_FAILED(res)  || !prefManager)
+    {
+        return;
+    }
+
+
+    int i;
+    int intval;
+
+    for (i = 0; i < number; i++) 
+    {
+        if (list[i].key == nsnull) 
+        {
+            /* misconfigured item: next */
+            continue;
+        }
+
+        switch (list[i].type) 
+        {
+             case 0:    /* string type */
+                 prefManager->SetCharPref(list[i].key, list[i].value);
+                 break;
+             case 1:    /* boolean type */
+                 if (strcmp(list[i].value, "true") == 0) {
+                  prefManager->SetBoolPref(list[i].key, (PRBool)1);
+                 }
+                 else if (strcmp(list[i].value, "false") == 0) {
+                  prefManager->SetBoolPref(list[i].key, (PRBool)0);
+                 }
+                 break;
+             case 2:
+                 intval = atoi(list[i].value);
+                 prefManager->SetIntPref(list[i].key, intval);
+                 break;
+             default:
+                 break;
+         }
+    }
+
+    return;
+}
+
+NS_IMETHODIMP
+nsPSMComponent::PassPrefs()
+{
+    // if we have not passed anything to psm yet, this function can just return.
+
+    if (!mControl)
+        return NS_OK;
+
+    int i;
+    nsresult rv = NS_ERROR_FAILURE;
+    char* strpref = NULL;
+    int intpref;
+    PRBool boolpref;
+    CMSetPrefList prefs = {0};
+    CMTSetPrefElement* list = NULL;
+
+    char* pickAuto = "Select Automatically";
+    char* alwaysAsk = "Ask Every Time";
+    
+    nsCOMPtr<nsIPref> prefManager;
+
+    nsresult res = nsServiceManager::GetService(kPrefCID, 
+                                                nsIPref::GetIID(), 
+                                                getter_AddRefs(prefManager));
+
+    if (NS_OK != res) 
+    {
+        return NS_ERROR_FAILURE;
+    }
+
+    /* allocate memory for list */
+    prefs.n = 0; /* counter */
+    prefs.capacity = INIT_NUM_PREFS;
+    prefs.list = (CMTSetPrefElement*) new char[(INIT_NUM_PREFS * sizeof(CMTSetPrefElement))];
+    
+    if (prefs.list == NULL) 
+    {
+         return rv;
+    }
+
+    /* shorthand */
+    list = prefs.list;
+
+    /* get preferences */
+    get_pack_bool_pref(prefManager, "security.enable_ssl2", (CMTSetPrefElement*)list, &(prefs.n));
+    get_pack_bool_pref(prefManager, "security.enable_ssl3", (CMTSetPrefElement*)list, &(prefs.n));
+
+    /* this pref is a boolean pref in nature but a string pref for 
+     * historical reason
+     */
+
+    list[prefs.n].key = nsCRT::strdup("security.default_personal_cert");
+    list[prefs.n].type = STRING_PREF;
+
+    if ((prefManager->CopyCharPref(list[prefs.n].key, &strpref) == 0) && (strcmp(strpref, pickAuto) == 0)) 
+    {
+         list[prefs.n].value = nsCRT::strdup(pickAuto);
+    }
+    else 
+    {
+         /* although one could choose a specific cert for client auth in
+          * Nova, that mode is deprecated with PSM and mapped to ASK
+          */
+         list[prefs.n].value = nsCRT::strdup(alwaysAsk);
+    }
+
+    prefs.n++;
+    if (strpref != NULL) 
+    {
+         nsCRT::free(strpref);
+    }
+
+    list[prefs.n].key = nsCRT::strdup("security.default_mail_cert");
+    list[prefs.n].type = STRING_PREF;
+    if (prefManager->CopyCharPref(list[prefs.n].key, &list[prefs.n].value) != 0) 
+    {
+         list[prefs.n].value = NULL;
+    }
+    prefs.n++;
+
+    list[prefs.n].key = nsCRT::strdup("security.ask_for_password");
+    list[prefs.n].type = INT_PREF;
+    if (prefManager->GetIntPref(list[prefs.n].key, &intpref) != 0) 
+    {
+         intpref = 0;    /* default */
+    }
+
+    list[prefs.n].value = PR_smprintf("%d", intpref);
+    prefs.n++;
+
+    list[prefs.n].key = nsCRT::strdup("security.password_lifetime");
+    list[prefs.n].type = INT_PREF;
+    if (prefManager->GetIntPref(list[prefs.n].key, &intpref) != 0) 
+    {
+         intpref = 30;    /* default */
+    }
+
+    list[prefs.n].value = PR_smprintf("%d", intpref);
+    prefs.n++;
+
+    /* OCSP preferences */
+    /* XXX since these are the new ones added by PSM, we will be more
+     *     error-tolerant in fetching them
+     */
+    if (prefManager->GetBoolPref("security.OCSP.enabled", &boolpref) == 0) 
+    {
+         if (boolpref) 
+        {
+             list[prefs.n].value = nsCRT::strdup("true");
+         }
+         else 
+        {
+             list[prefs.n].value = nsCRT::strdup("false");
+         }
+         list[prefs.n].key = nsCRT::strdup("security.OCSP.enabled");
+         list[prefs.n].type = BOOL_PREF;
+         prefs.n++;
+    }
+
+    if (prefManager->GetBoolPref("security.OCSP.useDefaultResponder", &boolpref) == 0) 
+    {
+         if (boolpref) 
+        {
+             list[prefs.n].value = nsCRT::strdup("true");
+         }
+         else 
+        {
+             list[prefs.n].value = nsCRT::strdup("false");
+         }
+         list[prefs.n].key = nsCRT::strdup("security.OCSP.useDefaultResponder");
+         list[prefs.n].type = BOOL_PREF;
+         prefs.n++;
+    }
+
+    if (prefManager->CopyCharPref("security.OCSP.URL", &strpref) == 0) 
+    {
+         list[prefs.n].value = strpref;
+         list[prefs.n].key = nsCRT::strdup("security.OCSP.URL");
+         list[prefs.n].type = STRING_PREF;
+         prefs.n++;
+    }
+
+    if (prefManager->CopyCharPref("security.OCSP.signingCA", &strpref) == 0) 
+    {
+         list[prefs.n].value = strpref;
+         list[prefs.n].key = nsCRT::strdup("security.OCSP.signingCA");
+         list[prefs.n].type = STRING_PREF;
+         prefs.n++;
+    }
+
+    /* now application-specific preferences */
+    /* get navigator preferences */
+    get_pack_bool_pref(prefManager, "security.warn_entering_secure", (CMTSetPrefElement*)list, &prefs.n);
+    get_pack_bool_pref(prefManager, "security.warn_leaving_secure",  (CMTSetPrefElement*)list, &prefs.n);
+    get_pack_bool_pref(prefManager, "security.warn_viewing_mixed",   (CMTSetPrefElement*)list, &prefs.n);
+    get_pack_bool_pref(prefManager, "security.warn_submit_insecure", (CMTSetPrefElement*)list, &prefs.n);
+
+    // Add any other prefs here such as ldap or mail/news.
+     
+     CMT_SetSavePrefsCallback(mControl, (savePrefsCallback_fn)SaveAllPrefs);
+
+    if (CMT_PassAllPrefs(mControl, prefs.n, (CMTSetPrefElement*)prefs.list) !=  CMTSuccess) 
+    {
+         goto loser;
+    }
+
+    rv = NS_OK; /* success */
+loser:
+    /* clean out memory for prefs */
+    for (i = 0; i < prefs.n; i++) 
+    {
+         if (prefs.list[i].key != NULL) 
+        {
+             nsCRT::free(prefs.list[i].key);
+         }
+         
+        if (prefs.list[i].value != NULL) 
+        {
+             nsCRT::free(prefs.list[i].value);
+         }
+    }
+
+    if (prefs.list != NULL) 
+    {
+         delete(prefs.list);
+    }
+    return rv;
+}
+
+#ifdef XP_MAC
+extern "C" {
+    void RunMacPSM(void* arg);
+    PRThread* SSM_CreateAndRegisterThread(PRThreadType type, void (*start)(void *arg),
+                                          void *arg, PRThreadPriority priority,
+                                          PRThreadScope scope, PRThreadState state,
+                                          PRUint32 stackSize);
+    void SSM_KillAllThreads(void);
+}
+#endif
+            
+NS_IMETHODIMP
+nsPSMComponent::GetControlConnection( CMT_CONTROL * *_retval )
+{
+     nsresult rv;
+     *_retval = nsnull;
+    if (mControl) 
+    {
+        *_retval = mControl;
+        return NS_OK;
+    }
+    else      /* initialize mutex, sock table, etc. */
+    {
+            
+        if (nsPSMMutexInit() != PR_SUCCESS)
+            return NS_ERROR_FAILURE;
+
+#ifdef XP_MAC
+        /* FIXME:  Really need better error handling in PSM, which simply exits on error. */
+        /* use a cached monitor to rendezvous with the PSM thread. */
+        PRMonitor* monitor = PR_CEnterMonitor(this);
+        if (monitor != nsnull) {
+            /* create the Cartman thread, and let it run awhile to get things going. */
+            PRThread* cartmanThread = SSM_CreateAndRegisterThread(PR_USER_THREAD, RunMacPSM, 
+							                                      this, PR_PRIORITY_NORMAL,
+							                                      PR_LOCAL_THREAD, PR_UNJOINABLE_THREAD, 0);
+            if (cartmanThread != nsnull) {
+                /* need a good way to rendezvouz with the Cartman thread. */
+                PR_CWait(this, PR_INTERVAL_NO_TIMEOUT);
+            }
+            
+            PR_CExitMonitor(this);
+        }
+#endif
+
+        // Try to see if it is open already
+        mControl = CMT_ControlConnect(&nsPSMMutexTbl, &nsPSMShimTbl);
+        
+        // Find the one in the bin directory
+        if (mControl == nsnull)
+        {
+            nsCOMPtr<nsILocalFile> psmAppFile;
+            NS_WITH_SERVICE(nsIProperties, directoryService, NS_DIRECTORY_SERVICE_PROGID, &rv);
+            if (NS_FAILED(rv)) return rv;
+
+            directoryService->Get("system.OS_CurrentProcessDirectory", 
+                                   NS_GET_IID(nsIFile), 
+                                   getter_AddRefs(psmAppFile));
+
+        
+            psmAppFile->Append("psm");
+            psmAppFile->Append(PSM_FILE_NAME);
+        
+            PRBool isExecutable, exists;
+            psmAppFile->Exists(&exists);
+            psmAppFile->IsExecutable(&isExecutable);
+            if (exists && isExecutable)
+            {
+                nsXPIDLCString path;
+                psmAppFile->GetPath(getter_Copies(path));
+                // FIX THIS.  using a file path is totally wrong here.  
+                mControl = CMT_EstablishControlConnection((char*)(const char*)path, &nsPSMShimTbl, &nsPSMMutexTbl);
+            }
+        }
+
+        // Get the one in the version registry           
+        if (mControl == nsnull)
+        {
+            //Try to find it.
+            int err;
+            char filepath[MAXREGPATHLEN];
+
+            err = VR_GetPath(PSM_VERSION_REG_KEY, sizeof(filepath), filepath);
+            if ( err == REGERR_OK )
+            {
+                nsFileSpec psmSpec(filepath);
+                psmSpec += PSM_FILE_NAME;
+		
+                if (psmSpec.Exists())
+                {
+                    mControl = CMT_EstablishControlConnection((char *)psmSpec.GetNativePathCString(), &nsPSMShimTbl, &nsPSMMutexTbl);
+                }
+            }
+         }
+
+        
+        if (!mControl || InitPSMUICallbacks(mControl) != PR_SUCCESS)
+            goto failure;
+
+        nsFileSpec profileSpec;
+        PRUnichar*      profileName;
+        
+        NS_WITH_SERVICE(nsIProfile, profile, kProfileCID, &rv);
+        if (NS_FAILED(rv)) goto failure;
+        
+        rv = profile->GetCurrentProfileDir(&profileSpec);
+        if (NS_FAILED(rv)) goto failure;;
+        
+#ifdef XP_MAC
+        profileSpec += "Security";
+        // make sure the dir exists
+        profileSpec.CreateDirectory();
+#endif
+        
+        rv = profile->GetCurrentProfile(&profileName);
+        if (NS_FAILED(rv)) goto failure;
+          
+        CMTStatus psmStatus;
+        nsCAutoString profilenameC;
+        profilenameC.AssignWithConversion(profileName);
+
+        psmStatus = CMT_Hello( mControl, 
+                               PROTOCOL_VERSION, 
+                               profilenameC, 
+                               (char*)profileSpec.GetNativePathCString());        
+        
+        if (psmStatus == CMTFailure)
+        {  
+            PR_FREEIF(profileName);       
+            goto failure;
+        }
+        
+        if (InitPSMEventLoop(mControl) != PR_SUCCESS)
+        {
+            PR_FREEIF(profileName);       
+            goto failure;
+        }
+            
+        if (NS_FAILED(PassPrefs()))
+        {  
+            PR_FREEIF(profileName);       
+            goto failure;
+        }
+
+        PR_FREEIF(profileName);
+        
+        nsCOMPtr<nsIProtocolProxyService> proxySvc = do_GetService(kProtocolProxyServiceCID, &rv);
+        if (NS_FAILED(rv)) return rv;
+        proxySvc->AddNoProxyFor("127.0.0.1", mControl->port);
+        
+        *_retval = mControl;
+        return NS_OK;
+    }
+
+failure:
+#ifdef DEBUG
+    printf("*** Failure setting up Cartman! \n");
+#endif
+
+    if (mControl)
+    {
+        CMT_CloseControlConnection(mControl);
+        mControl = NULL;
+    }
+
+    // TODO we need to unregister our UI callback BEFORE destroying our mutex.
+    // nsPSMMutexDestroy();
+
+    return NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP
+nsPSMComponent::DisplaySecurityAdvisor(const char *pickledStatus, const char *hostName)
+{
+    CMT_CONTROL *controlConnection;
+    GetControlConnection( &controlConnection );
+    if (DisplayPSMUIDialog(controlConnection, pickledStatus, hostName) == PR_SUCCESS)
+        return NS_OK;
+    return NS_ERROR_FAILURE;
+}
+
+class CertDownloader : public nsIStreamListener
+{
+    public:
+        CertDownloader() {NS_ASSERTION(0, "don't use this constructor."); }
+        CertDownloader(PRInt32 type);
+        virtual ~CertDownloader();
+
+        NS_DECL_ISUPPORTS
+        NS_DECL_NSISTREAMOBSERVER
+        NS_DECL_NSISTREAMLISTENER
+    protected:
+        char* mByteData;
+        PRInt32 mBufferOffset;
+        PRInt32 mContentLength;
+        PRInt32 mType;
+};
+
+
+CertDownloader::CertDownloader(PRInt32 type)
+{
+    NS_INIT_REFCNT();
+    mByteData = nsnull;
+    mType = type;
+}
+
+CertDownloader::~CertDownloader()
+{
+    if (mByteData)
+        nsMemory::Free(mByteData);
+}
+
+NS_IMPL_ISUPPORTS(CertDownloader,NS_GET_IID(nsIStreamListener));
+
+
+NS_IMETHODIMP
+CertDownloader::OnStartRequest(nsIChannel* channel, nsISupports* context)
+{
+    channel->GetContentLength(&mContentLength);
+    if (mContentLength == -1)
+        return NS_ERROR_FAILURE;
+    
+    mBufferOffset = 0;
+    mByteData = (char*) nsMemory::Alloc(mContentLength);
+    if (!mByteData)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    return NS_OK;
+}
+
+
+NS_IMETHODIMP
+CertDownloader::OnDataAvailable(nsIChannel* channel, 
+                                nsISupports* context,
+                                nsIInputStream *aIStream, 
+                                PRUint32 aSourceOffset,
+                                PRUint32 aLength)
+{
+    if (!mByteData)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    PRUint32 amt;
+    nsresult err;
+
+    do 
+    {
+        err = aIStream->Read(mByteData+mBufferOffset, mContentLength-mBufferOffset, &amt);
+        if (amt == 0) break;
+        if (NS_FAILED(err))  return err;
+        
+        aLength -= amt;
+        mBufferOffset += amt;
+
+    } while (aLength > 0);
+    
+    return NS_OK;
+}
+
+
+NS_IMETHODIMP
+CertDownloader::OnStopRequest(nsIChannel* channel, 
+                              nsISupports* context,
+                              nsresult aStatus,
+                              const PRUnichar* aMsg)
+{
+
+    nsCOMPtr<nsIPSMComponent> psm = do_QueryInterface(context);
+
+    if (!psm) return NS_ERROR_FAILURE;
+
+    CMT_CONTROL *controlConnection;
+    psm->GetControlConnection( &controlConnection );
+    unsigned int certID;
+                    
+    certID = CMT_DecodeAndCreateTempCert(controlConnection, mByteData, mContentLength, mType);
+
+    if (certID)
+        CMT_DestroyResource(controlConnection, certID, SSM_RESTYPE_CERTIFICATE);
+
+  return NS_OK;
+}
+
+
+/* other mime types that we should handle sometime:
+
+application/x-pkcs7-crl
+application/x-pkcs7-mime
+application/pkcs7-signature
+application/pre-encrypted
+
+*/
+
+
+NS_IMETHODIMP 
+nsPSMComponent::HandleContent(const char * aContentType, 
+                              const char * aCommand, 
+                              const char * aWindowTarget, 
+                              nsISupports* aWindowContext, 
+                              nsIChannel * aChannel)
+{
+    // We were called via CI.  We better protect ourselves and addref.
+    NS_ADDREF_THIS();
+
+    nsresult rv = NS_OK;
+    if (!aChannel) return NS_ERROR_NULL_POINTER;
+    
+    CMUint32 type = -1;
+
+    if ( nsCRT::strcasecmp(aContentType, "application/x-x509-ca-cert") == 0)
+    {
+        type = 1;  //CA cert
+    }
+    else if (nsCRT::strcasecmp(aContentType, "application/x-x509-server-cert") == 0)
+    {
+        type =  2; //Server cert
+    }
+    else if (nsCRT::strcasecmp(aContentType, "application/x-x509-user-cert") == 0)
+    {
+        type =  3; //User cert
+    }
+    else if (nsCRT::strcasecmp(aContentType, "application/x-x509-email-cert") == 0)
+    {
+        type =  4; //Someone else's email cert
+    }
+    
+    if (type != -1)
+    {
+        // I can't directly open the passed channel cause it fails :-(
+
+        nsCOMPtr<nsIURI> uri;
+        rv = aChannel->GetURI(getter_AddRefs(uri));
+        if (NS_FAILED(rv)) return rv;
+
+        nsCOMPtr<nsIChannel> channel;
+        rv = NS_OpenURI(getter_AddRefs(channel), uri);
+        if (NS_FAILED(rv)) return rv;
+
+        return channel->AsyncRead(new CertDownloader(type), NS_STATIC_CAST(nsIPSMComponent*,this));
+    }
+
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+
+//---------------------------------------------
+// Functions Implenenting NSISignatureVerifier
+//---------------------------------------------
+NS_IMETHODIMP
+nsPSMComponent::HashBegin(PRUint32 alg, PRUint32* id)
+{
+  CMT_CONTROL *controlConnection;
+  if (NS_FAILED(GetControlConnection( &controlConnection )))
+    return NS_ERROR_FAILURE;
+
+  if(CMT_HashCreate(controlConnection, alg, (CMUint32*)id) != CMTSuccess)
+    return NS_ERROR_FAILURE;
+  if(CMT_HASH_Begin(controlConnection, *id) != CMTSuccess)
+    return NS_ERROR_FAILURE;
+
+  return NS_OK;  
+}
+
+NS_IMETHODIMP
+nsPSMComponent::HashUpdate(PRUint32 id, const char* buf, PRUint32 buflen)
+{
+  CMT_CONTROL *controlConnection;
+
+  if (NS_FAILED(GetControlConnection( &controlConnection )))
+    return NS_ERROR_FAILURE;
+  if (CMT_HASH_Update(controlConnection, id, 
+      (const unsigned char*)buf, buflen) != CMTSuccess)    
+    return NS_ERROR_FAILURE;
+    
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsPSMComponent::HashEnd(PRUint32 id, unsigned char** hash, 
+                        PRUint32* hashLen, PRUint32 maxLen)
+{
+  if (!hash)
+    return NS_ERROR_ILLEGAL_VALUE;
+
+  CMT_CONTROL *controlConnection;
+  if (NS_FAILED(GetControlConnection( &controlConnection )))
+    return NS_ERROR_FAILURE;
+ 
+  if(CMT_HASH_End(controlConnection, id, *hash,
+                        (CMUint32*)hashLen, maxLen) != CMTSuccess)
+    return NS_ERROR_FAILURE;
+  CMT_HASH_Destroy(controlConnection, id);
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsPSMComponent::CreatePrincipalFromSignature(const char* aRSABuf, PRUint32 aRSABufLen,
+                                             nsIPrincipal** aPrincipal)
+{
+  PRInt32 errorCode;
+  return VerifySignature(aRSABuf, aRSABufLen, nsnull, 0, &errorCode, aPrincipal);
+}
+
+PR_STATIC_CALLBACK(void)
+UselessPK7DataSink(void* arg, const char* buf, CMUint32 len)
+{
+}
+
+NS_IMETHODIMP
+nsPSMComponent::VerifySignature(const char* aRSABuf, PRUint32 aRSABufLen, 
+                                const char* aPlaintext, PRUint32 aPlaintextLen,
+                                PRInt32* aErrorCode,
+                                nsIPrincipal** aPrincipal)
+{
+  if (!aPrincipal || !aErrorCode)
+    return NS_ERROR_NULL_POINTER;
+  *aErrorCode = 0;
+  *aPrincipal = nsnull;
+
+  CMT_CONTROL *controlConnection;
+  if (NS_FAILED(GetControlConnection( &controlConnection )))
+    return NS_ERROR_FAILURE;
+  
+  //-- Decode the signature stream
+  CMUint32 decoderID;
+  CMInt32* blah = nsnull;
+  CMTStatus result = CMT_PKCS7DecoderStart(controlConnection, nsnull,
+                                           &decoderID, blah,
+                                           UselessPK7DataSink, nsnull);
+  if (result != CMTSuccess) return NS_ERROR_FAILURE;
+  result = CMT_PKCS7DecoderUpdate(controlConnection, decoderID, aRSABuf, aRSABufLen);
+  if (result != CMTSuccess) return NS_ERROR_FAILURE;
+  CMUint32 contentInfo;
+  result = CMT_PKCS7DecoderFinish(controlConnection, 
+                                            decoderID, &contentInfo);
+  if (result != CMTSuccess) return NS_ERROR_FAILURE;
+
+  CMTItem hashItem;
+  hashItem.data = 0;
+  hashItem.len = 0;
+  //-- If a plaintext was provided, hash it.
+  if (aPlaintext)
+  {
+    CMUint32 hashId;
+    CMT_HashCreate(controlConnection, nsISignatureVerifier::SHA1, &hashId);
+    CMT_HASH_Begin(controlConnection, hashId);
+    CMTStatus result = CMT_HASH_Update(controlConnection, hashId, 
+                                       (const unsigned char*)aPlaintext, aPlaintextLen);
+    if (result != CMTSuccess) return NS_ERROR_FAILURE;
+    
+    unsigned char* hash = (unsigned char*)PR_MALLOC(nsISignatureVerifier::SHA1_LENGTH);
+    if (!hash) return NS_ERROR_OUT_OF_MEMORY;
+    CMUint32 hashLen;
+    result = CMT_HASH_End(controlConnection, hashId, hash,
+                          &hashLen, nsISignatureVerifier::SHA1_LENGTH);
+    if (result != CMTSuccess)
+    {
+      PR_FREEIF(hash);
+      return NS_ERROR_FAILURE;
+    }
+    NS_ASSERTION(hashLen == nsISignatureVerifier::SHA1_LENGTH,
+                 "PSMComponent: Hash too short.");
+    CMT_HASH_Destroy(controlConnection, hashId);
+    hashItem.data = hash;
+    hashItem.len = hashLen;
+  }
+
+  //-- Verify signature
+  // We need to call this function even if we're only creating a principal, not
+  // verifying, because PSM won't give us certificate information unless this
+  // function has been called.
+  result = CMT_PKCS7VerifyDetachedSignature(controlConnection, contentInfo,
+                                            6 /* =Object Signing Cert */,
+                                            3 /* =SHA1 algorithm (MD5=2)*/,
+                                            1,/* Save Certificate */
+                                            &hashItem, (CMInt32*)aErrorCode);
+
+  if (result != CMTSuccess) return NS_ERROR_FAILURE;
+  if (aPlaintext && *aErrorCode != 0) return NS_OK; // Verification failed.
+
+  CMUint32 certID;
+  result = CMT_GetRIDAttribute(controlConnection, contentInfo,
+                               SSM_FID_P7CINFO_SIGNER_CERT, &certID);
+  if ((result != CMTSuccess) || !certID) return NS_OK; // No signature present
+  
+  CMTItem fingerprint;
+  result = CMT_GetStringAttribute(controlConnection, certID,
+                                  SSM_FID_CERT_FINGERPRINT, &fingerprint);
+  if (result != CMTSuccess) return NS_ERROR_FAILURE;
+
+  //-- Get a principal
+  nsresult rv;
+  NS_WITH_SERVICE(nsIScriptSecurityManager, secMan,
+                  NS_SCRIPTSECURITYMANAGER_PROGID, &rv)
+    if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+  rv = secMan->GetCertificatePrincipal((char*)fingerprint.data,
+                                       aPrincipal);
+  if (NS_FAILED(rv)) return rv;
+
+  //-- Get common name and store it in the principal.
+  //   Using common name + organizational unit as the user-visible certificate name
+  nsCOMPtr<nsICertificatePrincipal> certificate = do_QueryInterface(*aPrincipal, &rv);
+  if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
+
+  CMTItem common;
+  result = CMT_GetStringAttribute(controlConnection, certID,
+                                  SSM_FID_CERT_COMMON_NAME, &common);
+  if (result != CMTSuccess) return NS_ERROR_FAILURE;
+  CMTItem subject;
+  result = CMT_GetStringAttribute(controlConnection, certID,
+                                  SSM_FID_CERT_SUBJECT_NAME, &subject);
+  if (result != CMTSuccess) return NS_ERROR_FAILURE;
+
+  nsCAutoString commonName;
+  commonName = (char*)common.data;
+  static const char orgUnitTag[] = " OU=";
+  char* orgUnitPos = PL_strstr((char*)subject.data, orgUnitTag);
+  if (orgUnitPos)
+  {
+    orgUnitPos += sizeof(orgUnitTag)-1;
+    char* orgUnitEnd = PL_strchr(orgUnitPos, ',');
+    PRInt32 orgUnitLen;
+    if(orgUnitEnd)
+      orgUnitLen = orgUnitEnd - orgUnitPos;
+    else
+      orgUnitLen = PL_strlen(orgUnitPos);
+    commonName.Append(' ');
+    commonName.Append(orgUnitPos, orgUnitLen);
+  }
+  char* commonChar = commonName.ToNewCString();
+  if (!commonChar) return NS_ERROR_OUT_OF_MEMORY;
+  rv = certificate->SetCommonName(commonChar);
+  Recycle(commonChar);
+  return rv;
+}
+

mozilla/extensions/psm-glue/src/nsPSMComponent.h

@@ -0,0 +1,60 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+*/
+
+#include "nscore.h"
+#include "nsIPSMComponent.h"
+#include "nsISignatureVerifier.h"
+#include "nsIStringBundle.h"
+
+#include "nsIContentHandler.h"
+
+#define SECURITY_STRING_BUNDLE_URL "chrome://communicator/locale/security.properties"
+
+#define NS_PSMCOMPONENT_CID {0xddcae170, 0x5412, 0x11d3, {0xbb, 0xc8, 0x00, 0x00, 0x86, 0x1d, 0x12, 0x37}}
+
+// Implementation of the PSM component interface.
+class nsPSMComponent : public nsIPSMComponent, 
+                       public nsIContentHandler, 
+                       public nsISignatureVerifier
+{
+public:
+  NS_DEFINE_STATIC_CID_ACCESSOR( NS_PSMCOMPONENT_CID );
+
+  nsPSMComponent();
+  virtual ~nsPSMComponent();
+
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIPSMCOMPONENT
+  NS_DECL_NSICONTENTHANDLER
+  NS_DECL_NSISIGNATUREVERIFIER
+
+  static NS_METHOD CreatePSMComponent(nsISupports* aOuter, REFNSIID aIID, void **aResult);
+
+private:
+  
+  PCMT_CONTROL mControl;
+  
+  nsCOMPtr<nsISupports> mSecureBrowserIU;
+  static nsPSMComponent* mInstance;
+}; 

mozilla/extensions/psm-glue/src/nsPSMModule.cpp

@@ -0,0 +1,178 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+*/
+
+#include "nsIModule.h"
+#include "nsIGenericFactory.h"
+
+#include "nsPSMUICallbacks.h"
+#include "nsPSMComponent.h"
+
+#include "nsISecureBrowserUI.h"
+#include "nsSecureBrowserUIImpl.h"
+
+#include "nsSSLSocketProvider.h"
+
+#include "nsSDR.h"
+#include "nsFSDR.h"
+#include "nsCrypto.h"
+#include "nsKeygenHandler.h"
+//For the NS_CRYPTO_PROGID define
+#include "nsDOMCID.h"
+
+#include "nsCURILoader.h"
+#include "nsISupportsUtils.h"
+
+// Define SDR object constructor
+static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
+static NS_DEFINE_IID(kFormProcessorCID,   NS_IFORMPROCESSOR_CID); 
+
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSecretDecoderRing, init)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsFSecretDecoderRing, init)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsCrypto, init)
+NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPkcs11, init)
+
+static nsModuleComponentInfo components[] =
+{
+    { 
+        PSM_COMPONENT_CLASSNAME,  
+        NS_PSMCOMPONENT_CID, 
+        PSM_COMPONENT_PROGID,   
+        nsPSMComponent::CreatePSMComponent
+    },
+    
+    { 
+        "PSM Content Handler - application/x-x509-ca-cert",  
+        NS_PSMCOMPONENT_CID, 
+        NS_CONTENT_HANDLER_PROGID_PREFIX"application/x-x509-ca-cert",   
+        nsPSMComponent::CreatePSMComponent
+    },
+    
+    { 
+        "PSM Content Handler - application/x-x509-server-cert",  
+        NS_PSMCOMPONENT_CID, 
+        NS_CONTENT_HANDLER_PROGID_PREFIX"application/x-x509-server-cert",   
+        nsPSMComponent::CreatePSMComponent
+    },
+
+    { 
+        "PSM Content Handler - application/x-x509-user-cert",  
+        NS_PSMCOMPONENT_CID, 
+        NS_CONTENT_HANDLER_PROGID_PREFIX"application/x-x509-user-cert",   
+        nsPSMComponent::CreatePSMComponent
+    },
+    
+    { 
+        "PSM Content Handler - application/x-x509-email-cert",  
+        NS_PSMCOMPONENT_CID, 
+        NS_CONTENT_HANDLER_PROGID_PREFIX"application/x-x509-email-cert",   
+        nsPSMComponent::CreatePSMComponent
+    },
+
+
+    { 
+        PSM_UI_HANLDER_CLASSNAME, 
+        NS_PSMUIHANDLER_CID, 
+        PSM_UI_HANLDER_PROGID,  
+        nsPSMUIHandlerImpl::CreatePSMUIHandler
+    },
+
+    { 
+        NS_SECURE_BROWSER_UI_CLASSNAME, 
+        NS_SECURE_BROWSER_UI_CID, 
+        NS_SECURE_BROWSER_UI_PROGID, 
+        nsSecureBrowserUIImpl::Create 
+    },
+
+    { 
+        NS_SECURE_BROWSER_DOCOBSERVER_CLASSNAME, 
+        NS_SECURE_BROWSER_DOCOBSERVER_CID, 
+        NS_SECURE_BROWSER_DOCOBSERVER_PROGID, 
+        nsSecureBrowserUIImpl::Create
+    },
+
+    { 
+        NS_ISSLSOCKETPROVIDER_CLASSNAME,
+        NS_SSLSOCKETPROVIDER_CID,
+        NS_ISSLSOCKETPROVIDER_PROGID,
+        nsSSLSocketProvider::Create 
+    },
+
+    {
+        NS_SDR_CLASSNAME,
+        NS_SDR_CID,
+        NS_SDR_PROGID,
+        nsSecretDecoderRingConstructor
+    },
+
+    {
+        NS_FSDR_CLASSNAME,
+        NS_FSDR_CID,
+        NS_FSDR_PROGID,
+        nsFSecretDecoderRingConstructor
+    },
+    
+    {
+        NS_CRYPTO_CLASSNAME,
+        NS_CRYPTO_CID,
+        NS_CRYPTO_PROGID,
+        nsCryptoConstructor
+    },
+    {
+        NS_PKCS11_CLASSNAME,
+        NS_PKCS11_CID,
+        NS_PKCS11_PROGID,
+        nsPkcs11Constructor
+    }
+
+};
+
+#if 0
+NS_IMPL_NSGETMODULE("PSMComponent", components);
+#endif
+
+extern "C" NS_EXPORT nsresult NSGetModule(nsIComponentManager *servMgr,
+                                          nsIFile* location,
+                                          nsIModule** result)
+{
+  nsresult rv;
+  // Put in code to register KEYGEN form input handler.
+  rv= NS_NewGenericModule("PSMComponent",
+                          sizeof(components) / sizeof(components[0]),
+                          components, nsnull, result);
+  // Register a form processor. The form processor has the opportunity to 
+  // modify the value's passed during form submission. 
+  nsKeygenFormProcessor* testFormProcessor = new nsKeygenFormProcessor(); 
+  nsCOMPtr<nsISupports> formProcessor; 
+  rv = testFormProcessor->QueryInterface(kISupportsIID, 
+                                         getter_AddRefs(formProcessor)); 
+  if (NS_SUCCEEDED(rv) && formProcessor) { 
+    rv = nsServiceManager::RegisterService(kFormProcessorCID, formProcessor); 
+  } 
+  return rv;
+}
+
+
+
+
+

mozilla/extensions/psm-glue/src/nsPSMMutex.c

@@ -0,0 +1,72 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+*/
+
+#include "prmon.h"
+#include "prtypes.h"
+
+#include "nsPSMMutex.h"
+
+static PRMonitor *_nsPSMMutexVar;
+
+PRStatus
+nsPSMMutexInit()
+{
+  if (!_nsPSMMutexVar)
+      _nsPSMMutexVar = PR_NewMonitor();
+
+  return _nsPSMMutexVar ? PR_SUCCESS : PR_FAILURE;
+}
+
+PRStatus
+nsPSMMutexDestroy()
+{
+    if (!_nsPSMMutexVar)
+        return PR_FAILURE;
+    
+    PR_Wait(_nsPSMMutexVar, PR_INTERVAL_NO_TIMEOUT);
+
+    PR_DestroyMonitor(_nsPSMMutexVar);
+    return PR_SUCCESS;
+}
+
+static void
+nsPSMMutexLock(CMTMutexPointer *p)
+{
+  PR_EnterMonitor(*(PRMonitor **)p);
+  return;
+}
+
+static void
+nsPSMMutexUnlock(CMTMutexPointer *p)
+{
+  PR_ExitMonitor(*(PRMonitor **)p);
+  return;
+}
+
+CMT_MUTEX nsPSMMutexTbl = 
+{
+  &_nsPSMMutexVar,
+  (CMTMutexFunction)nsPSMMutexLock,
+  (CMTMutexFunction)nsPSMMutexUnlock
+};

mozilla/extensions/psm-glue/src/nsPSMMutex.h

@@ -0,0 +1,39 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+*/
+
+#ifndef _NSPSMMUTEX_H
+#define _NSPSMMUTEX_H
+
+#include "cmtcmn.h"
+
+PR_BEGIN_EXTERN_C
+
+PR_EXTERN(CMT_MUTEX) nsPSMMutexTbl;
+
+PR_EXTERN(PRStatus) nsPSMMutexInit(void);
+PR_EXTERN(PRStatus) nsPSMMutexDestroy(void);
+
+PR_END_EXTERN_C
+
+#endif

mozilla/extensions/psm-glue/src/nsPSMShimLayer.c

@@ -0,0 +1,293 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+*/
+
+#include "nspr.h"
+#include "nsPSMShimLayer.h"
+
+#ifdef XP_UNIX
+#include <sys/stat.h>
+#include <unistd.h>
+#include "private/pprio.h"  /* for PR_Socket */
+#endif
+
+#define PSM_TIMEOUT_IN_SEC 300
+
+#define NSPSMSHIMMAXFD 50
+
+
+static PRIntervalTime gTimeout  = PR_INTERVAL_NO_TIMEOUT;
+
+CMT_SocketFuncs nsPSMShimTbl =
+{
+    nsPSMShimGetSocket,
+    nsPSMShimConnect,
+    nsPSMShimVerifyUnixSocket,
+    nsPSMShimSend,
+    nsPSMShimSelect,
+    nsPSMShimReceive,
+    nsPSMShimShutdown,
+    nsPSMShimClose
+};
+
+
+CMTSocket
+nsPSMShimGetSocket(int unixSock)
+{
+    PRStatus   rv;
+    PRFileDesc *fd;
+    CMSocket   *sock;
+    PRSocketOptionData sockopt;
+
+    /*
+    if (PR_INTERVAL_NO_WAIT == gTimeout) 
+    {
+        gTimeout  = PR_SecondsToInterval(PSM_TIMEOUT_IN_SEC);
+    }
+    */
+
+    if (unixSock)
+    {
+#ifndef XP_UNIX        
+        return NULL;
+#else
+        fd = PR_Socket(PR_AF_LOCAL, PR_SOCK_STREAM, 0);
+        PR_ASSERT(fd);
+#endif
+    }
+    else
+    {
+        fd = PR_NewTCPSocket();
+        PR_ASSERT(fd);
+
+        /* disable Nagle algorithm delay for control sockets */
+        sockopt.option = PR_SockOpt_NoDelay;
+        sockopt.value.no_delay = PR_TRUE;   
+        rv = PR_SetSocketOption(fd, &sockopt);
+        PR_ASSERT(PR_SUCCESS == rv);
+    }
+
+    sock = (CMSocket *)PR_Malloc(sizeof(CMSocket));
+
+    if (sock == NULL)
+      return sock;
+    
+    sock->fd     = fd;
+    sock->isUnix = unixSock;
+
+    memset(&sock->netAddr, 0, sizeof(PRNetAddr));
+    
+    return (CMTSocket)sock;
+}
+
+CMTStatus
+nsPSMShimConnect(CMTSocket sock, short port, char *path)
+{
+    CMTStatus   rv = CMTSuccess;
+    PRStatus    err;
+    PRErrorCode errcode;
+    PRSocketOptionData   sockopt;
+    PRBool      nonBlocking;
+    CMSocket    *cmSock = (CMSocket *)sock;
+    
+    if (!sock) return CMTFailure;
+
+    if (cmSock->isUnix)
+    {
+#ifndef XP_UNIX
+        return CMTFailure;
+#else
+        int pathLen;
+        if (!path)
+        {
+            return CMTFailure;
+        }
+
+        /* check buffer overrun */
+        pathLen = strlen(path)+1;
+        
+        pathLen = pathLen < sizeof(cmSock->netAddr.local.path)
+                ? pathLen : sizeof(cmSock->netAddr.local.path);
+  
+        memcpy(&cmSock->netAddr.local.path, path, pathLen);
+        cmSock->netAddr.local.family = PR_AF_LOCAL;
+#endif
+    }
+    else  /* cmSock->isUnix */
+    {
+        cmSock->netAddr.inet.family = PR_AF_INET;
+        cmSock->netAddr.inet.port   = PR_htons(port);
+        cmSock->netAddr.inet.ip     = PR_htonl(PR_INADDR_LOOPBACK);
+    }
+
+    /* Save non-blocking status */
+    sockopt.option = PR_SockOpt_Nonblocking;
+    err = PR_GetSocketOption(cmSock->fd, &sockopt);
+    PR_ASSERT(PR_SUCCESS == err);
+
+    nonBlocking = sockopt.value.non_blocking;
+
+    /* make connect blocking for now */
+    sockopt.option = PR_SockOpt_Nonblocking;
+    sockopt.value.non_blocking = PR_FALSE;   
+    err = PR_SetSocketOption(cmSock->fd, &sockopt);
+    PR_ASSERT(PR_SUCCESS == err);
+
+    err = PR_Connect( cmSock->fd, &cmSock->netAddr, PR_INTERVAL_MAX );
+    
+    if (err == PR_FAILURE)    
+    {
+        errcode = PR_GetError();
+        
+        if (PR_IS_CONNECTED_ERROR != errcode)
+            rv = CMTFailure;
+    }    
+    
+    /* restore nonblock status */
+    if (nonBlocking) {
+      sockopt.option = PR_SockOpt_Nonblocking;
+      sockopt.value.non_blocking = nonBlocking;  
+      err = PR_SetSocketOption(cmSock->fd, &sockopt);
+      PR_ASSERT(PR_SUCCESS == err);
+    }
+
+    return rv;
+}
+
+CMTStatus
+nsPSMShimVerifyUnixSocket(CMTSocket sock)
+{
+#ifndef XP_UNIX
+    return CMTFailure;
+#else
+
+    int  rv;
+    CMSocket  *cmSock;
+    struct stat statbuf;
+
+    cmSock = (CMSocket *)sock;
+        
+    if (!cmSock || !cmSock->isUnix) 
+        return CMTFailure;
+ 
+    rv = stat(cmSock->netAddr.local.path, &statbuf);
+    if (rv < 0 || statbuf.st_uid != geteuid() )
+    {
+        PR_Close(cmSock->fd);
+        cmSock->fd = NULL;
+        PR_Free(cmSock);
+        return CMTFailure;
+    }
+    return CMTSuccess;   
+#endif
+}
+
+size_t
+nsPSMShimSend(CMTSocket sock, void *buffer, size_t length)
+{
+    CMSocket *cmSock = (CMSocket *)sock;
+
+    if (!sock) return CMTFailure;
+    
+   return PR_Send(cmSock->fd, buffer, length, 0, gTimeout);
+}
+
+size_t
+nsPSMShimReceive(CMTSocket sock, void *buffer, size_t bufSize)
+{
+    CMSocket *cmSock = (CMSocket *)sock;
+    
+    if (!sock) return CMTFailure;
+
+    return PR_Recv(cmSock->fd, buffer, bufSize, 0, gTimeout);
+}
+
+
+CMTSocket
+nsPSMShimSelect(CMTSocket *socks, int numsocks, int poll)
+{
+    CMSocket       **sockArr = (CMSocket **)socks;
+    PRPollDesc       readPDs[NSPSMSHIMMAXFD];
+    PRIntervalTime   timeout;
+    PRInt32          cnt;
+    int              i;
+
+    if (!socks) return NULL;
+
+    memset(readPDs, 0, sizeof(readPDs));
+
+    PR_ASSERT(NSPSMSHIMMAXFD >= numsocks);
+
+    for (i=0; i<numsocks; i++)
+    {
+        readPDs[i].fd       = sockArr[i]->fd;
+        readPDs[i].in_flags = PR_POLL_READ;
+    }
+
+    timeout = poll ? PR_INTERVAL_NO_WAIT : PR_INTERVAL_NO_TIMEOUT;
+
+    cnt = PR_Poll(readPDs, numsocks, timeout);
+
+    /* Figure out which socket was selected */
+    if (cnt > 0)
+    {
+        for (i=0; i<numsocks; i++)
+        {
+            if (readPDs[i].out_flags & PR_POLL_READ)
+            {
+            return (CMTSocket)sockArr[i];
+            }
+        }
+    }
+    return NULL;
+}
+
+
+CMTStatus
+nsPSMShimShutdown(CMTSocket sock)
+{
+    CMSocket *cmSock = (CMSocket*)sock;
+    PRStatus rv;
+
+    if (!sock) return CMTFailure;
+
+    rv = PR_Shutdown(cmSock->fd, PR_SHUTDOWN_SEND);
+    return (PR_SUCCESS == rv) ? CMTSuccess : CMTFailure;
+}
+
+CMTStatus
+nsPSMShimClose(CMTSocket sock)
+{
+    CMSocket *cmSock = (CMSocket*)sock;
+    PRStatus rv      = PR_SUCCESS;
+    PR_ASSERT(cmSock);
+
+    if (!sock) return CMTFailure;
+
+    rv = PR_Close(cmSock->fd);
+    cmSock->fd = NULL;
+
+    PR_Free(cmSock);
+
+    return (PR_SUCCESS == rv) ? CMTSuccess : CMTFailure;
+}

mozilla/extensions/psm-glue/src/nsPSMShimLayer.h

@@ -0,0 +1,67 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+*/
+
+#ifndef _NSPSMSHIMLAYER_H_
+#define _NSPSMSHIMLAYER_H_
+
+#include "cmtcmn.h"
+#include "prio.h"
+
+PR_BEGIN_EXTERN_C
+
+typedef struct CMSocket {
+    PRFileDesc *fd;
+    PRBool      isUnix;
+    PRNetAddr   netAddr;
+} CMSocket; 
+
+PR_EXTERN(CMT_SocketFuncs) nsPSMShimTbl;
+
+PR_EXTERN(CMTSocket)
+nsPSMShimGetSocket(int unixSock);
+
+PR_EXTERN(CMTStatus)
+nsPSMShimConnect(CMTSocket sock, short port, char *path);
+
+PR_EXTERN(CMTStatus)
+nsPSMShimVerifyUnixSocket(CMTSocket sock);
+
+PR_EXTERN(size_t)
+nsPSMShimSend(CMTSocket sock, void *buffer, size_t length);
+
+PR_EXTERN(CMTSocket)
+nsPSMShimSelect(CMTSocket *socks, int numsocks, int poll);
+
+PR_EXTERN(size_t)
+nsPSMShimReceive(CMTSocket sock, void *buffer, size_t bufSize);
+
+PR_EXTERN(CMTStatus)
+nsPSMShimShutdown(CMTSocket sock);
+
+PR_EXTERN(CMTStatus)
+nsPSMShimClose(CMTSocket sock);
+
+PR_END_EXTERN_C
+
+#endif /* _NSPSMSHIMLAYER_H_ */

mozilla/extensions/psm-glue/src/nsPSMUICallbacks.cpp

@@ -0,0 +1,348 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+*/
+
+#include "nsProxiedService.h"
+#include "nsIEventQueueService.h"
+#include "nsPSMUICallbacks.h"
+#include "nsINetSupportDialogService.h"
+#include "nsIFilePicker.h"
+
+#include "nsAppShellCIDs.h"
+#include "prprf.h"
+#include "prmem.h"
+
+#include "nsSSLIOLayer.h" // for SSMSTRING_PADDED_LENGTH
+#include "ssmdefs.h"
+#include "rsrcids.h"
+
+// Interfaces Needed
+#include "nsIAppShellService.h"
+#include "nsIDocShell.h"
+#include "nsIDOMWindow.h"
+#include "nsIInterfaceRequestor.h"
+#include "nsIPrompt.h"
+#include "nsIScriptGlobalObject.h"
+#include "nsIURL.h"
+#include "nsIXULWindow.h"
+
+static NS_DEFINE_IID(kAppShellServiceCID, NS_APPSHELL_SERVICE_CID);
+static NS_DEFINE_CID(kNetSupportDialogCID, NS_NETSUPPORTDIALOG_CID);
+
+
+// Happy callbacks
+static char * PromptUserCallback(void *arg, char *prompt, int isPasswd);
+static char * FilePathPromptCallback(void *arg, char *prompt, char *fileRegEx, CMUint32 shouldFileExist);
+static void   ApplicationFreeCallback(char *userInput);
+
+static void * CartmanUIHandler(uint32 resourceID, void* clientContext, uint32 width, uint32 height, 
+								CMBool isModal, char* urlStr, void *data);
+
+extern "C" void CARTMAN_UIEventLoop(void *data);
+
+
+/* nsISupports Implementation for the class */
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsPSMUIHandlerImpl, nsIPSMUIHandler)
+
+NS_METHOD
+nsPSMUIHandlerImpl::DisplayURI(PRInt32 width, PRInt32 height, PRBool modal, const char *urlStr)
+{
+    nsresult rv;
+    nsCOMPtr<nsIDOMWindow> hiddenWindow;
+    JSContext *jsContext;
+
+    NS_WITH_SERVICE(nsIAppShellService, appShell, kAppShellServiceCID, &rv);
+	if (NS_SUCCEEDED(rv))
+	{
+		rv = appShell->GetHiddenWindowAndJSContext( getter_AddRefs( hiddenWindow ),
+                                                    &jsContext );
+
+	     if ( NS_SUCCEEDED( rv ) ) 
+         {
+            // Set up arguments for "window.open"
+            void *stackPtr;
+            char params[36];
+
+            if (modal)  // if you change this, remember to change the buffer size above.
+                strcpy(params, "menubar=no,height=%d,width=%d,modal");
+            else
+                strcpy(params, "menubar=no,height=%d,width=%d");
+
+            char buffer[256];
+            PR_snprintf(buffer,
+                        sizeof(buffer),
+                        params,
+                        height,
+                        width );
+
+            jsval	*argv = JS_PushArguments(jsContext, &stackPtr, "sss", urlStr, "_blank", buffer);
+            if (argv)
+            {
+	            // open the window
+	            nsIDOMWindow	*newWindow;
+	            hiddenWindow->Open(jsContext, argv, 3, &newWindow);
+                newWindow->ResizeTo(width, height);
+	            JS_PopArguments(jsContext, stackPtr);
+            }
+        }
+    }
+    return rv;
+}
+
+NS_IMETHODIMP
+nsPSMUIHandlerImpl::PromptForFile(const PRUnichar *prompt, const char *fileRegEx, PRBool shouldFileExist, char **outFile)
+{
+    NS_ENSURE_ARG_POINTER(outFile);
+    nsCOMPtr<nsIFilePicker> fp = do_CreateInstance("component://mozilla/filepicker");
+    
+    if (!fp)
+        return NS_ERROR_NULL_POINTER;
+
+
+    fp->Init(nsnull, prompt, nsIFilePicker::modeOpen);
+    fp->AppendFilter(NS_ConvertASCIItoUCS2(fileRegEx).GetUnicode(), NS_ConvertASCIItoUCS2(fileRegEx).GetUnicode());  
+    fp->AppendFilters(nsIFilePicker::filterAll);
+    PRInt16 mode;
+    nsresult rv = fp->Show(&mode);
+
+    if (NS_FAILED(rv) || (mode == nsIFilePicker::returnCancel))
+         return rv;
+
+    nsCOMPtr<nsILocalFile> file;
+    rv = fp->GetFile(getter_AddRefs(file));
+
+    if (file)
+      file->GetPath(outFile);
+
+    return rv;
+}
+
+NS_METHOD      
+nsPSMUIHandlerImpl::CreatePSMUIHandler(nsISupports* aOuter, REFNSIID aIID, void **aResult)
+{                                                                  
+    nsresult rv = NS_OK; 
+    if ( aResult ) 
+    { 
+        /* Allocate new find component object. */
+        nsPSMUIHandlerImpl *component = new nsPSMUIHandlerImpl(); 
+        if ( component ) 
+        { 
+            /* Allocated OK, do query interface to get proper */
+            /* pointer and increment refcount.                */
+            rv = component->QueryInterface( aIID, aResult ); 
+            if ( NS_FAILED( rv ) ) 
+            { 
+                /* refcount still at zero, delete it here. */
+                delete component; 
+            } 
+        } 
+        else 
+        { 
+            rv = NS_ERROR_OUT_OF_MEMORY; 
+        } 
+    } 
+    else 
+    { 
+        rv = NS_ERROR_NULL_POINTER; 
+    } 
+    return rv; 
+} 
+
+
+
+extern "C" void CARTMAN_UIEventLoop(void *data)
+{
+   CMT_EventLoop((PCMT_CONTROL)data);
+}
+
+PRStatus InitPSMEventLoop(PCMT_CONTROL control)
+{
+    PR_CreateThread(PR_USER_THREAD,
+                    CARTMAN_UIEventLoop,
+                    control, 
+                    PR_PRIORITY_NORMAL, 
+                    PR_GLOBAL_THREAD, 
+                    PR_UNJOINABLE_THREAD,
+                    0);  
+
+    return PR_SUCCESS;
+}
+
+PRStatus InitPSMUICallbacks(PCMT_CONTROL control)
+{
+    if (!control)
+        return PR_FAILURE;  
+    
+    CMT_SetPromptCallback(control, (promptCallback_fn)PromptUserCallback, nsnull);
+    CMT_SetAppFreeCallback(control, (applicationFreeCallback_fn) ApplicationFreeCallback);
+    CMT_SetFilePathPromptCallback(control, (filePathPromptCallback_fn) FilePathPromptCallback, nsnull);
+
+    if (CMT_SetUIHandlerCallback(control, (uiHandlerCallback_fn) CartmanUIHandler, NULL) != CMTSuccess) 
+            return PR_FAILURE;
+
+    return PR_SUCCESS;
+}
+
+PRStatus DisplayPSMUIDialog(PCMT_CONTROL control, const char *pickledStatus, const char *hostName)
+{
+    CMUint32 advRID = 0;
+    CMInt32 width = 0;
+    CMInt32 height = 0;
+    CMTItem urlItem = {0, NULL, 0};
+    CMTStatus rv = CMTSuccess;
+    CMTItem advisorContext = {0, NULL, 0};
+    void * pwin;
+
+    CMTSecurityAdvisorData data;
+    memset(&data, '\0', sizeof(CMTSecurityAdvisorData));
+    
+    if (hostName)
+    {
+        // if there is a hostName, than this request is about
+        // a webpage.  
+        data.hostname    = (char*) hostName;
+        data.infoContext = SSM_BROWSER;
+    
+        if (pickledStatus)
+        {
+            CMTItem pickledResource = {0, NULL, 0};
+            CMUint32 socketStatus = 0;
+    
+            pickledResource.len = *(int*)(pickledStatus);
+            pickledResource.data = (unsigned char*) PR_Malloc(SSMSTRING_PADDED_LENGTH(pickledResource.len));
+        
+            if (! pickledResource.data) return PR_FAILURE;
+
+            memcpy(pickledResource.data, pickledStatus+sizeof(int), pickledResource.len);
+        
+            /* Unpickle the SSL Socket Status */
+            if (CMT_UnpickleResource( control, 
+                                      SSM_RESTYPE_SSL_SOCKET_STATUS,
+                                      pickledResource, 
+                                      &socketStatus) == CMTSuccess)
+            {
+                data.infoContext = SSM_BROWSER;    
+                data.resID = socketStatus;
+            }
+
+            PR_FREEIF(pickledResource.data);
+        }
+    }
+
+    /* Create a Security Advisor context object. */
+    rv = CMT_SecurityAdvisor(control, &data, &advRID);
+
+    if (rv != CMTSuccess)
+        return PR_FAILURE;
+
+    /* Get the URL, width, height, etc. from the advisor context. */
+    rv = CMT_GetStringAttribute(control, 
+                                advRID, 
+                                SSM_FID_SECADVISOR_URL,
+                                &urlItem);
+
+    if ((rv != CMTSuccess) || (!urlItem.data))
+        return PR_FAILURE;
+
+    rv = CMT_GetNumericAttribute(control, 
+                                 advRID, 
+                                 SSM_FID_SECADVISOR_WIDTH,
+                                 &width);
+    if (rv != CMTSuccess)
+        return PR_FAILURE;
+
+    rv = CMT_GetNumericAttribute(control, 
+                                 advRID, 
+                                 SSM_FID_SECADVISOR_HEIGHT,
+                                 &height);
+    if (rv != CMTSuccess)
+        return PR_FAILURE;
+
+    /* Fire the URL up in a window of its own. */
+    pwin = CartmanUIHandler(advRID, nsnull, width, height, CM_FALSE, (char*)urlItem.data, NULL);
+    
+    //allocated by cmt, we can free with free:
+    free(urlItem.data);
+    
+    return PR_SUCCESS;
+}
+
+
+
+void* CartmanUIHandler(uint32 resourceID, void* clientContext, uint32 width, uint32 height, CMBool isModal, char* urlStr, void *data)
+{
+    nsresult rv = NS_OK;
+    
+    NS_WITH_PROXIED_SERVICE(nsIPSMUIHandler, handler, nsPSMUIHandlerImpl::GetCID(), NS_UI_THREAD_EVENTQ, &rv);
+    
+    if(NS_SUCCEEDED(rv))
+	    handler->DisplayURI(width, height, isModal, urlStr);
+
+    return nsnull;
+}
+
+    
+    
+char * PromptUserCallback(void *arg, char *prompt, int isPasswd)
+{
+
+    nsresult rv = NS_OK;
+    PRUnichar *password;
+    PRBool  value;
+
+    NS_WITH_PROXIED_SERVICE(nsIPrompt, dialog, kNetSupportDialogCID, NS_UI_THREAD_EVENTQ, &rv);
+    
+    if (NS_SUCCEEDED(rv)) {
+	    rv = dialog->PromptPassword(nsnull, NS_ConvertASCIItoUCS2(prompt).GetUnicode(),
+                                  NS_ConvertASCIItoUCS2(" ").GetUnicode(),      // hostname
+                                  PR_TRUE, &password, &value);
+
+        if (NS_SUCCEEDED(rv) && value) {
+            nsString a(password);
+            char* str = a.ToNewCString();
+            Recycle(password);
+            return str;
+        }
+    }
+
+    return nsnull;
+}
+
+void ApplicationFreeCallback(char *userInput)
+{
+    nsMemory::Free(userInput);
+}
+
+char * FilePathPromptCallback(void *arg, char *prompt, char *fileRegEx, CMUint32 shouldFileExist)
+{
+    nsresult rv = NS_OK;
+    
+    char* filePath = nsnull;
+    
+    NS_WITH_PROXIED_SERVICE(nsIPSMUIHandler, handler, nsPSMUIHandlerImpl::GetCID(), NS_UI_THREAD_EVENTQ, &rv);
+    
+    if(NS_SUCCEEDED(rv))
+	    handler->PromptForFile(NS_ConvertASCIItoUCS2(prompt).GetUnicode(), fileRegEx, (PRBool)shouldFileExist, &filePath);
+
+    return filePath;
+}

mozilla/extensions/psm-glue/src/nsPSMUICallbacks.h

@@ -0,0 +1,56 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+*/
+
+#ifndef _NSPSMUICALLBACKS_H
+#define _NSPSMUICALLBACKS_H
+
+#include "prtypes.h"
+#include "cmtcmn.h"
+
+#include "nsIPSMUIHandler.h"
+
+PRStatus InitPSMUICallbacks(PCMT_CONTROL gControl);
+PRStatus InitPSMEventLoop(PCMT_CONTROL gControl);
+PRStatus DisplayPSMUIDialog(PCMT_CONTROL control, const char* pickledStatus, const char *hostName);
+
+
+#define NS_PSMUIHANDLER_CID {0x15944e30, 0x601e, 0x11d3, {0x8c, 0x4a, 0x00, 0x00, 0x64, 0x65, 0x73, 0x74}}
+
+class nsPSMUIHandlerImpl : public nsIPSMUIHandler 
+{
+    public:
+
+        NS_DEFINE_STATIC_CID_ACCESSOR( NS_PSMUIHANDLER_CID );
+    
+        /* ctor/dtor */
+        nsPSMUIHandlerImpl() { NS_INIT_REFCNT(); }
+        virtual ~nsPSMUIHandlerImpl() { }
+
+        NS_DECL_ISUPPORTS
+        NS_DECL_NSIPSMUIHANDLER
+
+        static NS_METHOD CreatePSMUIHandler(nsISupports* aOuter, REFNSIID aIID, void **aResult);
+};
+
+#endif

mozilla/extensions/psm-glue/src/nsSDR.cpp

@@ -0,0 +1,320 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ *  thayes@netscape.com
+ */
+
+#include "stdlib.h"
+#include "plstr.h"
+#include "nsMemory.h"
+#include "nsIServiceManager.h"
+
+#include "plbase64.h"
+
+#include "nsISecretDecoderRing.h"
+
+#include "cmtcmn.h"
+#include "nsIPSMComponent.h"
+
+#include "nsSDR.h"
+
+NS_IMPL_ISUPPORTS1(nsSecretDecoderRing, nsISecretDecoderRing)
+
+nsSecretDecoderRing::nsSecretDecoderRing()
+{
+  NS_INIT_ISUPPORTS();
+
+  mPSM = NULL;
+}
+
+nsSecretDecoderRing::~nsSecretDecoderRing()
+{
+  if (mPSM) mPSM->Release();
+}
+
+/* Init the new instance */
+nsresult nsSecretDecoderRing::
+init()
+{
+  nsresult rv;
+  nsISupports *psm;
+
+  rv = nsServiceManager::GetService(kPSMComponentProgID, NS_GET_IID(nsIPSMComponent),
+                                    &psm);
+  if (rv != NS_OK) goto loser;  /* Should promote error */
+
+  mPSM = (nsIPSMComponent *)psm;
+
+loser:
+  return rv;
+}
+
+/* [noscript] long encrypt (in buffer data, in long dataLen, out buffer result); */
+NS_IMETHODIMP nsSecretDecoderRing::
+Encrypt(unsigned char * data, PRInt32 dataLen, unsigned char * *result, PRInt32 *_retval)
+{
+    nsresult rv = NS_OK;
+    unsigned char *r = 0;
+    CMT_CONTROL *control;
+    CMTStatus status;
+    CMUint32 cLen;
+
+    if (data == nsnull || result == nsnull || _retval == nsnull) {
+       rv = NS_ERROR_INVALID_POINTER;
+       goto loser;
+    }
+
+    /* Check object initialization */
+    NS_ASSERTION(mPSM != nsnull, "SDR object not initialized");
+    if (mPSM == nsnull) { rv = NS_ERROR_NOT_INITIALIZED; goto loser; }
+
+    /* Get the control connect to use for the request */
+    rv = mPSM->GetControlConnection(&control);
+    if (rv != NS_OK) { rv = NS_ERROR_NOT_AVAILABLE; goto loser; }
+   
+    status = CMT_SDREncrypt(control, (void *)0, (const unsigned char *)0, 0, 
+               data, dataLen, result, &cLen);
+    if (status != CMTSuccess) { rv = NS_ERROR_FAILURE; goto loser; } /* XXX */
+
+    /* Copy returned data to nsMemory buffer ? */
+    *_retval = cLen;
+
+loser:
+    return rv;
+}
+
+/* [noscript] long decrypt (in buffer data, in long dataLen, out buffer result); */
+NS_IMETHODIMP nsSecretDecoderRing::
+Decrypt(unsigned char * data, PRInt32 dataLen, unsigned char * *result, PRInt32 *_retval)
+{
+    nsresult rv = NS_OK;
+    CMTStatus status;
+    CMT_CONTROL *control;
+    CMUint32 len;
+
+    if (data == nsnull || result == nsnull || _retval == nsnull) {
+       rv = NS_ERROR_INVALID_POINTER;
+       goto loser;
+    }
+
+    /* Check object initialization */
+    NS_ASSERTION(mPSM != nsnull, "SDR object not initialized");
+    if (mPSM == nsnull) { rv = NS_ERROR_NOT_INITIALIZED; goto loser; }
+
+    /* Get the control connection */
+    rv = mPSM->GetControlConnection(&control);
+    if (rv != NS_OK) { rv = NS_ERROR_NOT_AVAILABLE; goto loser; }
+    
+    /* Call PSM to decrypt the value */
+    status = CMT_SDRDecrypt(control, (void *)0, data, dataLen, result, &len);
+    if (status != CMTSuccess) { rv = NS_ERROR_FAILURE; goto loser; } /* Promote? */
+
+    /* Copy returned data to nsMemory buffer ? */
+    *_retval = len;
+
+loser:
+    return rv;
+}
+
+/* string encryptString (in string text); */
+NS_IMETHODIMP nsSecretDecoderRing::
+EncryptString(const char *text, char **_retval)
+{
+    nsresult rv = NS_OK;
+    unsigned char *encrypted = 0;
+    PRInt32 eLen;
+
+    if (text == nsnull || _retval == nsnull) {
+        rv = NS_ERROR_INVALID_POINTER;
+        goto loser;
+    }
+
+    rv = Encrypt((unsigned char *)text, PL_strlen(text), &encrypted, &eLen);
+    if (rv != NS_OK) { goto loser; }
+
+    rv = encode(encrypted, eLen, _retval);
+
+loser:
+    if (encrypted) nsMemory::Free(encrypted);
+
+    return rv;
+}
+
+/* string decryptString (in string crypt); */
+NS_IMETHODIMP nsSecretDecoderRing::
+DecryptString(const char *crypt, char **_retval)
+{
+    nsresult rv = NS_OK;
+    char *r = 0;
+    unsigned char *decoded = 0;
+    PRInt32 decodedLen;
+    unsigned char *decrypted = 0;
+    PRInt32 decryptedLen;
+
+    if (crypt == nsnull || _retval == nsnull) {
+      rv = NS_ERROR_INVALID_POINTER;
+      goto loser;
+    }
+
+    rv = decode(crypt, &decoded, &decodedLen);
+    if (rv != NS_OK) goto loser;
+
+    rv = Decrypt(decoded, decodedLen, &decrypted, &decryptedLen);
+    if (rv != NS_OK) goto loser;
+
+    // Convert to NUL-terminated string
+    r = (char *)nsMemory::Alloc(decryptedLen+1);
+    if (!r) { rv = NS_ERROR_OUT_OF_MEMORY; goto loser; }
+
+    memcpy(r, decrypted, decryptedLen);
+    r[decryptedLen] = 0;
+
+    *_retval = r;
+    r = 0;
+
+loser:
+    if (r) nsMemory::Free(r);
+    if (decrypted) nsMemory::Free(decrypted);
+    if (decoded) nsMemory::Free(decoded);
+ 
+    return rv;
+}
+
+/* void changePassword(); */
+NS_IMETHODIMP nsSecretDecoderRing::
+ChangePassword()
+{
+  nsresult rv = NS_OK;
+  CMTStatus status;
+  CMT_CONTROL *control;
+
+  rv = mPSM->GetControlConnection(&control);
+  if (rv != NS_OK) { rv = NS_ERROR_NOT_AVAILABLE; goto loser; }
+
+  status = CMT_SDRChangePassword(control, (void*)0);
+
+loser:
+  return rv;
+}
+
+/* void logout(); */
+NS_IMETHODIMP nsSecretDecoderRing::
+Logout()
+{
+    nsresult rv = NS_OK;
+    CMTStatus status;
+    CMT_CONTROL *control;
+
+    /* Check object initialization */
+    NS_ASSERTION(mPSM != nsnull, "SDR object not initialized");
+    if (mPSM == nsnull) { rv = NS_ERROR_NOT_INITIALIZED; goto loser; }
+
+    /* Get the control connection */
+    rv = mPSM->GetControlConnection(&control);
+    if (rv != NS_OK) { rv = NS_ERROR_NOT_AVAILABLE; goto loser; }
+    
+    /* Call PSM to decrypt the value */
+    status = CMT_LogoutAllTokens(control);
+    if (status != CMTSuccess) { rv = NS_ERROR_FAILURE; goto loser; } /* Promote? */
+
+loser:
+    return rv;
+}
+
+
+// Support routines
+
+nsresult nsSecretDecoderRing::
+encode(const unsigned char *data, PRInt32 dataLen, char **_retval)
+{
+    nsresult rv = NS_OK;
+
+    *_retval = PL_Base64Encode((const char *)data, dataLen, NULL);
+    if (!*_retval) { rv = NS_ERROR_OUT_OF_MEMORY; goto loser; }
+
+loser:
+    return rv;
+
+#if 0
+    nsresult rv = NS_OK;
+    char *r = 0;
+
+    // Allocate space for encoded string (with NUL)
+    r = (char *)nsMemory::Alloc(dataLen+1);
+    if (!r) { rv = NS_ERROR_OUT_OF_MEMORY; goto loser; }
+
+    memcpy(r, data, dataLen);
+    r[dataLen] = 0;
+
+    *_retval = r;
+    r = 0;
+
+loser:
+    if (r) nsMemory::Free(r);
+
+    return rv;
+#endif
+}
+
+nsresult nsSecretDecoderRing::
+decode(const char *data, unsigned char **result, PRInt32 * _retval)
+{
+    nsresult rv = NS_OK;
+    PRUint32 len = PL_strlen(data);
+    int adjust = 0;
+
+    /* Compute length adjustment */
+    if (data[len-1] == '=') {
+      adjust++;
+      if (data[len-2] == '=') adjust++;
+    }
+
+    *result = (unsigned char *)PL_Base64Decode(data, len, NULL);
+    if (!*result) { rv = NS_ERROR_ILLEGAL_VALUE; goto loser; }
+
+    *_retval = (len*3)/4 - adjust;
+
+loser:
+    return rv;
+
+#if 0
+    nsresult rv = NS_OK;
+    unsigned char *r = 0;
+    PRInt32 rLen;
+
+    // Allocate space for decoded string (missing NUL)
+    rLen = PL_strlen(data);
+    r = (unsigned char *)nsMemory::Alloc(rLen);
+    if (!r) { rv = NS_ERROR_OUT_OF_MEMORY; goto loser; }
+
+    memcpy(r, data, rLen);
+
+    *result = r;
+    r = 0;
+    *_retval = rLen;
+
+loser:
+    if (r) nsMemory::Free(r);
+
+    return rv;
+#endif
+}
+
+const char * nsSecretDecoderRing::kPSMComponentProgID = PSM_COMPONENT_PROGID;

mozilla/extensions/psm-glue/src/nsSDR.h

@@ -0,0 +1,58 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Terry Hayes <thayes@netscape.com>
+ */
+
+#ifndef _NSSDR_H_
+#define _NSSDR_H_
+
+#include "nsISecretDecoderRing.h"
+
+// ===============================================
+// nsSecretDecoderRing - implementation of nsISecretDecoderRing
+// ===============================================
+
+#define NS_SDR_CLASSNAME "Secret Decoder Ring"
+#define NS_SDR_CID \
+  { 0xd9a0341, 0xce7, 0x11d4, { 0x9f, 0xdd, 0x0, 0x0, 0x64, 0x65, 0x73, 0x74 } }
+#define NS_SDR_PROGID "netscape.security.sdr"
+
+class nsSecretDecoderRing : public nsISecretDecoderRing
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSISECRETDECODERRING
+
+  nsSecretDecoderRing();
+  virtual ~nsSecretDecoderRing();
+
+  nsresult init();
+
+private:
+  nsIPSMComponent *mPSM;
+
+  static const char *kPSMComponentProgID;
+
+  nsresult encode(const unsigned char *data, PRInt32 dataLen, char **_retval);
+  nsresult decode(const char *data, unsigned char **result, PRInt32 * _retval);
+};
+
+#endif /* _NSSDR_H_ */

mozilla/extensions/psm-glue/src/nsSSLIOLayer.cpp

@@ -0,0 +1,550 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+*/
+
+#include "nspr.h"
+#include "nsString.h"
+#include "cmtcmn.h"
+
+#include "nsIPSMComponent.h"
+#include "nsIPSMSocketInfo.h"
+#include "nsIServiceManager.h"
+#include "nsPSMShimLayer.h"
+#include "nsSSLIOLayer.h"
+
+static PRDescIdentity  nsSSLIOLayerIdentity;
+static PRIOMethods     nsSSLIOLayerMethods;
+static nsIPSMComponent* gPSMService = nsnull;
+
+
+
+class nsPSMSocketInfo : public nsIPSMSocketInfo
+{
+public:
+    nsPSMSocketInfo();
+    virtual ~nsPSMSocketInfo();
+
+    NS_DECL_ISUPPORTS
+    NS_DECL_NSIPSMSOCKETINFO
+
+    // internal functions to psm-glue.
+    nsresult SetSocketPtr(CMSocket *socketPtr);
+    nsresult SetControlPtr(CMT_CONTROL *aControlPtr);
+    nsresult SetFileDescPtr(PRFileDesc *aControlPtr);
+    nsresult SetHostName(char *aHostName);
+    nsresult SetProxyName(char *aName);
+
+    nsresult SetHostPort(PRInt32 aPort);
+    nsresult SetProxyPort(PRInt32 aPort);
+    nsresult SetPickledStatus();
+
+protected:
+    CMT_CONTROL* mControl;
+    CMSocket*    mSocket;
+    PRFileDesc*  mFd;
+    
+    nsString     mHostName;
+    PRInt32      mHostPort;
+    
+    nsString     mProxyName;
+    PRInt32      mProxyPort;
+    
+    unsigned char* mPickledStatus;
+};
+
+
+static PRStatus PR_CALLBACK
+nsSSLIOLayerConnect(PRFileDesc *fd, const PRNetAddr *addr, PRIntervalTime timeout)
+{
+    nsresult                result;
+    PRStatus                rv = PR_SUCCESS;
+    CMTStatus               status = CMTFailure;
+    
+    /* Set the error in case of failure. */
+
+    PR_SetError(PR_UNKNOWN_ERROR, status);
+
+    if (!fd || !addr || !fd->secret || !gPSMService)
+        return PR_FAILURE;
+    
+    char ipBuffer[PR_NETDB_BUF_SIZE];
+    rv = PR_NetAddrToString(addr, (char*)&ipBuffer, PR_NETDB_BUF_SIZE);
+    if (rv != PR_SUCCESS)
+        return PR_FAILURE;
+    
+    if (addr->raw.family == PR_AF_INET6 && PR_IsNetAddrType(addr, PR_IpAddrV4Mapped)) 
+    {
+      /* Chop off the leading "::ffff:" */
+      strcpy(ipBuffer, ipBuffer + 7);
+    }
+
+    
+    CMT_CONTROL *control;
+    result = gPSMService->GetControlConnection(&control);
+    if (result != PR_SUCCESS)
+        return PR_FAILURE;
+    
+    CMSocket* cmsock = (CMSocket *)PR_Malloc(sizeof(CMSocket));
+    if (!cmsock)
+        return PR_FAILURE;
+    
+    memset(cmsock, 0, sizeof(CMSocket));
+    
+    cmsock->fd        = fd->lower;
+    cmsock->isUnix    = PR_FALSE;
+   
+    nsPSMSocketInfo *infoObject = (nsPSMSocketInfo *)fd->secret;
+    
+    infoObject->SetControlPtr(control);
+    infoObject->SetSocketPtr(cmsock);
+    
+    char* proxyName;
+    char* hostName;
+    infoObject->GetProxyName(&proxyName);
+    infoObject->GetHostName(&hostName);
+    
+    if (!proxyName)
+    {
+        // Direct connection
+        status = CMT_OpenSSLConnection(control,
+                                       cmsock,
+                                       SSM_REQUEST_SSL_DATA_SSL,
+                                       PR_ntohs(addr->inet.port),
+                                       ipBuffer,
+                                       (hostName ? hostName : ipBuffer),
+                                       CM_FALSE, 
+                                       nsnull);
+    
+    }
+    else
+    {
+        // not supported yet.
+
+        return PR_FAILURE;
+#if 0
+        PRInt32 destPort;
+        
+        infoObject->GetProxyPort(&destPort);
+
+        status = CMT_OpenSSLProxyConnection(control,
+                                            cmsock,
+                                            destPort, 
+                                            proxyName,  // wants IP
+                                            hostName);
+#endif
+    }
+
+    if (hostName)  Recycle(hostName);
+    if (proxyName) Recycle(proxyName);
+        
+    if (CMTSuccess == status)
+    {
+        // since our stuff can block, what we want to do is return PR_FAILURE,
+        // but set the nspr ERROR to BLOCK.  This will put us into a select
+        // q.
+        PR_SetError(PR_WOULD_BLOCK_ERROR, status);
+        return PR_FAILURE;
+    }
+
+    return PR_FAILURE;
+}
+
+  /* CMT_DestroyDataConnection(ctrl, sock); */
+  /*   need to strip our layer, pass result to DestroyDataConnection */
+  /*   which will clean up the CMT accounting of sock, then call our */
+  /*   shim layer to translate back to NSPR */
+
+static PRStatus PR_CALLBACK
+nsSSLIOLayerClose(PRFileDesc *fd)
+{
+  nsPSMSocketInfo *infoObject    = (nsPSMSocketInfo *)fd->secret;
+  PRDescIdentity          id     = PR_GetLayersIdentity(fd);
+   
+  if (infoObject && id == nsSSLIOLayerIdentity)
+  {
+    CMInt32 errorCode = PR_FAILURE;
+    CMT_CONTROL* control;
+    CMSocket*    socket;
+    
+    PR_Shutdown(fd, PR_SHUTDOWN_BOTH);
+
+    infoObject->GetControlPtr(&control);
+    infoObject->GetSocketPtr(&socket);
+    infoObject->SetPickledStatus();
+
+    CMT_GetSSLDataErrorCode(control, socket, &errorCode);
+    CMT_DestroyDataConnection(control, socket);
+    NS_RELEASE(infoObject);  // if someone is interested in us, the better have an addref.
+    fd->identity = PR_INVALID_IO_LAYER;
+    
+    return (PRStatus)errorCode;
+  }
+
+  return PR_FAILURE;
+}
+ 
+static PRInt32 PR_CALLBACK
+nsSSLIOLayerRead( PRFileDesc *fd, void *buf, PRInt32 amount)
+{
+    if (!fd)
+        return PR_FAILURE;
+
+    PRInt32 result = PR_Recv(fd, buf, amount, 0, PR_INTERVAL_MIN);
+    
+    if (result > 0)
+        return result;
+    
+    if (result == -1)
+    {
+        PRErrorCode code = PR_GetError();
+
+        if (code == PR_IO_TIMEOUT_ERROR )
+            PR_SetError(PR_WOULD_BLOCK_ERROR, PR_WOULD_BLOCK_ERROR);
+        return PR_FAILURE;
+    }
+    
+    if (result == 0)
+    {
+        nsPSMSocketInfo *infoObject    = (nsPSMSocketInfo *)fd->secret;
+        PRDescIdentity          id     = PR_GetLayersIdentity(fd);
+
+        if (infoObject && id == nsSSLIOLayerIdentity)
+        {
+            CMInt32 errorCode = PR_FAILURE;
+            
+            CMT_CONTROL* control;
+            CMSocket*    socket;
+    
+            infoObject->GetControlPtr(&control);
+            infoObject->GetSocketPtr(&socket);
+
+            CMT_GetSSLDataErrorCode(control, socket, &errorCode);
+
+			if (errorCode == PR_IO_TIMEOUT_ERROR)
+			{
+				PR_SetError(PR_WOULD_BLOCK_ERROR, PR_WOULD_BLOCK_ERROR);
+				return PR_FAILURE;
+			}
+
+            PR_SetError(0, 0);
+            return errorCode;
+        }
+    }
+
+    return result;
+}
+
+static PRInt32 PR_CALLBACK
+nsSSLIOLayerWrite( PRFileDesc *fd, const void *buf, PRInt32 amount)
+{
+    if (!fd)
+        return PR_FAILURE;
+
+    PRInt32 result = PR_Send(fd, buf, amount, 0, PR_INTERVAL_MIN);
+    
+    if (result > 0)
+        return result;
+
+    if (result == -1)
+    {
+        PRErrorCode code = PR_GetError();
+
+        if (code == PR_IO_TIMEOUT_ERROR )
+            PR_SetError(PR_WOULD_BLOCK_ERROR, PR_WOULD_BLOCK_ERROR);
+        return PR_FAILURE;
+    }
+
+    if (result == 0)
+    {
+        nsPSMSocketInfo *infoObject    = (nsPSMSocketInfo *)fd->secret;
+        PRDescIdentity          id     = PR_GetLayersIdentity(fd);
+
+        if (infoObject && id == nsSSLIOLayerIdentity)
+        {
+            CMInt32 errorCode = PR_FAILURE;
+            CMT_CONTROL* control;
+            CMSocket*    socket;
+    
+            infoObject->GetControlPtr(&control);
+            infoObject->GetSocketPtr(&socket);
+
+            CMT_GetSSLDataErrorCode(control, socket, &errorCode);
+            PR_SetError(0, 0);
+            return errorCode;
+        }
+    }
+    return result;
+}
+
+
+
+nsPSMSocketInfo::nsPSMSocketInfo()
+{ 
+    NS_INIT_REFCNT(); 
+    mControl = nsnull; 
+    mSocket = nsnull;
+    mPickledStatus = nsnull;
+}
+
+nsPSMSocketInfo::~nsPSMSocketInfo()
+{
+    PR_FREEIF(mPickledStatus);    
+}
+
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsPSMSocketInfo, nsIPSMSocketInfo);
+
+NS_IMETHODIMP
+nsPSMSocketInfo::GetControlPtr(CMT_CONTROL * *aControlPtr)
+{
+    *aControlPtr = mControl;
+    return NS_OK;
+}
+
+nsresult
+nsPSMSocketInfo::SetControlPtr(CMT_CONTROL *aControlPtr)
+{
+    mControl = aControlPtr;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsPSMSocketInfo::GetSocketPtr(CMSocket * *socketPtr)
+{
+    *socketPtr = mSocket;
+    return NS_OK;
+}
+
+nsresult
+nsPSMSocketInfo::SetSocketPtr(CMSocket *socketPtr)
+{
+    mSocket = socketPtr;
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsPSMSocketInfo::GetFileDescPtr(PRFileDesc * *aFilePtr)
+{
+    *aFilePtr = mFd;
+    return NS_OK;
+}
+
+
+nsresult
+nsPSMSocketInfo::SetFileDescPtr(PRFileDesc *aFilePtr)
+{
+    mFd = aFilePtr;
+    return NS_OK;
+}
+
+NS_IMETHODIMP 
+nsPSMSocketInfo::GetHostName(char * *aHostName)
+{
+    if (mHostName.IsEmpty())
+        *aHostName = nsnull;
+    else
+        *aHostName = mHostName.ToNewCString();
+    return NS_OK;
+}
+
+
+nsresult 
+nsPSMSocketInfo::SetHostName(char *aHostName)
+{
+    mHostName.AssignWithConversion(aHostName);
+    return NS_OK;
+}
+
+NS_IMETHODIMP 
+nsPSMSocketInfo::GetHostPort(PRInt32 *aPort)
+{
+    *aPort = mHostPort;
+    return NS_OK;
+}
+
+nsresult 
+nsPSMSocketInfo::SetHostPort(PRInt32 aPort)
+{
+    mHostPort = aPort;
+    return NS_OK;
+}
+
+
+NS_IMETHODIMP 
+nsPSMSocketInfo::GetProxyName(char * *aName)
+{
+    if (mProxyName.IsEmpty())
+        *aName = nsnull;
+    else
+        *aName = mProxyName.ToNewCString();
+    return NS_OK;
+}
+
+
+nsresult 
+nsPSMSocketInfo::SetProxyName(char *aName)
+{
+    mProxyName.AssignWithConversion(aName);
+    return NS_OK;
+}
+
+
+NS_IMETHODIMP 
+nsPSMSocketInfo::GetProxyPort(PRInt32 *aPort)
+{
+    *aPort = mProxyPort;
+    return NS_OK;
+}
+
+nsresult 
+nsPSMSocketInfo::SetProxyPort(PRInt32 aPort)
+{
+    mProxyPort = aPort;
+    return NS_OK;
+}
+
+
+
+nsresult
+nsPSMSocketInfo::SetPickledStatus()
+{
+    PR_FREEIF(mPickledStatus);
+
+    long level;
+    CMTItem pickledStatus = {0, nsnull, 0};
+    unsigned char* ret    = nsnull;
+
+    if (CMT_GetSSLSocketStatus(mControl, mSocket, &pickledStatus, &level) != PR_FAILURE)
+    {        
+        ret = (unsigned char*) PR_Malloc( (SSMSTRING_PADDED_LENGTH(pickledStatus.len) + sizeof(int)) );
+        if (ret) 
+        {
+            *(int*)ret = pickledStatus.len;
+            memcpy(ret+sizeof(int), pickledStatus.data, *(int*)ret);
+        }
+
+        PR_FREEIF(pickledStatus.data);
+        mPickledStatus = ret;
+    }
+    return NS_OK;
+}
+
+
+NS_IMETHODIMP
+nsPSMSocketInfo::GetPickledStatus(char * *pickledStatusString)
+{
+    if (!mPickledStatus)
+        SetPickledStatus();
+
+    if (mPickledStatus)
+    {
+        PRInt32 len = *(int*)mPickledStatus;
+        char *out = (char *)nsMemory::Alloc(len);
+        memcpy(out, mPickledStatus, len);
+        *pickledStatusString = out;
+        return NS_OK;
+    }
+    *pickledStatusString = nsnull;
+    return NS_ERROR_FAILURE;
+}
+
+nsresult
+nsSSLIOLayerNewSocket( const char *host, 
+                       PRInt32 port, 
+                       const char *proxyHost, 
+                       PRInt32 proxyPort,
+                       PRFileDesc **fd, 
+                       nsISupports** info)
+{
+    static PRBool  firstTime = PR_TRUE;
+    if (firstTime)
+    {
+        nsSSLIOLayerIdentity        = PR_GetUniqueIdentity("Cartman layer");
+        nsSSLIOLayerMethods         = *PR_GetDefaultIOMethods();
+
+        nsSSLIOLayerMethods.connect = nsSSLIOLayerConnect;
+        nsSSLIOLayerMethods.close   = nsSSLIOLayerClose;
+        nsSSLIOLayerMethods.read    = nsSSLIOLayerRead;
+        nsSSLIOLayerMethods.write   = nsSSLIOLayerWrite;
+        
+        
+        nsresult result = nsServiceManager::GetService( PSM_COMPONENT_PROGID,
+                                                        NS_GET_IID(nsIPSMComponent), 
+                                                        (nsISupports**)&gPSMService);  
+        if (NS_FAILED(result))
+            return PR_FAILURE;
+    
+        firstTime                   = PR_FALSE;
+
+    }
+    
+
+    PRFileDesc *   sock;
+    PRFileDesc *   layer;
+    PRStatus       rv;
+
+    /* Get a normal NSPR socket */
+    sock = PR_NewTCPSocket();  
+    if (! sock) return NS_ERROR_OUT_OF_MEMORY;
+    
+    /* disable Nagle algorithm delay for control sockets */
+    PRSocketOptionData sockopt;
+    sockopt.option = PR_SockOpt_NoDelay;
+    sockopt.value.no_delay = PR_TRUE;   
+    rv = PR_SetSocketOption(sock, &sockopt);
+    PR_ASSERT(PR_SUCCESS == rv);
+
+
+    layer = PR_CreateIOLayerStub(nsSSLIOLayerIdentity, &nsSSLIOLayerMethods);
+    if (! layer)
+    {
+        PR_Close(sock);
+        return NS_ERROR_FAILURE;
+    }
+        
+    nsPSMSocketInfo *infoObject = new nsPSMSocketInfo();
+    if (!infoObject)
+    {
+        PR_Close(sock);
+        // clean up IOLayerStub.
+        return NS_ERROR_FAILURE;
+    }
+    
+    NS_ADDREF(infoObject);
+    
+    infoObject->SetHostName((char*)host);
+    infoObject->SetHostPort(port);
+    infoObject->SetProxyName((char*)proxyHost);
+    infoObject->SetProxyPort(proxyPort);
+
+    layer->secret = (PRFilePrivate*) infoObject;
+    rv = PR_PushIOLayer(sock, PR_GetLayersIdentity(sock), layer);
+    
+    if (rv == PR_SUCCESS)
+    {
+        *fd   = sock;
+        *info = infoObject;
+        NS_ADDREF(*info);
+        return NS_OK;
+    }
+    
+    PR_Close(sock);
+    return NS_ERROR_FAILURE;
+}

mozilla/extensions/psm-glue/src/nsSSLIOLayer.h

@@ -0,0 +1,39 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+*/
+
+#ifndef _NSSSLIOLAYER_H
+#define _NSSSLIOLAYER_H
+
+#include "prtypes.h"
+#include "prio.h"
+#include "nsIPSMSocketInfo.h"
+
+// define taken from 4.x cartman glue code.  
+#define SSMSTRING_PADDED_LENGTH(x) ((((x)+3)/4)*4)
+
+nsresult nsSSLIOLayerNewSocket(const char *host, 
+                               PRInt32 port, 
+                               const char *proxyHost, 
+                               PRInt32 proxyPort, 
+                               PRFileDesc **fd, 
+                               nsISupports **securityInfo);
+#endif /* _NSSSLIOLAYER_H */

mozilla/extensions/psm-glue/src/nsSSLSocketProvider.cpp

@@ -0,0 +1,94 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+*/
+
+#include "nsIComponentManager.h"
+#include "nsIServiceManager.h"
+#include "nsSSLSocketProvider.h"
+#include "nsSSLIOLayer.h"
+
+////////////////////////////////////////////////////////////////////////////////
+
+nsSSLSocketProvider::nsSSLSocketProvider()
+{
+  NS_INIT_REFCNT();
+}
+
+nsresult
+nsSSLSocketProvider::Init()
+{
+  nsresult rv = NS_OK;
+  return rv;
+}
+
+nsSSLSocketProvider::~nsSSLSocketProvider()
+{
+}
+
+NS_IMPL_THREADSAFE_ISUPPORTS2(nsSSLSocketProvider, nsISocketProvider, nsISSLSocketProvider);
+
+NS_METHOD
+nsSSLSocketProvider::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
+{                                                                               
+    nsresult rv;                                                                
+                                                                                
+    nsSSLSocketProvider * inst;                                                      
+                                                                                
+    if (NULL == aResult) {                                                      
+        rv = NS_ERROR_NULL_POINTER;                                             
+        return rv;                                                              
+    }                                                                           
+    *aResult = NULL;                                                            
+    if (NULL != aOuter) {                                                       
+        rv = NS_ERROR_NO_AGGREGATION;                                           
+        return rv;                                                              
+    }                                                                           
+                                                                                
+    NS_NEWXPCOM(inst, nsSSLSocketProvider);                                          
+    if (NULL == inst) {                                                         
+        rv = NS_ERROR_OUT_OF_MEMORY;                                            
+        return rv;                                                              
+    }                                                                           
+    NS_ADDREF(inst);                                                            
+    rv = inst->QueryInterface(aIID, aResult);                                   
+    NS_RELEASE(inst);                                                           
+                                                                                
+    return rv;                                                                  
+}                                                                               
+
+
+NS_IMETHODIMP
+nsSSLSocketProvider::NewSocket(const char *host, 
+                               PRInt32 port, 
+                               const char *proxyHost, 
+                               PRInt32 proxyPort, 
+                               PRFileDesc **_result, 
+                               nsISupports **securityInfo)
+{
+  nsresult rv = nsSSLIOLayerNewSocket(host,
+                                      port,
+                                      proxyHost,
+                                      proxyPort,
+                                      _result, 
+                                      securityInfo);
+  
+  return (NS_FAILED(rv)) ? NS_ERROR_SOCKET_CREATE_FAILED : NS_OK;
+}

mozilla/extensions/psm-glue/src/nsSSLSocketProvider.h

@@ -0,0 +1,54 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+*/
+
+#ifndef _NSSSLSOCKETPROVIDER_H_
+#define _NSSSLSOCKETPROVIDER_H_
+
+#include "nsISSLSocketProvider.h"
+
+
+/* 274418d0-5437-11d3-bbc8-0000861d1237 */         
+#define NS_SSLSOCKETPROVIDER_CID   { 0x274418d0, 0x5437, 0x11d3, {0xbb, 0xc8, 0x00, 0x00, 0x86, 0x1d, 0x12, 0x37}}
+
+
+class nsSSLSocketProvider : public nsISSLSocketProvider
+{
+public:
+  NS_DECL_ISUPPORTS
+
+  NS_DECL_NSISOCKETPROVIDER
+
+  NS_DECL_NSISSLSOCKETPROVIDER
+
+  // nsSSLSocketProvider methods:
+  nsSSLSocketProvider();
+  virtual ~nsSSLSocketProvider();
+
+  static NS_METHOD
+  Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
+
+  nsresult Init();
+
+protected:
+};
+
+#endif /* _NSSSLSOCKETPROVIDER_H_ */

mozilla/extensions/psm-glue/src/nsSecureBrowserUIImpl.cpp

@@ -0,0 +1,654 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998-2000 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+ *   Stuart Parmenter <pavlov@netscape.com>
+*/
+
+#include "nspr.h"
+#include "prlog.h"
+
+#include "nsISecureBrowserUI.h"
+#include "nsSecureBrowserUIImpl.h"
+#include "nsIPSMComponent.h"
+#include "nsPSMComponent.h"
+#include "nsCOMPtr.h"
+#include "nsIInterfaceRequestor.h"
+#include "nsIServiceManager.h"
+
+#include "nsIScriptGlobalObject.h"
+#include "nsIObserverService.h"
+#include "nsIDocumentLoader.h"
+#include "nsCURILoader.h"
+#include "nsIDocShell.h"
+#include "nsIDocumentViewer.h"
+#include "nsCURILoader.h"
+#include "nsIDocument.h"
+#include "nsIDOMHTMLDocument.h"
+#include "nsIDOMXULDocument.h"
+#include "nsIDOMElement.h"
+#include "nsIDOMWindow.h"
+#include "nsIContent.h"
+#include "nsIWebProgress.h"
+#include "nsIChannel.h"
+#include "nsIPSMSocketInfo.h"
+
+#include "nsIURI.h"
+
+#include "prmem.h"
+
+#include "nsINetSupportDialogService.h"
+#include "nsIPrompt.h"
+#include "nsICommonDialogs.h"
+#include "nsIPref.h"
+
+#include "nsIFormSubmitObserver.h"
+
+static NS_DEFINE_CID(kCStringBundleServiceCID,  NS_STRINGBUNDLESERVICE_CID);
+static NS_DEFINE_CID(kCommonDialogsCID,         NS_CommonDialog_CID );
+static NS_DEFINE_CID(kPrefCID, NS_PREF_CID);
+
+#define ENTER_SITE_PREF      "security.warn_entering_secure"
+#define LEAVE_SITE_PREF      "security.warn_leaving_secure"
+#define MIXEDCONTENT_PREF    "security.warn_viewing_mixed"
+#define INSECURE_SUBMIT_PREF "security.warn_submit_insecure"
+
+#if defined(PR_LOGGING)
+//
+// Log module for nsSecureBroswerUI logging...
+//
+// To enable logging (see prlog.h for full details):
+//
+//    set NSPR_LOG_MODULES=nsSecureBroswerUI:5
+//    set NSPR_LOG_FILE=nspr.log
+//
+// this enables PR_LOG_DEBUG level information and places all output in
+// the file nspr.log
+//
+PRLogModuleInfo* gSecureDocLog = nsnull;
+#endif /* PR_LOGGING */
+
+ 
+NS_IMETHODIMP
+nsSecureBrowserUIImpl::Create(nsISupports *aOuter, REFNSIID aIID, void **aResult)
+{
+    nsresult rv;
+
+    nsSecureBrowserUIImpl * inst;
+
+    if (NULL == aResult) {
+        rv = NS_ERROR_NULL_POINTER;
+        return rv;
+    }
+    *aResult = NULL;
+    if (NULL != aOuter) {
+        rv = NS_ERROR_NO_AGGREGATION;
+        return rv;
+    }
+
+    NS_NEWXPCOM(inst, nsSecureBrowserUIImpl);
+    if (NULL == inst) {
+        rv = NS_ERROR_OUT_OF_MEMORY;
+        return rv;
+    }
+    NS_ADDREF(inst);
+    rv = inst->QueryInterface(aIID, aResult);
+    NS_RELEASE(inst);
+
+    return rv;
+}
+
+nsSecureBrowserUIImpl::nsSecureBrowserUIImpl()
+{
+    NS_INIT_REFCNT();
+    
+#if defined(PR_LOGGING)
+    if (nsnull == gSecureDocLog) {
+        gSecureDocLog = PR_NewLogModule("nsSecureBroswerUI");
+    }
+#endif /* PR_LOGGING */
+
+
+    mIsSecureDocument = mMixContentAlertShown = mIsDocumentBroken = PR_FALSE;
+    mLastPSMStatus    = nsnull;
+    mCurrentURI       = nsnull;
+    mSecurityButton   = nsnull;
+}
+
+nsSecureBrowserUIImpl::~nsSecureBrowserUIImpl()
+{
+    PR_FREEIF(mLastPSMStatus);
+}
+
+NS_IMPL_ISUPPORTS4(nsSecureBrowserUIImpl, 
+                   nsSecureBrowserUI, 
+                   nsIWebProgressListener, 
+                   nsIFormSubmitObserver,
+                   nsIObserver); 
+
+
+NS_IMETHODIMP
+nsSecureBrowserUIImpl::Init(nsIDOMWindow *window, nsIDOMElement *button)
+{
+    mSecurityButton = button;
+    mWindow         = window;
+
+    nsresult rv = nsServiceManager::GetService( kPrefCID, 
+                                                NS_GET_IID(nsIPref), 
+                                                getter_AddRefs(mPref));  
+    if (NS_FAILED(rv)) return rv;
+
+    NS_WITH_SERVICE(nsIStringBundleService, service, kCStringBundleServiceCID, &rv);
+    if (NS_FAILED(rv)) return rv;
+
+    nsILocale* locale = nsnull;
+    rv = service->CreateBundle(SECURITY_STRING_BUNDLE_URL, locale, getter_AddRefs(mStringBundle));
+    if (NS_FAILED(rv)) return rv;
+
+    // hook up to the form post notifications:
+    nsIObserverService *svc = 0;
+    rv = nsServiceManager::GetService(NS_OBSERVERSERVICE_PROGID, 
+                                      NS_GET_IID(nsIObserverService), 
+                                      (nsISupports**)&svc );
+    if (NS_SUCCEEDED(rv) && svc) {
+        nsString  topic; topic.AssignWithConversion(NS_FORMSUBMIT_SUBJECT);
+        rv = svc->AddObserver( this, topic.GetUnicode());
+        nsServiceManager::ReleaseService( NS_OBSERVERSERVICE_PROGID, svc );
+    }
+
+    // hook up to the webprogress notifications.
+    nsCOMPtr<nsIDocShell> docShell;
+
+    nsCOMPtr<nsIScriptGlobalObject> sgo = do_QueryInterface(window);
+    if (!sgo) return NS_ERROR_NULL_POINTER;
+
+    sgo->GetDocShell(getter_AddRefs(docShell));
+    if (!docShell) return NS_ERROR_NULL_POINTER;
+
+    nsCOMPtr<nsIWebProgress> wp = do_GetInterface(docShell);
+    if (!wp) return NS_ERROR_NULL_POINTER;
+
+    wp->AddProgressListener(NS_STATIC_CAST(nsIWebProgressListener*,this));
+
+    mInitByLocationChange = PR_TRUE;
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSecureBrowserUIImpl::DisplayPageInfoUI()
+{
+    nsresult res;
+    NS_WITH_SERVICE(nsIPSMComponent, psm, PSM_COMPONENT_PROGID, &res);
+    if (NS_FAILED(res)) 
+        return res;
+    
+    nsXPIDLCString host;
+    if (mCurrentURI)
+        mCurrentURI->GetHost(getter_Copies(host));
+    
+    return psm->DisplaySecurityAdvisor(mLastPSMStatus, host);
+}
+
+
+
+
+NS_IMETHODIMP 
+nsSecureBrowserUIImpl::Observe(nsISupports*, const PRUnichar*, const PRUnichar*) 
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+
+static nsresult IsChildOfDomWindow(nsIDOMWindow *parent, nsIDOMWindow *child, PRBool* value)
+{
+    *value = PR_FALSE;
+
+    if (parent == child)
+    {
+        *value = PR_TRUE;
+        return NS_OK;
+    }
+
+    nsCOMPtr<nsIDOMWindow> childsParent;
+    child->GetParent(getter_AddRefs(childsParent));
+        
+    if (childsParent && childsParent.get() != child)
+        IsChildOfDomWindow(parent, childsParent, value);
+    
+    return NS_OK;
+}
+
+
+NS_IMETHODIMP 
+nsSecureBrowserUIImpl::Notify(nsIContent* formNode, nsIDOMWindow* window, nsIURI* actionURL)
+{
+    // Return NS_OK unless we want to prevent this form from submitting.
+
+    if (!window || !actionURL || !formNode) {
+        return NS_OK;
+    }
+    
+    nsCOMPtr<nsIDocument> document; 
+    formNode->GetDocument(*getter_AddRefs(document)); 
+    if (!document) return NS_OK; 
+
+    nsCOMPtr<nsIScriptGlobalObject> globalObject; 
+    document->GetScriptGlobalObject(getter_AddRefs(globalObject)); 
+    nsCOMPtr<nsIDOMWindow> postingWindow = do_QueryInterface(globalObject); 
+    
+    PRBool isChild;
+    IsChildOfDomWindow(mWindow, postingWindow, &isChild);
+
+    if (!isChild)
+        return NS_OK;
+
+    PRBool okayToPost;
+    nsresult res = CheckPost(actionURL, &okayToPost);
+
+    if (NS_SUCCEEDED(res) && okayToPost)
+        return NS_OK;
+    
+    return NS_ERROR_FAILURE;
+}
+
+//  nsIWebProgressListener
+NS_IMETHODIMP 
+nsSecureBrowserUIImpl::OnProgressChange(nsIWebProgress* aWebProgress,
+                                        nsIRequest* aRequest, 
+                                        PRInt32 aCurSelfProgress, 
+                                        PRInt32 aMaxSelfProgress, 
+                                        PRInt32 aCurTotalProgress, 
+                                        PRInt32 aMaxTotalProgress)
+{
+    return NS_OK;
+}
+
+NS_IMETHODIMP 
+nsSecureBrowserUIImpl::OnStateChange(nsIWebProgress* aWebProgress,
+                                     nsIRequest* aRequest, 
+                                     PRInt32 aProgressStateFlags,
+                                     nsresult aStatus)
+{
+    nsresult res = NS_OK;
+
+    if (aRequest == nsnull || !mSecurityButton || !mPref)
+        return NS_ERROR_NULL_POINTER;
+
+    // Get the channel from the request...
+    // If the request is not network based, then ignore it.    
+    nsCOMPtr<nsIChannel> channel;
+    channel = do_QueryInterface(aRequest, &res);
+    if (NS_FAILED(res))
+        return NS_OK;
+
+    nsCOMPtr<nsIURI> loadingURI;
+    channel->GetURI(getter_AddRefs(loadingURI));
+    
+#if defined(DEBUG)
+    nsXPIDLCString temp;
+    loadingURI->GetSpec(getter_Copies(temp));
+    PR_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI:%p: OnStateChange: %x :%s\n", this, aProgressStateFlags,(const char*)temp));
+#endif
+
+    // A Document is starting to load...
+    if ((aProgressStateFlags & flag_start) && 
+        (aProgressStateFlags & flag_is_network))
+    {
+        // starting to load a webpage
+        PR_FREEIF(mLastPSMStatus); mLastPSMStatus = nsnull;
+
+        mIsSecureDocument = mMixContentAlertShown = mIsDocumentBroken = PR_FALSE;
+
+        res = CheckProtocolContextSwitch( loadingURI, mCurrentURI);    
+        return res;
+    } 
+
+    // A document has finished loading    
+    if ((aProgressStateFlags & flag_stop) &&
+        (aProgressStateFlags & flag_is_network) &&
+        mIsSecureDocument)
+    {
+        if (!mIsDocumentBroken) // and status is okay  FIX
+        {
+            // qi for the psm information about this channel load.
+            nsCOMPtr<nsISupports> info;
+            channel->GetSecurityInfo(getter_AddRefs(info));
+            nsCOMPtr<nsIPSMSocketInfo> psmInfo = do_QueryInterface(info);
+            if (psmInfo)
+            {
+                // Everything looks okay.  Lets stash the picked status.
+                PR_FREEIF(mLastPSMStatus);
+                res = psmInfo->GetPickledStatus(&mLastPSMStatus);
+
+                if (NS_SUCCEEDED(res)) {
+                    PR_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI:%p: Icon set to lock\n", this));
+                    res = mSecurityButton->SetAttribute( NS_ConvertASCIItoUCS2("level"), NS_ConvertASCIItoUCS2("high") );
+                    return res;
+                }
+            }
+        }
+
+        PR_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI:%p: Icon set to broken\n", this));
+        mIsDocumentBroken = PR_TRUE;
+        res = mSecurityButton->SetAttribute( NS_ConvertASCIItoUCS2("level"), NS_ConvertASCIItoUCS2("broken"));
+        return res;
+    }
+    
+    ///    if (aProgressStateFlags == nsIWebProgress::flag_net_redirecting)
+    ///    {
+    ///        // need to implmentent.
+    ///    }
+
+    // don't need to do anything more if the page is broken or not secure...
+
+    if (!mIsSecureDocument || mIsDocumentBroken)
+        return NS_OK;
+
+    // A URL is starting to load...
+    if ((aProgressStateFlags & flag_start) &&
+        (aProgressStateFlags & flag_is_request))
+    {   // check to see if we are going to mix content.
+        return CheckMixedContext(loadingURI);
+    }
+
+    // A URL has finished loading...    
+    if ((aProgressStateFlags & flag_stop) &&
+        (aProgressStateFlags & flag_is_request))
+    {
+        if (1)  // FIX status from the flag...
+        {
+            nsCOMPtr<nsISupports> info;
+            channel->GetSecurityInfo(getter_AddRefs(info));
+            nsCOMPtr<nsIPSMSocketInfo> psmInfo = do_QueryInterface(info, &res);
+
+                    // qi for the psm information about this channel load.
+            if (psmInfo) {
+                return NS_OK;    
+            }
+        }
+
+        PR_LOG(gSecureDocLog, PR_LOG_DEBUG, ("SecureUI:%p: OnStateChange - Icon set to broken\n", this));
+        mSecurityButton->SetAttribute( NS_ConvertASCIItoUCS2("level"), NS_ConvertASCIItoUCS2("broken") );
+        mIsDocumentBroken = PR_TRUE;
+    }    
+
+    return res;
+}
+
+
+NS_IMETHODIMP 
+nsSecureBrowserUIImpl::OnLocationChange(nsIURI* aLocation)
+{
+    mCurrentURI = aLocation;
+    
+    if (mInitByLocationChange)
+    {
+        IsURLHTTPS(mCurrentURI, &mIsSecureDocument);
+        mInitByLocationChange = PR_FALSE;
+    }
+
+    return NS_OK;
+}
+
+
+nsresult
+nsSecureBrowserUIImpl::IsURLHTTPS(nsIURI* aURL, PRBool* value)
+{
+	*value = PR_FALSE;
+
+	if (!aURL)
+		return NS_OK;
+
+    char* scheme;
+	aURL->GetScheme(&scheme);
+
+	if (scheme == nsnull)
+		return NS_ERROR_NULL_POINTER;
+
+    if ( PL_strncasecmp(scheme, "https",  5) == 0 )
+		*value = PR_TRUE;
+	
+	nsMemory::Free(scheme);
+	return NS_OK;
+}
+
+
+
+void nsSecureBrowserUIImpl::GetBundleString(const nsString& name, nsString &outString)
+{
+    if (mStringBundle && name.Length() > 0) {
+        PRUnichar *ptrv = nsnull;
+        if (NS_SUCCEEDED(mStringBundle->GetStringFromName(name.GetUnicode(), &ptrv)))
+            outString = ptrv;
+        else
+            outString.SetLength(0);;
+
+        nsMemory::Free(ptrv);
+
+    } else {
+        outString.SetLength(0);;
+    }
+}
+
+nsresult 
+nsSecureBrowserUIImpl::CheckProtocolContextSwitch( nsIURI* newURI, nsIURI* oldURI)
+{
+    nsresult res;
+    PRBool isNewSchemeSecure, isOldSchemeSecure, boolpref;
+
+    res = IsURLHTTPS(oldURI, &isOldSchemeSecure);
+    if (NS_FAILED(res)) 
+        return res;
+    res = IsURLHTTPS(newURI, &isNewSchemeSecure);
+    if (NS_FAILED(res)) 
+        return res;
+
+    // Check to see if we are going from a secure page to and insecure page
+    if ( !isNewSchemeSecure && isOldSchemeSecure)
+    {
+        mSecurityButton->RemoveAttribute( NS_ConvertASCIItoUCS2("level") );
+    
+        if ((mPref->GetBoolPref(LEAVE_SITE_PREF, &boolpref) != 0))
+            boolpref = PR_TRUE;
+        
+        if (boolpref) 
+        {
+            NS_WITH_SERVICE(nsICommonDialogs, dialog, kCommonDialogsCID, &res);
+            if (NS_FAILED(res)) 
+                return res;
+
+            nsAutoString windowTitle, message, dontShowAgain;
+
+            GetBundleString(NS_ConvertASCIItoUCS2("Title"), windowTitle);
+            GetBundleString(NS_ConvertASCIItoUCS2("LeaveSiteMessage"), message);
+            GetBundleString(NS_ConvertASCIItoUCS2("DontShowAgain"), dontShowAgain);
+
+            PRBool outCheckValue = PR_TRUE;
+            dialog->AlertCheck(mWindow, 
+                               windowTitle.GetUnicode(), 
+                               message.GetUnicode(), 
+                               dontShowAgain.GetUnicode(), 
+                               &outCheckValue);
+
+            if (!outCheckValue) {
+                mPref->SetBoolPref(LEAVE_SITE_PREF, PR_FALSE);
+                NS_WITH_SERVICE(nsIPSMComponent, psm, PSM_COMPONENT_PROGID, &res);
+                if (NS_FAILED(res)) 
+                    return res;
+                psm->PassPrefs();
+            }
+        }
+    }
+    // check to see if we are going from an insecure page to a secure one.
+    else if (isNewSchemeSecure && !isOldSchemeSecure)
+    {
+        if ((mPref->GetBoolPref(ENTER_SITE_PREF, &boolpref) != 0))
+            boolpref = PR_TRUE;
+        
+        if (boolpref) 
+        {
+            NS_WITH_SERVICE(nsICommonDialogs, dialog, kCommonDialogsCID, &res);
+            if (NS_FAILED(res)) 
+                return res;
+
+            nsAutoString windowTitle, message, dontShowAgain;
+
+            GetBundleString(NS_ConvertASCIItoUCS2("Title"), windowTitle);
+            GetBundleString(NS_ConvertASCIItoUCS2("EnterSiteMessage"), message);
+            GetBundleString(NS_ConvertASCIItoUCS2("DontShowAgain"), dontShowAgain);
+
+            PRBool outCheckValue = PR_TRUE;
+            dialog->AlertCheck(mWindow, 
+                               windowTitle.GetUnicode(), 
+                               message.GetUnicode(), 
+                               dontShowAgain.GetUnicode(), 
+                               &outCheckValue);
+
+            if (!outCheckValue)
+            {
+                mPref->SetBoolPref(ENTER_SITE_PREF, PR_FALSE);
+                NS_WITH_SERVICE(nsIPSMComponent, psm, PSM_COMPONENT_PROGID, &res);
+                if (NS_FAILED(res)) 
+                    return res;
+                psm->PassPrefs();
+            }
+        }
+    }
+
+    mIsSecureDocument = isNewSchemeSecure;
+    return NS_OK;
+}
+
+
+nsresult
+nsSecureBrowserUIImpl::CheckMixedContext(nsIURI* nextURI)
+{
+    PRBool secure;
+
+    nsresult rv = IsURLHTTPS(nextURI, &secure);
+    if (NS_FAILED(rv))
+        return rv;
+
+    if (!secure  && mIsSecureDocument)
+    {
+        mIsDocumentBroken = PR_TRUE;
+        mSecurityButton->SetAttribute( NS_ConvertASCIItoUCS2("level"), NS_ConvertASCIItoUCS2("broken") );
+
+        if (!mPref) return NS_ERROR_NULL_POINTER;
+
+        PRBool boolpref;
+        if ((mPref->GetBoolPref(MIXEDCONTENT_PREF, &boolpref) != 0))
+            boolpref = PR_TRUE;
+
+        if (boolpref && !mMixContentAlertShown) 
+        {
+            NS_WITH_SERVICE(nsICommonDialogs, dialog, kCommonDialogsCID, &rv);
+            if (NS_FAILED(rv)) 
+                return rv;
+
+            nsAutoString windowTitle, message, dontShowAgain;
+
+            GetBundleString(NS_ConvertASCIItoUCS2("Title"), windowTitle);
+            GetBundleString(NS_ConvertASCIItoUCS2("MixedContentMessage"), message);
+            GetBundleString(NS_ConvertASCIItoUCS2("DontShowAgain"), dontShowAgain);
+
+            PRBool outCheckValue = PR_TRUE;
+
+            dialog->AlertCheck(mWindow, 
+                               windowTitle.GetUnicode(), 
+                               message.GetUnicode(), 
+                               dontShowAgain.GetUnicode(), 
+                               &outCheckValue);
+
+            if (!outCheckValue) {
+                mPref->SetBoolPref(MIXEDCONTENT_PREF, PR_FALSE);
+                NS_WITH_SERVICE(nsIPSMComponent, psm, PSM_COMPONENT_PROGID, &rv);
+                if (NS_FAILED(rv)) 
+                    return rv;
+                psm->PassPrefs();
+            }
+
+            mMixContentAlertShown = PR_TRUE;
+        }
+    }
+
+  return NS_OK;
+}
+
+nsresult
+nsSecureBrowserUIImpl::CheckPost(nsIURI *actionURL, PRBool *okayToPost)
+{
+    PRBool secure;
+
+    nsresult rv = IsURLHTTPS(actionURL, &secure);
+    if (NS_FAILED(rv))
+        return rv;
+    
+    // if we are posting to a secure link from a secure page, all is okay.
+    if (secure  && mIsSecureDocument)
+        return NS_OK;
+
+
+    PRBool boolpref;    
+
+    // posting to a non https URL.
+    if ((mPref->GetBoolPref(INSECURE_SUBMIT_PREF, &boolpref) != 0))
+        boolpref = PR_TRUE;
+    
+    if (boolpref) {
+        NS_WITH_SERVICE(nsICommonDialogs, dialog, kCommonDialogsCID, &rv);
+        if (NS_FAILED(rv)) 
+            return rv;
+
+        nsAutoString windowTitle, message, dontShowAgain;
+        
+        GetBundleString(NS_ConvertASCIItoUCS2("Title"), windowTitle);
+        GetBundleString(NS_ConvertASCIItoUCS2("DontShowAgain"), dontShowAgain);
+
+        // posting to insecure webpage from a secure webpage.
+        if (!secure  && mIsSecureDocument && !mIsDocumentBroken) {
+            GetBundleString(NS_ConvertASCIItoUCS2("PostToInsecure"), message);
+        } else { // anything else, post generic warning
+            GetBundleString(NS_ConvertASCIItoUCS2("PostToInsecureFromInsecure"), message);
+        }
+
+        PRBool outCheckValue = PR_TRUE;
+        dialog->ConfirmCheck(mWindow, 
+                             windowTitle.GetUnicode(), 
+                             message.GetUnicode(), 
+                             dontShowAgain.GetUnicode(), 
+                             &outCheckValue, 
+                             okayToPost);
+
+        if (!outCheckValue) {
+            mPref->SetBoolPref(INSECURE_SUBMIT_PREF, PR_FALSE);
+            NS_WITH_SERVICE(nsIPSMComponent, psm, PSM_COMPONENT_PROGID, &rv);
+            if (NS_FAILED(rv)) 
+                return rv;
+            psm->PassPrefs();
+        }
+    } else {
+        *okayToPost = PR_TRUE;
+    }
+  
+    return NS_OK;
+}

mozilla/extensions/psm-glue/src/nsSecureBrowserUIImpl.h

@@ -0,0 +1,108 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):
+ *   Hubbie Shaw
+ *   Doug Turner <dougt@netscape.com>
+*/
+
+#ifndef nsSecureBrowserUIImpl_h_
+#define nsSecureBrowserUIImpl_h_
+
+#include "nsCOMPtr.h"
+#include "nsXPIDLString.h"
+#include "nsString.h"
+#include "nsIObserver.h"
+#include "nsIDocumentLoaderObserver.h"
+#include "nsIDOMElement.h"
+#include "nsIDOMWindow.h"
+#include "nsIStringBundle.h"
+#include "nsISecureBrowserUI.h"
+#include "nsIDocShell.h"
+#include "nsIPref.h"
+#include "nsIWebProgressListener.h"
+#include "nsIFormSubmitObserver.h"
+#include "nsIURI.h"
+
+#define NS_SECURE_BROWSER_DOCOBSERVER_CLASSNAME "Mozilla Secure Browser Doc Observer"
+
+#define NS_SECURE_BROWSER_DOCOBSERVER_CID \
+{0x97c06c30, 0xa145, 0x11d3, \
+{0x8c, 0x7c, 0x00, 0x60, 0x97, 0x92, 0x27, 0x8c}}
+
+#define NS_SECURE_BROWSER_DOCOBSERVER_PROGID "component://netscape/secure_browser_docobserver"
+
+
+class nsSecureBrowserUIImpl : public nsSecureBrowserUI, 
+                              public nsIWebProgressListener, 
+                              public nsIFormSubmitObserver,
+                              public nsIObserver
+{
+public:
+
+	nsSecureBrowserUIImpl();
+	virtual ~nsSecureBrowserUIImpl();
+    
+    static NS_METHOD Create(nsISupports *aOuter, REFNSIID aIID, void **aResult);
+
+	NS_DECL_ISUPPORTS    
+    NS_DECL_NSIWEBPROGRESSLISTENER
+    NS_DECL_NSSECUREBROWSERUI
+
+
+    // nsIObserver
+    NS_DECL_NSIOBSERVER
+    NS_IMETHOD Notify(nsIContent* formNode, nsIDOMWindow* window, nsIURI *actionURL);
+
+protected:
+
+	nsCOMPtr<nsIDOMWindow>              mWindow;
+    nsCOMPtr<nsIDOMElement>             mSecurityButton;
+	nsCOMPtr<nsIDocumentLoaderObserver> mOldWebShellObserver;
+    nsCOMPtr<nsIPref>                   mPref;
+    nsCOMPtr<nsIStringBundle>           mStringBundle;
+    
+    nsCOMPtr<nsIURI>                    mCurrentURI;
+
+	PRBool					mIsSecureDocument;  // is https loaded
+	PRBool					mIsDocumentBroken;  // 
+	PRBool					mMixContentAlertShown;
+    
+    PRBool                  mInitByLocationChange;
+
+    char*                   mLastPSMStatus;
+    
+
+    void GetBundleString(const nsString& name, nsString &outString);
+    nsresult LoadStringBundle();
+    
+    nsresult CheckProtocolContextSwitch( nsIURI* newURI, nsIURI* oldURI);
+    nsresult CheckMixedContext(nsIURI* nextURI);
+    nsresult CheckPost(nsIURI *actionURL, PRBool *okayToPost);
+    nsresult IsURLHTTPS(nsIURI* aURL, PRBool *value);
+};
+
+
+#endif /* nsSecureBrowserUIImpl_h_ */
+
+
+
+
+
+

mozilla/mailnews/base/public/nsIMapiRegistry.idl

@@ -1,70 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * 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
-    */
-   attribute boolean isDefaultMailClient;
-
-   /** This is set TRUE only once per session.
-    */
-   readonly attribute boolean showDialog;
-
-   /** 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_IMAPIREGISTRY_CONTRACTID    "@mozilla.org/mapiregistry;1"
-#define NS_IMAPIREGISTRY_CLASSNAME "Mozilla MAPI Registry"
-%}

mozilla/mailnews/mapi/mapiDll/Mapi32.DEF

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

mozilla/mailnews/mapi/mapiDll/MapiDll.cpp

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

mozilla/mailnews/mapi/mapiDll/makefile.win

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

mozilla/mailnews/mapi/mapihook/build/MapiProxy.def

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

mozilla/mailnews/mapi/mapihook/build/makefile.win

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

mozilla/mailnews/mapi/mapihook/build/msgMapi.idl

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

mozilla/mailnews/mapi/mapihook/makefile.win

@@ -1,41 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is Mozilla.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corp.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):  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
-
-include <$(DEPTH)\config\rules.mak>

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

@@ -1,49 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# 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=msgMapi
-XPIDL_MODULE=mapihook
-
-XPIDLSRCS =	\
-           .\nsIMapiRegistry.idl \
-           .\nsIMapiSupport.idl  \
-            $(NULL)
-
-include <$(DEPTH)\config\rules.mak>
-

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

@@ -1,70 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * 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
-    */
-   attribute boolean isDefaultMailClient;
-
-   /** This is set TRUE only once per session.
-    */
-   readonly attribute boolean showDialog;
-
-   /** 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_IMAPIREGISTRY_CONTRACTID    "@mozilla.org/mapiregistry;1"
-#define NS_IMAPIREGISTRY_CLASSNAME "Mozilla MAPI Registry"
-%}

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

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

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

@@ -1,323 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corp.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Krishna Mohan Khandrika <kkhandrika@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#undef _UNICODE
-#undef UNICODE
-
-#include <objbase.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;
-}

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

@@ -1,56 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Krishna Mohan Khandrika <kkhandrika@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef _REGISTRY_H_
-#define _REGISTRY_H_
-
-#include <objbase.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

mozilla/mailnews/mapi/mapihook/src/makefile.win

@@ -1,107 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# 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          = msgMapi
-MAKE_OBJ_TYPE = DLL
-LIBRARY_NAME=$(MODULE)
-MODULE_NAME	= $(MODULE)
-
-REQUIRES        = xpcom \
-                  string \
-		  MapiProxy \
-		  appshell \
-		  windowwatcher \
-		  dom \
-		  profile \
-		  msgbase \
-		  pref \
-		  msgbaseutil \
-		  msgcompo \
-		  mailnews \
-		  necko \
-		  intl \
-		  editor \
-		  msgdb \
-		  uriloader \
- 	          appstartup \
-	$(NULL)
-
-include <$(DEPTH)\config\config.mak>
-############################################################################
-
-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  \
-	.\$(OBJDIR)\nsMapiRegistry.obj	\
-	.\$(OBJDIR)\nsMapiRegistryUtils.obj \
-    .\$(OBJDIR)\Registry.obj  \
-	$(NULL)
-
-
-
-LLIBS=                               \
- $(DIST)\lib\xpcom.lib               \
- $(DIST)\lib\msgbsutl.lib            \
- $(LIBNSPR)                          \
- $(NULL)
-
-WIN_LIBS=       \
-	ole32.lib   \
-    $(NULL)
-
-EXPORTS=	\
-    msgMapiFactory.h    \
-    msgMapiHook.h       \
-    msgMapiImp.h        \
-    msgMapiMain.h       \
-    msgMapiSupport.h    \
-	nsMapiRegistry.h		\
-	nsMapiRegistryUtils.h   \
-    Registry.h \
-	$(NULL)
-
-include <$(DEPTH)\config\rules.mak>

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

@@ -1,118 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corp.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#undef UNICODE
-#undef _UNICODE
-
-#include "msgMapiFactory.h"
-#include "msgMapiImp.h"
-#include "msgMapi.h"
-
-CMapiFactory ::CMapiFactory()
-: m_cRef(1)
-{
-}
-
-CMapiFactory::~CMapiFactory()
-{
-}
-
-STDMETHODIMP CMapiFactory::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) CMapiFactory::AddRef()
-{
-    return (PR_AtomicIncrement(&m_cRef));
-}
-
-STDMETHODIMP_(ULONG) CMapiFactory::Release() 
-{
-    PRInt32 temp;
-    temp = PR_AtomicDecrement(&m_cRef);
-    if (m_cRef == 0)
-    {
-        delete this;
-        return 0;
-    }
-
-    return temp;
-}
-
-STDMETHODIMP CMapiFactory::CreateInstance(IUnknown* aUnknownOuter,
-                                           const IID& aIid,
-                                           void** aPpv) 
-{
-    // Cannot aggregate.
-
-    if (aUnknownOuter != nsnull)
-    {
-        return CLASS_E_NOAGGREGATION ;
-    }
-
-    // Create component.
-
-    CMapiImp* pImp = new CMapiImp();
-    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 CMapiFactory::LockServer(PRBool aLock) 
-{
-    return S_OK ;
-}

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

@@ -1,69 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corp.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef MSG_MAPI_FACTORY_H
-#define MSG_MAPI_FACTORY_H
-
-#include <windows.h>
-#include <objbase.h>
-#include "nspr.h"
-
-
-class CMapiFactory : 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);
-
-    CMapiFactory ();
-    ~CMapiFactory ();
-
-private :
-
-    PRInt32 m_cRef;
-};
-
-#endif  // MSG_MAPI_FACTORY_H
-

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

@@ -1,777 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corp.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
- * Contributor(s): 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 <tchar.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 "nsIMsgAttachment.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"
-#include "nsNetUtil.h"
-
-static NS_DEFINE_CID(kCmdLineServiceCID, NS_COMMANDLINE_SERVICE_CID);
-
-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) {
-        m_done = PR_TRUE;
-        HANDLE hEvent = CreateEvent (NULL, FALSE, FALSE, (LPCTSTR) MAPI_SENDCOMPLETE_EVENT) ;
-        SetEvent (hEvent) ;
-        CloseHandle (hEvent) ;
-        return NS_OK ;
-    }
-
- /* void OnSendNotPerformed */
- NS_IMETHOD OnSendNotPerformed(const char *aMsgID, nsresult aStatus)
- {
- return OnStopSending(aMsgID, aStatus, nsnull, nsnull) ;
- }
- 
-    /* 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.get());
-
-    // 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 ;        
-
-    for (int i=0 ; i < aFileCount ; i++)
-    {
-        if (aFiles[i].lpszPathName)
-        {
-            // check if attachment exists
-            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 ;
-
-            // create Msg attachment object
-            nsCOMPtr<nsIMsgAttachment> attachment = do_CreateInstance(NS_MSGATTACHMENT_CONTRACTID, &rv);
-            if (NS_FAILED(rv) || (!attachment) ) return rv ;
-
-            // set url 
-            nsXPIDLCString pURL ;
-            NS_GetURLSpecFromFile(pFile, getter_Copies(pURL));
-            attachment->SetUrl(pURL) ;
-
-            if (aFiles[i].lpszFileName)
-            {
-                if (! aIsUnicode)
-                {
-                    nsAutoString realFileName ;
-                    realFileName.AssignWithConversion ((char *) aFiles[i].lpszFileName) ;
-                    attachment->SetName(realFileName.get()) ;
-                    // attachment->SetName( (nsDependentString(aFiles[i].lpszFileName)).get() );
-            }
-                else
-                    attachment->SetName(aFiles[i].lpszFileName) ;
-        }
-
-            attachment->SetTemporary(PR_FALSE) ;
-
-            rv = aCompFields->AddAttachment (attachment);
-        }
-    }
-    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()) ;
-
-    nsCAutoString platformCharSet;
-    // set subject
-    if (aMessage->lpszSubject)
-    {
-        nsAutoString Subject ;
-        if (platformCharSet.IsEmpty())
-            platformCharSet.Assign(nsMsgI18NFileSystemCharset());
-        rv = ConvertToUnicode(platformCharSet.get(), (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.get(), (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 ;
-        NS_GetURLSpecFromFile(pFile, 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 ;
-            NS_GetURLSpecFromFile(pFile, 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 ;
-}

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

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

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

@@ -1,266 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corp.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
- * Contributor(s): Rajiv Dayal (rdayal@netscape.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <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"
-
-
-
-CMapiImp::CMapiImp()
-: m_cRef(1)
-{
-    m_Lock = PR_NewLock();
-}
-
-CMapiImp::~CMapiImp() 
-{ 
-    if (m_Lock)
-        PR_DestroyLock(m_Lock);
-}
-
-STDMETHODIMP CMapiImp::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) CMapiImp::AddRef()
-{
-    return PR_AtomicIncrement(&m_cRef);
-}
-
-STDMETHODIMP_(ULONG) CMapiImp::Release() 
-{
-    PRInt32 temp;
-    temp = PR_AtomicDecrement(&m_cRef);
-    if (m_cRef == 0)
-    {
-        delete this;
-        return 0;
-    }
-
-    return temp;
-}
-
-STDMETHODIMP CMapiImp::IsValid()
-{
-    return S_OK;
-}
-
-STDMETHODIMP CMapiImp::IsValidSession(unsigned long aSession)
-{
-    nsMAPIConfiguration *pConfig = nsMAPIConfiguration::GetMAPIConfiguration();
-    if (pConfig && pConfig->IsSessionValid(aSession))
-        return S_OK;
-
-    return E_FAIL;
-}
-
-STDMETHODIMP CMapiImp::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 CMapiImp::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 CMapiImp::SendMail( unsigned long aSession, lpnsMapiMessage aMessage,
-     short aRecipCount, lpnsMapiRecipDesc aRecips , short aFileCount, lpnsMapiFileDesc aFiles , 
-     unsigned long aFlags, unsigned long aReserved)
-{
-    nsresult rv = NS_OK ;
-
-    // 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 ;
-
-    /** 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 nsMAPIConfiguration::GetMAPIErrorFromNSError (rv) ;
-}
-
-
-STDMETHODIMP CMapiImp::SendDocuments( unsigned long aSession, LPTSTR aDelimChar,
-                            LPTSTR aFilePaths, LPTSTR aFileNames, ULONG aFlags)
-{
-    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 nsMAPIConfiguration::GetMAPIErrorFromNSError (rv) ;
-}
-
-STDMETHODIMP CMapiImp::Logoff (unsigned long aSession)
-{
-    nsMAPIConfiguration *pConfig = nsMAPIConfiguration::GetMAPIConfiguration();
-
-    if (pConfig->UnRegisterSession((PRUint32)aSession))
-        return S_OK;
-
-    return E_FAIL;
-}
-
-STDMETHODIMP CMapiImp::CleanUp()
-{
-    nsMapiHook::CleanUp();
-    return S_OK;
-}
-
-

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

@@ -1,92 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corp.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef MSG_MAPI_IMP_H
-#define MSG_MAPI_IMP_H
-
-#include <windows.h>
-#include <mapi.h>
-#include "msgMapi.h"
-#include "nsXPIDLString.h"
-#include "nspr.h"
-
-const CLSID CLSID_CMapiImp = {0x29f458be, 0x8866, 0x11d5, {0xa3, 0xdd, 0x0, 0xb0, 0xd0, 0xf3, 0xba, 0xa7}};
-
-// this class implements the MS COM interface nsIMapi that provides the methods
-// called by mapi32.dll to perform the mail operations as specified by MAPI.
-// These class methods in turn use the Mozilla Mail XPCOM interfaces to do so.
-class CMapiImp : 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();
-
-    CMapiImp();
-    ~CMapiImp();
-
-private :
-
-    PRLock *m_Lock;
-    PRInt32 m_cRef;
-};
-
-#endif // MSG_MAPI_IMP_H

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

@@ -1,376 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corp.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <mapidefs.h>
-#include <mapi.h>
-
-#include "msgCore.h"
-#include "nsMsgComposeStringBundle.h"
-#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_Lock = PR_NewLock();
-}
-
-static PRBool
-FreeSessionMapEntries(nsHashKey *aKey, void *aData, void* aClosure)
-{
-    nsMAPISession *pTemp = (nsMAPISession*) aData;
-    if (pTemp)
-    {
-    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);
-
-    m_SessionMap.Reset(FreeSessionMapEntries);
-    m_ProfileMap.Reset(FreeProfileMapEntries);
-    }
-
-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;
-}
-
-// util func
-HRESULT nsMAPIConfiguration::GetMAPIErrorFromNSError (nsresult res)
-{
-    HRESULT hr = SUCCESS_SUCCESS ;
-
-    if (NS_SUCCEEDED (hr)) return hr ;
-
-    // if failure return the related MAPI failure code
-    switch (res)
-    {
-        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 ;
-}
-
-
-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;
-}
-

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

@@ -1,112 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corp.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef MSG_MAPI_MAIN_H_
-#define NSG_MAPI_MAIN_H_
-
-#define        MAX_NAME_LEN    256
-#define        MAX_PW_LEN      256
-#define        MAX_SESSIONS    50
-#define        MAPI_SENDCOMPLETE_EVENT   "SendCompletionEvent"
-
-#define MAPI_PROPERTIES_CHROME "chrome://messenger-mapi/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"
-
-#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();
-
-    // a util func
-    static HRESULT GetMAPIErrorFromNSError (nsresult res) ;
-};
-
-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_

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

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

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

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

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

@@ -1,167 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * 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 "nsXPIDLString.h"
-#include "nsIPromptService.h"
-#include "nsIProxyObjectManager.h"
-#include "nsProxiedService.h"
-
-#include "nsMapiRegistryUtils.h" 
-#include "nsMapiRegistry.h"
-
-static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
-
-/** Implementation of the nsIMapiRegistry interface.
- *  Use standard implementation of nsISupports stuff.
- */
-NS_IMPL_ISUPPORTS1(nsMapiRegistry, nsIMapiRegistry);
-
-nsMapiRegistry::nsMapiRegistry() {
-    NS_INIT_ISUPPORTS();
-    m_ShowDialog = ! m_registryUtils.verifyRestrictedAccess();
-    m_DefaultMailClient = m_registryUtils.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 = m_registryUtils.IsDefaultMailClient();
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMapiRegistry::GetShowDialog(PRBool * retval) {
-    *retval = m_ShowDialog;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMapiRegistry::SetIsDefaultMailClient(PRBool aIsDefaultMailClient) 
-{
-    nsresult rv = NS_OK ;
-
-    if (aIsDefaultMailClient)
-    {
-        rv = m_registryUtils.setDefaultMailClient();
-    if (NS_SUCCEEDED(rv))
-        m_DefaultMailClient = PR_TRUE;
-    else
-            m_registryUtils.ShowMapiErrorDialog();
-}
-    else
-    {
-        rv = m_registryUtils.unsetDefaultMailClient();
-    if (NS_SUCCEEDED(rv))
-        m_DefaultMailClient = PR_FALSE;
-    else
-            m_registryUtils.ShowMapiErrorDialog();
-}
-
-    return rv ;
-}
-
-/** 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 || !m_registryUtils.getShowDialog()) return NS_OK;
-    nsCOMPtr<nsIPromptService> promptService(do_GetService(
-                  "@mozilla.org/embedcomp/prompt-service;1", &rv));
-    if (NS_SUCCEEDED(rv) && promptService)
-    {
-        nsCOMPtr<nsIStringBundle> bundle;
-        rv = m_registryUtils.MakeMapiStringBundle (getter_AddRefs (bundle)) ;
-        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-
-        nsXPIDLString dialogTitle;
-        const PRUnichar *brandStrings[] = { m_registryUtils.brandName() };
-        NS_NAMED_LITERAL_STRING(dialogTitlePropertyTag, "dialogTitle");
-        rv = bundle->FormatStringFromName(dialogTitlePropertyTag.get(),
-                                          brandStrings, 1,
-                                          getter_Copies(dialogTitle));
-        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-        
-        nsXPIDLString dialogText;
-        NS_NAMED_LITERAL_STRING(dialogTextPropertyTag, "dialogText");
-        rv = bundle->FormatStringFromName(dialogTextPropertyTag.get(),
-                                          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 = m_registryUtils.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 = SetIsDefaultMailClient(PR_TRUE) ; // SetDefaultMailClient();
-    }
-    return rv;
-}
-

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

@@ -1,76 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * 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"
-
-#define MAILNEWS_ALLOW_DEFAULT_MAIL_CLIENT  "mailnews.default_mail_client"
-
-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;
-    nsMapiRegistryUtils m_registryUtils ;
-
-private:
-    // Special member to handle initialization.
-    PRBool mHaveBeenSet;
-}; // nsMapiRegistry
-
-#endif // nsmapiregistry_h____

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

@@ -1,743 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * 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 "msgMapiImp.h"
-#include "msgMapiMain.h"
-#include "nsMapiRegistryUtils.h"
-#include "nsString.h"
-#include "nsIStringBundle.h"
-#include "nsIPromptService.h"
-#include "nsXPIDLString.h"
-#include "nsSpecialSystemDirectory.h"
-#include "nsDirectoryService.h"
-#include "nsDirectoryServiceDefs.h"
-#include "nsAppDirectoryServiceDefs.h"
-#include "nsIPref.h"
-
-static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
-
-#define EXE_EXTENSION ".exe" 
-#define USERAGENT_VERSION_PREF "general.useragent.misc"
-#define USERAGENT_VERSION_NS_PREF "general.useragent.vendorSub"
-#define USERAGENT_PREF_PREFIX "rv:"
-
-nsMapiRegistryUtils::nsMapiRegistryUtils()
-{
-   m_mapiStringBundle = nsnull ;
-}
-    
-const char * nsMapiRegistryUtils::thisApplication()
-{
-    if (m_thisApp.IsEmpty()) {
-        char buffer[MAX_PATH] = {0};
-        DWORD len = ::GetModuleFileName(NULL, buffer, MAX_PATH);
-        if (!len) return nsnull ; 
-        char shortPathBuf[MAX_PATH] = {0};
-        len = ::GetShortPathName(buffer, shortPathBuf, MAX_PATH);
-        if (!len) return nsnull ; 
-        m_thisApp = buffer;
-        m_thisApp.ToUpperCase();
-    }
-
-    return m_thisApp.get() ;
-}
-
-const PRUnichar * nsMapiRegistryUtils::brandName() 
-{
-    nsresult rv;
-    if (m_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)) {
-                    m_brand = brandName ;
-                }
-            }
-        }
-    }
-
-    return m_brand.get()  ;
-}
-
-const PRUnichar * nsMapiRegistryUtils::versionNo()
-{
- if (!m_versionNo.IsEmpty())
-   return m_versionNo.get() ;
-
- nsCOMPtr<nsIPref> prefs = do_GetService(NS_PREF_CONTRACTID);
- if (prefs) {
-     nsXPIDLCString versionStr ;
-     nsresult rv = prefs->GetCharPref(USERAGENT_VERSION_NS_PREF, getter_Copies(versionStr));
-     if (NS_SUCCEEDED(rv) && versionStr)
-         m_versionNo.AssignWithConversion (versionStr.get()) ;
-     else {
-         rv = prefs->GetCharPref(USERAGENT_VERSION_PREF, getter_Copies(versionStr));
-         if (NS_SUCCEEDED(rv) && versionStr)  {
-             m_versionNo.AssignWithConversion (versionStr.get()) ;
-             m_versionNo.StripChars (USERAGENT_PREF_PREFIX) ;
-         }
-     }
- }
-
- return m_versionNo.get() ;
-}
-
-
-PRBool nsMapiRegistryUtils::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 nsMapiRegistryUtils::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 nsMapiRegistryUtils::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;
-}
-
-void nsMapiRegistryUtils::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);
-     }
-}
-
-
-
-PRBool nsMapiRegistryUtils::IsDefaultMailClient()
-{
-    if (!isSmartDll() && !isMozDll()) 
-        return PR_FALSE;
-    nsCAutoString name; 
-    GetRegistryKey(HKEY_LOCAL_MACHINE, "Software\\Clients\\Mail", "", name);
-    if (!name.IsEmpty()) {
-         nsCAutoString keyName("Software\\Clients\\Mail\\");
-         keyName += name.get(); 
-         keyName += "\\protocols\\mailto\\shell\\open\\command";
-
-         nsCAutoString result;
-         GetRegistryKey(HKEY_LOCAL_MACHINE, keyName.get(), "", result);
-         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());
-             }
-             nsCAutoString thisApp (thisApplication()) ;
-             return (result == thisApp);
-        }
-    }
-    return PR_FALSE;
-
-}
-
-nsresult nsMapiRegistryUtils::saveDefaultMailClient()
-{
-    nsresult rv;
-    nsCAutoString name ;
-    GetRegistryKey(HKEY_LOCAL_MACHINE,"Software\\Clients\\Mail", "", name);
-    if (!name.IsEmpty()) {
-        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                            "Software\\Mozilla\\Desktop", 
-                            "HKEY_LOCAL_MACHINE\\Software\\Clients\\Mail", 
-                            (char *)name.get());
-        if (NS_SUCCEEDED(rv)) {
-            nsCAutoString keyName("Software\\Clients\\Mail\\");
-            keyName += name.get(); 
-            keyName += "\\protocols\\mailto\\shell\\open\\command";
-            nsCAutoString appPath ;
-            GetRegistryKey(HKEY_LOCAL_MACHINE, keyName.get(), "", appPath);
-            if (!appPath.IsEmpty()) {
-                nsCAutoString 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;
-} 
-
-nsresult nsMapiRegistryUtils::saveUserDefaultMailClient()
-{
-    nsresult rv;
-    nsCAutoString name ;
-    GetRegistryKey(HKEY_CURRENT_USER,"Software\\Clients\\Mail", "", name);
-    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)(); 
-PRBool nsMapiRegistryUtils::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.
- */
-PRBool nsMapiRegistryUtils::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 nsMapiRegistryUtils::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;
-        }
-    }
-    
-    NS_NAMED_LITERAL_STRING(fileName, "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 nsMapiRegistryUtils::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.get());
-    
-    nsCOMPtr<nsILocalFile> pPreviousMapiFile = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID, &rv);
-    if (NS_FAILED(rv) || !pPreviousMapiFile) return NS_ERROR_FAILURE;       
-    pPreviousMapiFile->InitWithPath(previousFileName.get());
-
-    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 nsMapiRegistryUtils::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 (NS_ConvertUCS2toUTF8(brandName()).get());
-    if (!appName.IsEmpty()) {
-        keyName.Append(appName.get());
-
- nsCOMPtr<nsIStringBundle> bundle;
- rv = MakeMapiStringBundle (getter_AddRefs (bundle)) ;
- if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-
- nsXPIDLString defaultMailTitle;
- const PRUnichar *keyValuePrefixStr[] = { brandName(), versionNo() };
- NS_NAMED_LITERAL_STRING(defaultMailTitleTag, "defaultMailDisplayTitle");
- rv = bundle->FormatStringFromName(defaultMailTitleTag.get(),
- keyValuePrefixStr, 2,
- getter_Copies(defaultMailTitle));
- if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-
-        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                        keyName.get(), 
- "", NS_CONST_CAST(char *, NS_ConvertUCS2toUTF8(defaultMailTitle).get()) ) ; 
-    }
-    else
-        rv = NS_ERROR_FAILURE;
-    if (NS_SUCCEEDED(rv)) {
-        nsCAutoString thisApp (thisApplication()) ;
-        if (NS_FAILED(rv)) return rv ;
-
-        nsCAutoString dllPath (thisApp) ;
-        PRInt32 index = dllPath.RFind("\\");
-        if (index != kNotFound)
-            dllPath.Truncate(index + 1);
-        dllPath += "mozMapi32.dll";
-        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                            keyName.get(), "DLLPath", 
-                            (char *)dllPath.get());
-        if (NS_SUCCEEDED(rv)) {
-            keyName.Append("\\protocols\\mailto");
-            rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                                keyName.get(), 
-                                "", "URL:MailTo Protocol");
-            if (NS_SUCCEEDED(rv)) {
-                nsCAutoString appPath (thisApp);
-                appPath += " \"%1\"";
-                keyName.Append("\\shell\\open\\command");
-                rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                       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(thisApp);
-                    mailAppPath += " -mail";
-                    nsCAutoString appKeyName ("Software\\Clients\\Mail\\");
-                    appKeyName.Append(appName.get());
-                    appKeyName.Append("\\shell\\open\\command");
-                    rv = SetRegistryKey(HKEY_LOCAL_MACHINE,
-                                        appKeyName.get(),
-                                        "", (char *)mailAppPath.get());
-                }
-                if (NS_SUCCEEDED(rv)) {
-                    nsCAutoString iconPath(thisApp);
-                    iconPath += ",0";
-                    nsCAutoString iconKeyName ("Software\\Clients\\Mail\\");
-                    iconKeyName.Append(appName.get());
-                    iconKeyName.Append("\\DefaultIcon");
-                    mailKeySet = SetRegistryKey(HKEY_LOCAL_MACHINE,
-                                        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_CMapiImp, "Mozilla MAPI", "mozMapi", "mozMapi.1");
-        return desktopKeySet;
-    }
-    
-    return mailKeySet;
-}
-
-/** Removes Mozilla as the default Mail client and restores the previous setting
- */
-nsresult nsMapiRegistryUtils::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", name);
-    nsCAutoString appName (NS_ConvertUCS2toUTF8(brandName()).get());
-
-    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", 
-                        keyName.get(), appPath);
-        if (!appPath.IsEmpty()) {
-            keyName.Assign("Software\\Clients\\Mail\\");
-            keyName.Append(appName.get());
-            keyName.Append("\\protocols\\mailto\\shell\\open\\command");
-            result = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                       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, 
-                                        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", userAppName);
-        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_CMapiImp, "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 nsMapiRegistryUtils::getShowDialog() {
-    PRBool rv = PR_FALSE;
-    nsCAutoString showDialog ;
-    GetRegistryKey(HKEY_LOCAL_MACHINE, "Software\\Mozilla\\Desktop", 
-                                        "showMapiDialog", showDialog);
-    // 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", setMailDefault);
-        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;
-}
-
-nsresult nsMapiRegistryUtils::MakeMapiStringBundle(nsIStringBundle ** aMapiStringBundle)
-{
-    nsresult rv = NS_OK ;
-
-    if (m_mapiStringBundle)
-    {
-        *aMapiStringBundle = m_mapiStringBundle ;
-        NS_ADDREF(*aMapiStringBundle);
-        return rv ;
-    }
-
-    nsCOMPtr<nsIStringBundleService> bundleService(do_GetService(
-                                     kStringBundleServiceCID, &rv));
-    if (NS_FAILED(rv) || !bundleService) return NS_ERROR_FAILURE;
-
-    rv = bundleService->CreateBundle(
- MAPI_PROPERTIES_CHROME,
-                    getter_AddRefs(m_mapiStringBundle));
-    if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-
- NS_ADDREF(*aMapiStringBundle = m_mapiStringBundle) ;
-
-    return rv ;
-}
-
-nsresult nsMapiRegistryUtils::ShowMapiErrorDialog() 
-{
-    nsresult rv;
-    nsCOMPtr<nsIPromptService> promptService(do_GetService(
-                  "@mozilla.org/embedcomp/prompt-service;1", &rv));
-    if (NS_SUCCEEDED(rv) && promptService)
-    {
-        nsCOMPtr<nsIStringBundle> bundle;
-        rv = MakeMapiStringBundle (getter_AddRefs (bundle)) ;
-        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-
-        nsXPIDLString dialogTitle;
-        const PRUnichar *brandStrings[] = { brandName() };
-        NS_NAMED_LITERAL_STRING(dialogTitlePropertyTag, "errorMessageTitle");
-        rv = bundle->FormatStringFromName(dialogTitlePropertyTag.get(),
-                                          brandStrings, 1,
-                                          getter_Copies(dialogTitle));
-        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-
-        nsXPIDLString dialogText;
-        NS_NAMED_LITERAL_STRING(dialogTextPropertyTag, "errorMessage");
-        rv = bundle->FormatStringFromName(dialogTextPropertyTag.get(),
-                                          brandStrings, 1,
-                                          getter_Copies(dialogText));
-        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-
-        rv = promptService->Alert(nsnull, dialogTitle,
-                                  dialogText);
-    }
-    return rv;
-}
-

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

@@ -1,112 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * 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"
-#include "nsIStringBundle.h"
-
-class nsMapiRegistryUtils
-{
-private :
-    nsCAutoString m_thisApp ;
-    nsAutoString m_brand ;
- nsAutoString m_versionNo ;
-
-    nsCOMPtr<nsIStringBundle> m_mapiStringBundle ;
-public :
-    nsMapiRegistryUtils() ;
-
-    // returns TRUE if the Mapi32.dll is smart dll.
-    PRBool isSmartDll();
-    // returns TRUE if the Mapi32.dll is a Mozilla dll.
-    PRBool isMozDll();
-
-    // Returns the (fully-qualified) name of this executable.
-    const char * thisApplication() ; 
-    // This returns the brand name for this application
-    const PRUnichar * brandName() ;
- // This returns the version no for this application
- const PRUnichar * versionNo() ;
-    // verifyRestrictedAccess - Returns PR_TRUE if this user only has restricted access
-    // to the registry keys we need to modify.
-    PRBool verifyRestrictedAccess() ;
-
-    // set the Windows registry key
-nsresult SetRegistryKey(HKEY baseKey, const char * keyName, 
-                        const char * valueName, char * value);
-    // delete a registry key
-nsresult DeleteRegistryValue(HKEY baseKey, const char * keyName, 
-                        const char * valueName);
-    // get a Windows registry key
-    void GetRegistryKey(HKEY baseKey, const char * keyName, 
-                         const char * valueName, nsCAutoString & value) ;
-
-    // Returns TRUE if the current application is default mail client.
-PRBool IsDefaultMailClient();
-    // Sets Mozilla as default Mail Client
-    nsresult setDefaultMailClient() ;
-    // Removes Mozilla as the default Mail client and restores the previous setting
-    nsresult unsetDefaultMailClient() ;
-
-    // Saves the current setting of the default Mail Client in 
-    // HKEY_LOCAL_MACHINE\\Software\\Mozilla\\Desktop
-nsresult saveDefaultMailClient();
-    // Saves the current user setting of the default Mail Client in 
-    // HKEY_LOCAL_MACHINE\\Software\\Mozilla\\Desktop
-nsresult saveUserDefaultMailClient();
-
-nsresult CopyMozMapiToWinSysDir();
-nsresult RestoreBackedUpMapiDll();
-
-    // Returns FALSE if showMapiDialog is set to 0.
-    PRBool getShowDialog() ;
-
-    // create a string bundle for MAPI messages
-    nsresult MakeMapiStringBundle(nsIStringBundle ** aMapiStringBundle) ;
-    // display an error dialog for MAPI messages
-    nsresult ShowMapiErrorDialog() ;
-
-} ;
-
-#endif

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

@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:package:root">
-    <RDF:li resource="urn:mozilla:package:messenger-mapi"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:messenger-mapi"
-        chrome:displayName="Messenger"
-        chrome:author="mozilla.org"
-        chrome:name="messenger-mapi"
-        chrome:localeVersion="0.9.7"
-		chrome:skinVersion="0.9.4">
-  </RDF:Description>
-
-  <!-- overlay information -->
-  <RDF:Seq about="urn:mozilla:overlays">
-    <RDF:li resource="chrome://messenger/content/pref-mailnews.xul"/>
-  </RDF:Seq>
-
-  <!-- mapi items for Mail And Newsgroups preferences pane -->
-  <RDF:Seq about="chrome://messenger/content/pref-mailnews.xul">
-    <RDF:li>chrome://messenger-mapi/content/pref-mailnewsOverlay.xul</RDF:li>
-  </RDF:Seq>
-
-</RDF:RDF>

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

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

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

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

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

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

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

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

mozilla/mailnews/mapi/resources/locale/en-US/contents.rdf

@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the skins being supplied by this package -->
-  <RDF:Seq about="urn:mozilla:locale:root">
-    <RDF:li resource="urn:mozilla:locale:en-US"/>
-  </RDF:Seq>
-
-  <!-- locale information -->
-  <RDF:Description about="urn:mozilla:locale:en-US">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:locale:en-US:packages">
-        <RDF:li resource="urn:mozilla:locale:en-US:messenger-mapi"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version of this
-       package. -->
-  <RDF:Description about="urn:mozilla:locale:en-US:messenger-mapi"
-	chrome:localeVersion="0.9.7"/>
-</RDF:RDF>

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

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

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

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

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

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

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

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