C++ side of fix for bug 100212 - move consumers of nsIFile.URL into nsIIOService. r=dougt, sr=darin

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

mozilla/extensions/sql/Makefile.in

@@ -1,19 +0,0 @@
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS            = \
-		base \
-		pgsql \
-		build
-
-ifdef ENABLE_TESTS
-DIRS		+= \
-		sqltest \
-		tests
-endif
-
-include $(topsrcdir)/config/rules.mk

mozilla/extensions/sql/base/Makefile.in

@@ -1,11 +0,0 @@
-DEPTH           = ../../..
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-
-DIRS            = \
-		public \
-		src \
-		resources
-
-include $(topsrcdir)/config/rules.mk

mozilla/extensions/sql/base/public/Makefile.in

@@ -1,19 +0,0 @@
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-MODULE		= sql
-
-XPIDLSRCS	= \
-		mozISqlConnection.idl \
-		mozISqlRequest.idl \
-		mozISqlDataSource.idl \
-		mozISqlInputStream.idl \
-		mozISqlRequestObserver.idl \
-		mozISqlResult.idl \
-		mozISqlResultEnumerator.idl \
-		mozISqlService.idl \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk

mozilla/extensions/sql/base/public/mozISqlConnection.idl

@@ -1,124 +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):
- *   Jan Varga <varga@utcru.sk>
- *
- * 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 mozISqlResult;
-interface mozISqlRequest;
-interface mozISqlRequestObserver;
-
-/**
- * @status UNDER_REVIEW
- */
-
-[scriptable, uuid(f16397a4-1ecb-4e08-84f8-27750c04b779)]
-interface mozISqlConnection : nsISupports
-{
-
-  readonly attribute AString serverVersion;
-
-  /**
-   * The most recent error message.
-   */
-  readonly attribute AString errorMessage;
-
-  /**
-   * The ID of the most recently added record.
-   */
-  readonly attribute long lastID;
-
-  /**
-   * Set up the connection.
-   *
-   * @param aHost       The host name.
-   * @param aPort       The port at which the host is listening.
-   * @param aDatabase   The real database name to connect to.
-   * @param aUsername   The username to connect as.
-   * @param aPassword   The password to use in authentification phase.   
-   */
-  void init(in AString aHost,
-            in long aPort,
-            in AString aDatabase,
-            in AString aUsername,
-            in AString aPassword);
-
-  /**
-   * Execute the query synchronously and return database result.
-   *
-   * @param aQuery      The query to execute.
-   */
-  mozISqlResult executeQuery(in AString aQuery);
-
-  /**
-   * Execute the update synchronously and return number of updated rows.
-   *
-   * @param aUpdate     The update to execute.
-   */
-  long executeUpdate(in AString aUpdate);
-
-  mozISqlRequest asyncExecuteQuery(in AString aQuery,
-                                   in nsISupports aContext,
-                                   in mozISqlRequestObserver aObserver);
-
-  mozISqlRequest asyncExecuteUpdate(in AString aQuery,
-                                    in nsISUpports aContext,
-                                    in mozISqlRequestObserver aObserver);
-
-  /**
-   * Begin transaction.
-   */
-  void beginTransaction();
-
-  /**
-   * Commit transaction.
-   */
-  void commitTransaction();
-
-  /**
-   * Rollback transaction.
-   */
-  void rollbackTransaction();
-
-  /**
-   * Get primary keys.
-   *
-   * @param aSchema     The schema.
-   * @param aTable      The table name.
-   */
-  mozISqlResult getPrimaryKeys(in AString aSchema, in AString aTable);
-
-};

mozilla/extensions/sql/base/public/mozISqlResult.idl

@@ -1,87 +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):
- *   Jan Varga <varga@utcru.sk>
- *
- * 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 mozISqlConnection;
-interface mozISqlResultEnumerator;
-interface mozISqlInputStream;
-
-/**
- * @status UNDER_DEVELOPMENT
- */
-
-[scriptable, uuid(08c220b0-7140-456a-89e9-c94609a7392d)]
-interface mozISqlResult : nsISupports
-{
-
-  readonly attribute mozISqlConnection connection;
-
-  readonly attribute AString query;
-
-  readonly attribute AString tableName;
-
-  readonly attribute long rowCount;
-
-  readonly attribute long columnCount;
-
-  AString getColumnName(in long aColumnIndex);
-
-  long getColumnIndex(in AString aColumnName);
-
-  const long TYPE_STRING        = 1;
-  const long TYPE_INT           = 2;
-  const long TYPE_FLOAT         = 3;
-  const long TYPE_DECIMAL       = 4;
-  const long TYPE_DATE	        = 5;
-  const long TYPE_TIME	        = 6;
-  const long TYPE_DATETIME      = 7;
-  const long TYPE_BOOL	        = 8;
-  
-  long getColumnType(in long aColumnIndex);
-
-  AString getColumnTypeAsString(in long aColumnIndex);
-
-  long getColumnDisplaySize(in long aColumnIndex);
-
-  mozISqlResultEnumerator enumerate();
-
-  mozISqlInputStream open();
-
-  void reload();
-
-};

mozilla/extensions/sql/base/public/mozISqlResultEnumerator.idl

@@ -1,126 +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):
- *   Jan Varga <varga@utcru.sk>
- *
- * 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 nsIVariant;
-
-/**
- * @status UNDER_DEVELOPMENT
- */
-
-[scriptable, uuid(dcc0d29e-2b44-460e-b39f-89121ff8b963)]
-interface mozISqlResultEnumerator : nsISupports
-{
-
-  readonly attribute AString errorMessage;
-
-  boolean next();
-
-  boolean previous();
-
-  void beforeFirst();
-
-  void first();
-
-  void last();
-
-  void relative(in long aRows);
-
-  void absolute(in long aRowIndex);
-
-
-  boolean isNull(in long aColumnIndex);
-
-  nsIVariant getVariant(in long aColumnIndex);
-
-  AString getString(in long aColumnIndex);
-
-  long getInt(in long aColumnIndex);
-
-  float getFloat(in long aColumnIndex);
-
-  float getDecimal(in long aColumnIndex);
-
-  long long getDate(in long aColumnIndex);
-
-  boolean getBool(in long aColumnIndex);
-
-
-  void setNull(in long aColumnIndex);
-
-  void setDefault(in long aColumnIndex);
-
-  void copy(in long aColumnIndex);
-
-  void setVariant(in long aColumnIndex, in nsIVariant aValue);
-
-  void setString(in long aColumnIndex, in AString aValue);
-
-  void setInt(in long aColumnIndex, in long aValue);
-
-  void setFloat(in long aColumnIndex, in float aValue);
-
-  void setDecimal(in long aColumnIndex, in float aValue);
-
-  void setDate(in long aColumnIndex, in long long aValue);
-
-  void setBool(in long aColumnIndex, in boolean aValue);
-
-
-  void setNullValues();
-
-  void setDefaultValues();
-
-  void copyValues();
-
-
-  boolean canInsert();
-
-  boolean canUpdate();
-
-  boolean canDelete();
-
-  long insertRow();
-  
-  long updateRow();
-
-  long deleteRow();
-
-  readonly attribute AString currentCondition;
-
-};

mozilla/extensions/sql/base/public/mozISqlService.idl

@@ -1,81 +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):
- *   Jan Varga <varga@utcru.sk>
- *
- * 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 mozISqlConnection;
-
-/**
- * @status UNDER_DEVELOPMENT
- */
-
-[scriptable, uuid(1ceb35b7-daa8-4ce4-ac67-125fb17cb019)]
-interface mozISqlService : nsISupports
-{
-
-  readonly attribute AString errorMessage;
-
-  void addAlias(in ACString aURI,
-                in AString aName,
-                in AString aType,
-                in AString aHostname,
-                in long aPort,
-                in AString aDatabase);
-
-  boolean hasAlias(in ACString aURI);
-
-  void getAlias(in ACString aURI,
-                out AString aName,
-                out AString aType,
-                out AString aHostname,
-                out long aPort,
-                out AString aDatabase);
-
-  void updateAlias(in ACString aURI,
-                   in AString aName,
-                   in AString aType,
-                   in AString aHostname,
-                   in long aPort,
-                   in AString aDatabase);
-
-  void removeAlias(in ACString aURI);
-
-  mozISqlConnection getConnection(in ACString aURI);
-
-  mozISqlConnection getNewConnection(in ACString aURI);
-
-};

mozilla/extensions/sql/base/resources/Makefile.in

@@ -1,6 +0,0 @@
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(topsrcdir)/config/rules.mk

mozilla/extensions/sql/base/resources/content/aliasDialog.js

@@ -1,39 +0,0 @@
-var sqlService = null;
-
-var name;
-var type;
-var hostname;
-var port;
-var database;
-
-function init() {
-  sqlService = Components.classes["@mozilla.org/sql/service;1"]
-              .getService(Components.interfaces.mozISqlService);
-
-  name = document.getElementById("name");
-  type = document.getElementById("type");
-  hostname = document.getElementById("hostname");
-  port = document.getElementById("port");
-  database = document.getElementById("database");
-
-  if (window.arguments) {
-    // get original values
-    var uri = window.arguments[0];
-    sqlService.getAlias(uri, name, type, hostname, port, database);
-  }
-}
-
-function onAccept() {
-  if (window.arguments) {
-    // update an existing alias
-    var uri = window.arguments[0];
-    sqlService.updateAlias(uri, name.value, type.value, hostname.value,
-                           port.value, database.value);
-  }
-  else {
-    // add a new database
-    var uri = "urn:aliases:" + name.value;
-    sqlService.addAlias(uri, name.value, type.value, hostname.value,
-                        port.value, database.value);
-  }
-}

mozilla/extensions/sql/base/resources/content/aliasDialog.xul

@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-
-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-
-<!DOCTYPE dialog SYSTEM "chrome://sql/locale/aliasDialog.dtd">
-
-<dialog id="aliasDialog"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  title="&window.title;"
-  width="250" height="180"
-  buttons="accept,cancel" buttonpack="center"
-  ondialogaccept="return onAccept(event);"
-  onload="init()">
-
-  <script type="application/x-javascript" src="aliasDialog.js"/>
-
-  <grid flex="1">
-    <columns>
-      <column/>
-      <column flex="1"/>
-    </columns>
-    <rows>
-      <row>
-        <label value="&name.label;"/>
-        <textbox id="name"/>
-      </row>
-      <row>
-        <label value="&type.label;"/>
-        <textbox id="type"/>
-      </row>
-      <row>
-        <label value="&hostname.label;"/>
-        <textbox id="hostname"/>
-      </row>
-      <row>
-        <label value="&port.label;"/>
-        <textbox id="port"/>
-      </row>
-      <row>
-        <label value="&database.label;"/>
-        <textbox id="database"/>
-      </row>
-    </rows>
-  </grid>
-
-</dialog>

mozilla/extensions/sql/base/resources/content/contents.rdf

@@ -1,21 +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:sql"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:sql"
-        chrome:displayName="SQL support"
-        chrome:author="mozilla.org"
-	chrome:authorURL="http://www.mozilla.org/projects/sql/index.html"
-        chrome:name="sql"
-        chrome:extension="true"
-	chrome:settingsURL="chrome://sql/content/sqlSettings.xul"
-	chrome:description="Allow applications to directly connect to SQL databases.">
-  </RDF:Description>
-
-</RDF:RDF>

mozilla/extensions/sql/base/resources/content/sqlSettings.js

@@ -1,36 +0,0 @@
-var sqlService = null;
-
-function getSqlService() {
-  if (! sqlService)
-    sqlService = Components.classes["@mozilla.org/sql/service;1"]
-                 .getService(Components.interfaces.mozISqlService);
-  return sqlService;
-}
-
-function getSelectedAlias() {
-  var tree = document.getElementById("aliasesTree");
-  return tree.builderView.getResourceAtIndex(tree.currentIndex).Value;
-}
-
-function updateButtons() {
-  var tree = document.getElementById("aliasesTree");
-  const buttons = ["updateButton", "removeButton"];
-  for (i = 0; i < buttons.length; i++)
-    document.getElementById(buttons[i]).disabled = tree.currentIndex < 0;
-}
-
-function addAlias() {
-  window.openDialog("aliasDialog.xul", "addAlias", "chrome,modal=yes,resizable=no,centerscreen");
-}
-
-function updateAlias() {
-  var alias = getSelectedAlias();
-  window.openDialog("aliasDialog.xul", "updateDatabase", "chrome,modal=yes,resizable=no,centerscreen", alias);
-}
-
-function removeAlias() {
-  var sqlService = getSqlService();
-  var alias = getSelectedAlias();
-  sqlService.removeAlias(alias);  
-  updateButtons();
-}

mozilla/extensions/sql/base/resources/content/sqlSettings.xul

@@ -1,55 +0,0 @@
-<?xml version="1.0"?>
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<!DOCTYPE dialog SYSTEM "chrome://sql/locale/sqlSettings.dtd">
-
-<dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="&header.label;"
-        width="450" height="350">
-
-  <script type="application/x-javascript" src="sqlSettings.js"/>
-
-  <groupbox flex="1">
-    <caption label="&aliases.label;"/>
-    <hbox flex="1">
-      <tree id="aliasesTree" flex="1"
-            seltype="single"
-            datasources="rdf:sql" ref="SQL:AliasesRoot" flags="dont-build-content"
-            onselect="updateButtons()">
-        <treecols>
-          <treecol id="nameCol" flex="1" label="&nameCol.label;"
-                   sort="rdf:http://www.mozilla.org/SQL-rdf#name"
-                   sortActive="true" sortDirection="ascending"/>
-          <treecol id="typeCol" flex="1" label="&typeCol.label;"
-                   sort="rdf:http://www.mozilla.org/SQL-rdf#type"/>
-          <treecol id="hostnameCol" flex="1" label="&hostnameCol.label;"
-                   sort="rdf:http://www.mozilla.org/SQL-rdf#hostname"/>
-          <treecol id="portCol" flex="1" label="&portCol.label;"
-                   sort="rdf:http://www.mozilla.org/SQL-rdf#port"/>
-          <treecol id="databaseCol" flex="1" label="&databaseCol.label;"
-                   sort="rdf:http://www.mozilla.org/SQL-rdf#database"/>
-        </treecols>
-        <template>
-          <treechildren>
-            <treeitem uri="rdf:*">
-              <treerow>
-                <treecell label="rdf:http://www.mozilla.org/SQL-rdf#name"/>
-                <treecell label="rdf:http://www.mozilla.org/SQL-rdf#type"/>
-                <treecell label="rdf:http://www.mozilla.org/SQL-rdf#hostname"/>
-                <treecell label="rdf:http://www.mozilla.org/SQL-rdf#port"/>
-                <treecell label="rdf:http://www.mozilla.org/SQL-rdf#database"/>
-              </treerow>
-            </treeitem>
-          </treechildren>
-        </template>
-      </tree>
-      <vbox>
-        <button id="addButton" label="&add.label;" oncommand="addAlias()"/>
-        <button id="updateButton" label="&update.label;" disabled="true" oncommand="updateAlias()"/>
-        <button id="removeButton" label="&remove.label;" disabled="true" oncommand="removeAlias()"/>
-      </vbox>
-    </hbox>
-  </groupbox>
-
-</dialog>

mozilla/extensions/sql/base/resources/jar.mn

@@ -1,9 +0,0 @@
-sql.jar:
-    content/sql/contents.rdf				(content/contents.rdf)
-    content/sql/sqlSettings.xul				(content/sqlSettings.xul)
-    content/sql/sqlSettings.js				(content/sqlSettings.js)
-    content/sql/aliasDialog.xul				(content/aliasDialog.xul)
-    content/sql/aliasDialog.js				(content/aliasDialog.js)
-    locale/en-US/sql/contents.rdf			(locale/en-US/contents.rdf)
-    locale/en-US/sql/sqlSettings.dtd			(locale/en-US/sqlSettings.dtd)
-    locale/en-US/sql/aliasDialog.dtd			(locale/en-US/aliasDialog.dtd)

mozilla/extensions/sql/base/resources/locale/en-US/aliasDialog.dtd

@@ -1,7 +0,0 @@
-<!ENTITY window.title "Alias">
-
-<!ENTITY name.label "Name:">
-<!ENTITY type.label "Type:">
-<!ENTITY hostname.label "Hostname:">
-<!ENTITY port.label "Port:">
-<!ENTITY database.label "Database:">

mozilla/extensions/sql/base/resources/locale/en-US/sqlSettings.dtd

@@ -1,12 +0,0 @@
-<!ENTITY header.label "SQL support">
-
-<!ENTITY aliases.label "Aliases">
-<!ENTITY nameCol.label "Name">
-<!ENTITY typeCol.label "Type">
-<!ENTITY hostnameCol.label "Hostname">
-<!ENTITY portCol.label "Port">
-<!ENTITY databaseCol.label "Database">
-
-<!ENTITY add.label "Add alias">
-<!ENTITY update.label "Update alias">
-<!ENTITY remove.label "Remove alias">

mozilla/extensions/sql/base/src/Makefile.in

@@ -1,33 +0,0 @@
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= sql
-LIBRARY_NAME	= sqlbase_s
-REQUIRES	= xpcom \
-		  string \
-		  unicharutil \
-		  locale \
-		  necko \
-		  rdf \
-		  windowwatcher \
-		  $(NULL)
-
-CPPSRCS		= \
-		  mozSqlConnection.cpp \
-		  mozSqlRequest.cpp \
-		  mozSqlResult.cpp \
-		  mozSqlService.cpp
-
-EXPORTS		= \
-		  mozSqlConnection.h \
-		  mozSqlRequest.h \
-		  mozSqlResult.h \
-		  mozSqlService.h
-
-FORCE_STATIC_LIB=1
-
-include $(topsrcdir)/config/rules.mk

mozilla/extensions/sql/base/src/mozSqlConnection.cpp

@@ -1,237 +0,0 @@
-#include "nsIProxyObjectManager.h"
-#include "mozSqlRequest.h"
-#include "mozSqlConnection.h"
-
-mozSqlConnection::mozSqlConnection()
-  : mLock(nsnull),
-    mCondVar(nsnull),
-    mThread(nsnull),
-    mShutdown(PR_FALSE),
-    mWaiting(PR_FALSE)
-{
-  NS_INIT_ISUPPORTS();
-  mExecLock = PR_NewLock();
-}
-
-mozSqlConnection::~mozSqlConnection()
-{
-  mRequests.Clear();
-
-  if (mCondVar)
-    PR_DestroyCondVar(mCondVar);
-  PR_DestroyLock(mExecLock);
-  if (mLock)
-    PR_DestroyLock(mLock);
-}
-
-// We require a special implementation of Release, which knows about
-// a circular strong reference
-NS_IMPL_THREADSAFE_ADDREF(mozSqlConnection)
-NS_IMPL_THREADSAFE_QUERY_INTERFACE3(mozSqlConnection,
-                                    mozISqlConnection,
-                                    nsIRunnable,
-				    nsISupportsWeakReference)
-NS_IMETHODIMP_(nsrefcnt)
-mozSqlConnection::Release()
-{
-  PR_AtomicDecrement((PRInt32*)&mRefCnt);
-  // Delete if the last reference is our strong circular reference.
-  if (mThread && mRefCnt == 1) {
-    PR_Lock(mLock);
-    mRequests.Clear();
-    mShutdown = PR_TRUE;
-    if (mWaiting)
-      PR_NotifyCondVar(mCondVar);
-    else
-      CancelExec();
-    PR_Unlock(mLock);
-    return 0;
-  }
-  else if (mRefCnt == 0) {
-    delete this;
-    return 0;
-  }
-  return mRefCnt;
-}
-
-NS_IMETHODIMP
-mozSqlConnection::GetServerVersion(nsAString& aServerVersion) 
-{
-  aServerVersion = mServerVersion;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-mozSqlConnection::GetErrorMessage(nsAString& aErrorMessage) 
-{
-  aErrorMessage = mErrorMessage;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-mozSqlConnection::GetLastID(PRInt32* aLastID) 
-{
-  *aLastID = mLastID;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-mozSqlConnection::Init(const nsAString & aHost, PRInt32 aPort,
-                       const nsAString & aDatabase, const nsAString & aUsername,
-                       const nsAString & aPassword)
-{
-  // descendants have to implement this themselves
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-mozSqlConnection::ExecuteQuery(const nsAString& aQuery, mozISqlResult** _retval)
-{
-  PR_Lock(mExecLock);
-  nsresult rv = RealExec(aQuery, _retval, nsnull);
-  PR_Unlock(mExecLock);
-  return rv;
-}
-
-NS_IMETHODIMP
-mozSqlConnection::ExecuteUpdate(const nsAString& aUpdate, PRInt32* _retval)
-{
-  PR_Lock(mExecLock);
-  nsresult rv = RealExec(aUpdate, nsnull, _retval);
-  PR_Unlock(mExecLock);
-  return rv;
-}
-
-NS_IMETHODIMP
-mozSqlConnection::AsyncExecuteQuery(const nsAString& aQuery, nsISupports* aCtxt, 
-                                    mozISqlRequestObserver* aObserver,
-                                    mozISqlRequest **_retval)
-{
-  if (!mThread) {
-    mLock = PR_NewLock();
-    mCondVar = PR_NewCondVar(mLock);
-    NS_NewThread(getter_AddRefs(mThread), this, 0, PR_UNJOINABLE_THREAD);
-  }
-
-  mozSqlRequest* request = new mozSqlRequest(this);
-  if (! request)
-    return NS_ERROR_OUT_OF_MEMORY;
-
-  request->mIsQuery = PR_TRUE;
-  request->mQuery = aQuery;
-  request->mCtxt = aCtxt;
-
-  nsresult rv = NS_GetProxyForObject(NS_CURRENT_EVENTQ,
-                                     NS_GET_IID(mozISqlRequestObserver),
-                                     aObserver,
-                                     PROXY_SYNC | PROXY_ALWAYS,
-                                     getter_AddRefs(request->mObserver));
-  if (NS_FAILED(rv))
-    return rv;
-
-  PR_Lock(mLock);
-  mRequests.AppendObject(request);
-  if (mWaiting && mRequests.Count() == 1)
-    PR_NotifyCondVar(mCondVar);
-  PR_Unlock(mLock);
-
-  NS_ADDREF(*_retval = request);
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-mozSqlConnection::AsyncExecuteUpdate(const nsAString& aQuery, nsISupports* aCtxt, 
-                                     mozISqlRequestObserver* aObserver,
-                                     mozISqlRequest **_retval)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-mozSqlConnection::BeginTransaction()
-{
-  PRInt32 affectedRows;
-  return ExecuteUpdate(NS_LITERAL_STRING("begin"), &affectedRows);
-}
-
-NS_IMETHODIMP
-mozSqlConnection::CommitTransaction()
-{
-  PRInt32 affectedRows;
-  return ExecuteUpdate(NS_LITERAL_STRING("commit"), &affectedRows);
-}
-
-NS_IMETHODIMP
-mozSqlConnection::RollbackTransaction()
-{
-  PRInt32 affectedRows;
-  return ExecuteUpdate(NS_LITERAL_STRING("rollback"), &affectedRows);
-}
-
-NS_IMETHODIMP
-mozSqlConnection::GetPrimaryKeys(const nsAString& aSchema, const nsAString& aTable, mozISqlResult** _retval)
-{
-  // descendants have to implement this themselves
-  return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-NS_IMETHODIMP
-mozSqlConnection::Run()
-{
-  while(!mShutdown) {
-    PR_Lock(mLock);
-
-    while (mRequests.Count()) {
-      mCurrentRequest = mRequests[0];
-      mRequests.RemoveObjectAt(0);
-
-
-      mozSqlRequest* r = (mozSqlRequest*)mCurrentRequest.get();
-
-      r->mObserver->OnStartRequest(mCurrentRequest, r->mCtxt);
-
-      r->mStatus = mozISqlRequest::STATUS_EXECUTED;
-
-      PR_Unlock(mLock);
-
-      nsresult rv = ExecuteQuery(r->mQuery, getter_AddRefs(r->mResult));
-
-      PR_Lock(mLock);
-
-      if (NS_SUCCEEDED(rv))
-        r->mStatus = mozISqlRequest::STATUS_COMPLETE;
-      else {
-        r->mStatus = mozISqlRequest::STATUS_ERROR;
-	GetErrorMessage(r->mErrorMessage);
-      }
-        
-      r->mObserver->OnStopRequest(mCurrentRequest, r->mCtxt);
-
-      mCurrentRequest = nsnull;
-
-    }
-    
-    mWaiting = PR_TRUE;
-    PR_WaitCondVar(mCondVar, PR_INTERVAL_NO_TIMEOUT);
-    mWaiting = PR_FALSE;
-    PR_Unlock(mLock);
-  }
-
-  return NS_OK;
-}
-
-nsresult
-mozSqlConnection::CancelRequest(mozISqlRequest* aRequest)
-{
-  PR_Lock(mLock);
-  if (mCurrentRequest == aRequest)
-    CancelExec();
-  else {
-    if (mRequests.RemoveObject(aRequest))
-      ((mozSqlRequest*)aRequest)->mStatus = mozISqlRequest::STATUS_CANCELLED;
-  }
-  PR_Unlock(mLock);
-
-  return NS_OK;
-}

mozilla/extensions/sql/base/src/mozSqlConnection.h

@@ -1,53 +0,0 @@
-#ifndef mozSqlConnection_h
-#define mozSqlConnection_h                                                  
-
-#include "prcvar.h"
-#include "nsString.h"
-#include "nsCOMArray.h"
-#include "nsWeakReference.h"
-#include "nsIThread.h"
-#include "nsIRunnable.h"
-#include "mozISqlConnection.h"
-#include "mozISqlRequest.h"
-#include "mozISqlResult.h"
-
-class mozSqlConnection : public mozISqlConnection,
-                         public nsIRunnable,
-                         public nsSupportsWeakReference
-{
-  public:
-    mozSqlConnection();
-    virtual ~mozSqlConnection();
-
-    NS_DECL_ISUPPORTS
-
-    NS_DECL_MOZISQLCONNECTION
-
-    NS_DECL_NSIRUNNABLE
-
-    friend class mozSqlRequest;
-    friend class mozSqlResult;
-
-  protected:
-    virtual nsresult RealExec(const nsAString& aQuery,
-                              mozISqlResult** aResult, PRInt32* aAffectedRows) = 0;
-    virtual nsresult CancelExec() = 0;
-    virtual nsresult GetIDName(nsAString& aIDName) = 0;
-
-    nsresult CancelRequest(mozISqlRequest* aRequest);
-
-    nsString                    mServerVersion;
-    nsString                    mErrorMessage;
-    PRInt32                     mLastID;
-
-    PRLock*                     mLock;
-    PRCondVar*                  mCondVar;
-    PRLock*                     mExecLock;
-    nsCOMPtr<nsIThread>         mThread;
-    nsCOMArray<mozISqlRequest>  mRequests;
-    nsCOMPtr<mozISqlRequest>    mCurrentRequest;
-    PRBool                      mShutdown;
-    PRBool                      mWaiting;
-};
-
-#endif // mozSqlConnection_h

mozilla/extensions/sql/base/src/mozSqlRequest.cpp

@@ -1,86 +0,0 @@
-#include "mozSqlConnection.h"
-#include "mozSqlRequest.h"
-
-mozSqlRequest::mozSqlRequest(mozISqlConnection* aConnection)
-  : mAffectedRows(-1),
-    mIsQuery(PR_TRUE),
-    mStatus(mozISqlRequest::STATUS_NONE)
-{
-  NS_INIT_ISUPPORTS();
-  mConnection = do_GetWeakReference(aConnection);
-}
-
-mozSqlRequest::~mozSqlRequest()
-{
-}
-
-
-NS_IMPL_THREADSAFE_ISUPPORTS1(mozSqlRequest,
-                              mozISqlRequest);
-
-NS_IMETHODIMP
-mozSqlRequest::GetErrorMessage(nsAString & aErrorMessage)
-{
-  aErrorMessage = mErrorMessage;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-mozSqlRequest::GetResult(mozISqlResult * *aResult)
-{
-  NS_IF_ADDREF(*aResult = mResult);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-mozSqlRequest::GetAffectedRows(PRInt32 *aAffectedRows)
-{
-  *aAffectedRows = mAffectedRows;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-mozSqlRequest::GetLastID(PRInt32* aLastID)
-{
-  *aLastID = mLastID;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-mozSqlRequest::GetQuery(nsAString & aQuery)
-{
-  aQuery = mQuery;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-mozSqlRequest::GetCtxt(nsISupports * *aCtxt)
-{
-  NS_IF_ADDREF(*aCtxt = mCtxt);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-mozSqlRequest::GetObserver(mozISqlRequestObserver * *aObserver)
-{
-  NS_IF_ADDREF(*aObserver = mObserver);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-mozSqlRequest::GetStatus(PRInt32 *aStatus)
-{
-  *aStatus = mStatus;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-mozSqlRequest::Cancel()
-{
-  nsCOMPtr<mozISqlConnection> connection = do_QueryReferent(mConnection);
-  if (!connection)
-    return NS_ERROR_FAILURE;
-
-  mozISqlConnection* connectionRaw = connection.get();
-  return ((mozSqlConnection*)connectionRaw)->CancelRequest(this);
-}

mozilla/extensions/sql/base/src/mozSqlRequest.h

@@ -1,41 +0,0 @@
-#ifndef mozSqlRequest_h
-#define mozSqlRequest_h                                                  
-
-#include "nsString.h"
-#include "nsCOMPtr.h"
-#include "nsIWeakReference.h"
-#include "mozISqlConnection.h"
-#include "mozISqlResult.h"
-#include "mozISqlRequest.h"
-#include "mozISqlRequestObserver.h"
-
-class mozSqlRequest : public mozISqlRequest
-{
-  public:
-    mozSqlRequest(mozISqlConnection* aConnection);
-    virtual ~mozSqlRequest();
-
-    NS_DECL_ISUPPORTS
-
-    NS_DECL_MOZISQLREQUEST
-
-    friend class mozSqlConnection;
-
-  protected:
-    nsCOMPtr<nsIWeakReference>          mConnection;
-
-    nsString                            mErrorMessage;
-    nsCOMPtr<mozISqlResult>             mResult;
-    PRInt32                             mAffectedRows;
-    PRInt32                             mLastID;
-
-    PRBool                              mIsQuery;
-    nsString                            mQuery;
-    nsCOMPtr<nsISupports>               mCtxt;
-    nsCOMPtr<mozISqlRequestObserver>    mObserver;
-
-    PRInt32                             mStatus;
-
-};
-
-#endif // mozSqlRequest_h

mozilla/extensions/sql/base/src/mozSqlResult.h

@@ -1,367 +0,0 @@
-#ifndef mozSqlResult_h
-#define mozSqlResult_h                                                  
-
-#include "nsCRT.h"
-#include "nsFixedSizeAllocator.h"
-#include "nsVoidArray.h"
-#include "nsCOMArray.h"
-#include "nsHashtable.h"
-#include "nsCOMPtr.h"
-#include "nsWeakReference.h"
-#include "nsISimpleEnumerator.h"
-#include "nsIRDFService.h"
-#include "nsIRDFDataSource.h"
-#include "nsIRDFRemoteDataSource.h"
-#include "nsIDateTimeFormat.h"
-#include "nsIInputStream.h"
-#include "mozISqlConnection.h"
-#include "mozISqlDataSource.h"
-#include "mozISqlResult.h"
-#include "mozISqlResultEnumerator.h"
-#include "mozISqlInputStream.h"
-
-#define CELL_FLAG_NULL          0x80
-#define CELL_FLAG_DEFAULT       0x40
-#define CELL_FLAG_MASK          ~(CELL_FLAG_NULL | CELL_FLAG_DEFAULT)
-
-class ColumnInfo {
-  public:
-    static ColumnInfo*
-    Create(nsFixedSizeAllocator& aAllocator,
-           PRUnichar* aName,
-	   PRInt32 aType,
-	   PRInt32 aSize,
-	   PRInt32 aMod,
-           nsIRDFResource* aProperty) {
-      void* place = aAllocator.Alloc(sizeof(ColumnInfo));
-      return place ? ::new(place) ColumnInfo(aName, aType, aSize, aMod, aProperty) : nsnull;
-    }
-
-    static void
-    Destroy(nsFixedSizeAllocator& aAllocator, ColumnInfo* aColumnInfo) {
-      aColumnInfo->~ColumnInfo();
-      aAllocator.Free(aColumnInfo, sizeof(ColumnInfo));
-    }
-
-    ColumnInfo(PRUnichar* aName, PRInt32 aType, PRInt32 aSize, PRInt32 aMod, nsIRDFResource* aProperty)
-      : mName(aName),
-        mType(aType),
-        mSize(aSize),
-        mMod(aMod),
-	mProperty(aProperty) {
-      NS_IF_ADDREF(mProperty);
-    }
-
-    ~ColumnInfo() {
-      if (mName)
-        nsMemory::Free(mName);
-      NS_IF_RELEASE(mProperty);
-    }
-
-    PRUnichar*          mName;
-    PRInt32             mType;
-    PRInt32             mSize;
-    PRInt32             mMod;
-    nsIRDFResource*     mProperty;
-
-  private:
-    // Hide so that only Create() and Destroy() can be used to
-    // allocate and deallocate from the heap
-    static void* operator new(size_t) CPP_THROW_NEW { return 0; } 
-    static void operator delete(void*, size_t) {}
-};
-
-class Cell {
-  public:
-    static Cell*
-    Create(nsFixedSizeAllocator& aAllocator,
-           PRInt32 aType) {
-      void* place = aAllocator.Alloc(sizeof(Cell));
-      return place ? ::new(place) Cell(aType) : nsnull;
-    }
-
-    static Cell*
-    Create(nsFixedSizeAllocator& aAllocator,
-           PRInt32 aType,
-           Cell* aSrcCell) {
-      void* place = aAllocator.Alloc(sizeof(Cell));
-      if (! place)
-        return nsnull;
-      Cell* newCell = ::new(place) Cell(aType);
-      Copy(aSrcCell, newCell);
-      return newCell;
-    }
-
-    static void
-    Copy(Cell* aSrcCell, Cell* aDestCell) {
-      if (aSrcCell->IsNull())
-        aDestCell->SetNull(PR_TRUE);
-      else {
-        aDestCell->SetNull(PR_FALSE);
-        PRInt32 type = aSrcCell->GetType();
-        if (type == mozISqlResult::TYPE_STRING)
-          aDestCell->SetString(nsCRT::strdup(aSrcCell->mString));
-        else if (type == mozISqlResult::TYPE_INT)
-          aDestCell->mInt = aSrcCell->mInt;
-        else if (type == mozISqlResult::TYPE_FLOAT ||
-                 type == mozISqlResult::TYPE_DECIMAL)
-          aDestCell->mFloat = aSrcCell->mFloat;
-        else if (type == mozISqlResult::TYPE_DATE ||
-                 type == mozISqlResult::TYPE_TIME ||
-                 type == mozISqlResult::TYPE_DATETIME)
-          aDestCell->mDate = aSrcCell->mDate;
-        else if (type == mozISqlResult::TYPE_BOOL)
-          aDestCell->mBool = aSrcCell->mBool;
-      }
-    }
-
-    static void
-    Destroy(nsFixedSizeAllocator& aAllocator, Cell* aCell) {
-      aCell->~Cell();
-      aAllocator.Free(aCell, sizeof(Cell));
-    }
-
-    Cell(PRInt32 aType)
-      : mString(nsnull),
-        mType(aType | CELL_FLAG_NULL) {
-    }
-
-    ~Cell() {
-      if ((GetType() == mozISqlResult::TYPE_STRING) && mString) {
-        nsMemory::Free(mString);
-      }
-    }
-
-    void SetString(PRUnichar* aString) {
-     if (mString)
-        nsMemory::Free(mString);
-      mString = aString;
-    }
-
-    PRInt32 GetType() {
-      return mType & CELL_FLAG_MASK;
-    }
-
-    void SetNull(PRBool aNull) {
-      mType &= CELL_FLAG_MASK;
-      if (aNull)
-        mType |= CELL_FLAG_NULL;
-    }
-
-    void SetDefault(PRBool aDefault) {
-      mType &= CELL_FLAG_MASK;
-      if (aDefault)
-        mType |= CELL_FLAG_DEFAULT;
-    }
-
-    PRBool IsNull() {
-      return mType & CELL_FLAG_NULL;
-    }
-
-    PRBool IsDefault() {
-      return mType & CELL_FLAG_DEFAULT;
-    }
-
-    union {
-      PRUnichar*        mString;
-      PRInt32           mInt;
-      float             mFloat;
-      PRInt64           mDate;
-      PRBool            mBool;
-    };
-
-  private:
-    static void* operator new(size_t) CPP_THROW_NEW { return 0; } 
-    static void operator delete(void*, size_t) {}
-
-    PRInt8              mType;
-};
-
-class Row {
-  public:
-    static Row*
-    Create(nsFixedSizeAllocator& aAllocator,
-           nsIRDFResource* aSource,
-           nsVoidArray& aColumnInfo) {
-      void* place = aAllocator.Alloc(sizeof(Row));
-      if (! place)
-        return nsnull;
-      Row* newRow = ::new(place) Row(aSource, aColumnInfo.Count());
-      for (PRInt32 i = 0; i < aColumnInfo.Count(); i++) {
-        Cell* newCell = Cell::Create(aAllocator, ((ColumnInfo*)aColumnInfo[i])->mType);
-        newRow->mCells[i] = newCell;
-      }
-      return newRow;
-    }
-
-    static Row*
-    Create(nsFixedSizeAllocator& aAllocator,
-           nsIRDFResource* aSource,
-           nsVoidArray& aColumnInfo,
-           Row* aSrcRow) {
-      void* place = aAllocator.Alloc(sizeof(Row));
-      if (! place)
-        return nsnull;
-      Row* newRow = ::new(place) Row(aSource, aColumnInfo.Count());
-      for (PRInt32 i = 0; i < aColumnInfo.Count(); i++) {
-        Cell* srcCell = aSrcRow->mCells[i];
-        Cell* newCell = Cell::Create(aAllocator, ((ColumnInfo*)aColumnInfo[i])->mType, srcCell);
-        newRow->mCells[i] = newCell;
-      }
-      return newRow;
-    }
-
-    static void
-    Copy(PRInt32 aColumnCount, Row* aSrcRow, Row* aDestRow) {
-      for (PRInt32 i = 0; i < aColumnCount; i++) {
-        Cell* srcCell = aSrcRow->mCells[i];
-        Cell* destCell = aDestRow->mCells[i];
-        Cell::Copy(srcCell, destCell);
-      }
-    }
-
-    static void
-    Destroy(nsFixedSizeAllocator& aAllocator, PRInt32 aColumnCount, Row* aRow) {
-      for (PRInt32 i = 0; i < aColumnCount; i++)
-        Cell::Destroy(aAllocator, aRow->mCells[i]);
-      aRow->~Row();
-      aAllocator.Free(aRow, sizeof(*aRow));
-    }
-
-    Row(nsIRDFResource* aSource, PRInt32 aColumnCount)
-      : mSource(aSource)
-    {
-      NS_IF_ADDREF(mSource);
-      mCells = new Cell*[aColumnCount];
-    }
-
-    ~Row() {
-      delete[] mCells;
-      NS_IF_RELEASE(mSource);
-    }
-    
-    nsIRDFResource*     mSource;
-    Cell**              mCells;
-  private:
-    static void* operator new(size_t) CPP_THROW_NEW { return 0; } 
-    static void operator delete(void*, size_t) {}
-};
-
-class mozSqlResult : public mozISqlResult,
-                     public mozISqlDataSource,
-                     public nsIRDFDataSource,
-                     public nsIRDFRemoteDataSource
-{
-  public:
-    mozSqlResult(mozISqlConnection* aConnection,
-                 const nsAString& aQuery);
-    nsresult Init();
-    nsresult Rebuild();
-    virtual ~mozSqlResult();
-
-    NS_DECL_ISUPPORTS
-
-    NS_DECL_MOZISQLRESULT
-
-    NS_DECL_MOZISQLDATASOURCE
-
-    NS_DECL_NSIRDFDATASOURCE
-
-    NS_DECL_NSIRDFREMOTEDATASOURCE
-
-    friend class mozSqlResultEnumerator;
-    friend class mozSqlResultStream;
-
-  protected:
-    virtual nsresult BuildColumnInfo() = 0 ;
-    virtual nsresult BuildRows() = 0;
-    virtual void ClearNativeResult() = 0;
-
-    void ClearColumnInfo();
-    void ClearRows();
-
-    nsresult EnsureTableName();
-    nsresult EnsurePrimaryKeys();
-
-    void AppendValue(Cell* aCell, nsAutoString& aValues);
-    nsresult AppendKeys(Row* aRow, nsAutoString& aKeys);
-    nsresult GetValues(Row* aRow, mozISqlResult** aResult, PRBool aUseID);
-    nsresult CopyValues(mozISqlResult* aResult, Row* aRow);
-
-    virtual nsresult CanInsert(PRBool* _retval) = 0;
-    virtual nsresult CanUpdate(PRBool* _retval) = 0;
-    virtual nsresult CanDelete(PRBool* _retval) = 0;
-
-    nsresult InsertRow(Row* aSrcRow, PRInt32* _retval);
-    nsresult UpdateRow(PRInt32 aRowIndex, Row* aSrcRow, PRInt32* _retval);
-    nsresult DeleteRow(PRInt32 aRowIndex, PRInt32* _retval);
-    nsresult GetCondition(Row* aRow, nsAString& aCurrentCondition);
-
-    static PRInt32                      gRefCnt;
-    static nsIRDFService*               gRDFService;
-    static nsIDateTimeFormat*           gFormat;
-    static nsIRDFResource*              kSQL_ResultRoot;
-    static nsIRDFResource*              kNC_Child;
-    static nsIRDFLiteral*               kNullLiteral;
-    static nsIRDFLiteral*               kTrueLiteral;
-    static nsIRDFLiteral*               kFalseLiteral;
-
-    nsCOMPtr<mozISqlConnection>         mConnection;
-    nsString                            mErrorMessage;
-    nsString                            mQuery;
-    nsString                            mTableName;
-    nsFixedSizeAllocator                mAllocator;
-    nsAutoVoidArray                     mColumnInfo;
-    nsVoidArray                         mRows;
-    nsObjectHashtable                   mSources;
-    nsCOMArray<nsIRDFObserver>          mObservers;
-    nsCOMPtr<mozISqlResultEnumerator>   mPrimaryKeys;
-    PRInt32                             mCanInsert;
-    PRInt32                             mCanUpdate;
-    PRInt32                             mCanDelete;
-};
-
-class mozSqlResultEnumerator : public mozISqlResultEnumerator,
-                               public nsISimpleEnumerator
-{
-  public:
-    mozSqlResultEnumerator(mozSqlResult* aResult);
-    virtual ~mozSqlResultEnumerator();
-
-    NS_DECL_ISUPPORTS
-
-    NS_DECL_MOZISQLRESULTENUMERATOR
-
-    NS_DECL_NSISIMPLEENUMERATOR
-
-  private:
-    mozSqlResult*               mResult;
-    PRInt32                     mCurrentIndex;
-    Row*                        mCurrentRow;
-    Row*                        mBuffer;
-};
-
-class mozSqlResultStream : public mozISqlInputStream,
-                           public nsIInputStream
-{
-  public:
-    mozSqlResultStream(mozSqlResult* aResult);
-    virtual ~mozSqlResultStream();
-
-    NS_DECL_ISUPPORTS
-
-    NS_DECL_MOZISQLINPUTSTREAM
-
-    NS_DECL_NSIINPUTSTREAM
-
-  protected:
-    nsresult EnsureBuffer();
-
-  private:
-    mozSqlResult*               mResult;
-    char*                       mBuffer;
-    PRUint32                    mLength;
-    PRUint32                    mPosition;
-};
-
-#endif // mozSqlResult_h

mozilla/extensions/sql/base/src/mozSqlService.cpp

@@ -1,624 +0,0 @@
-#include "nsReadableUtils.h"
-#include "nsXPIDLString.h"
-#include "nsCRT.h"
-#include "nsIAtom.h"
-#include "nsISupportsUtils.h"
-#include "nsIServiceManager.h"
-#include "rdf.h"
-#include "nsRDFCID.h"
-#include "nsAppDirectoryServiceDefs.h"
-#include "nsNetUtil.h"
-#include "nsIRDFXMLSink.h"
-#include "nsIWindowWatcher.h"
-#include "nsIPrompt.h"
-#include "mozSqlService.h"
-#include "mozSqlConnection.h"
-
-#define SQL_NAMESPACE_URI "http://www.mozilla.org/SQL-rdf#"
-
-static NS_DEFINE_CID(kRDFServiceCID,            NS_RDFSERVICE_CID);
-static NS_DEFINE_CID(kRDFContainerUtilsCID,     NS_RDFCONTAINERUTILS_CID);
-
-nsIRDFService*          mozSqlService::gRDFService;
-nsIRDFContainerUtils*   mozSqlService::gRDFContainerUtils;
-
-nsIRDFResource*         mozSqlService::kSQL_AliasesRoot;
-nsIRDFResource*         mozSqlService::kSQL_Name;
-nsIRDFResource*         mozSqlService::kSQL_Type;
-nsIRDFResource*         mozSqlService::kSQL_Hostname;
-nsIRDFResource*         mozSqlService::kSQL_Port;
-nsIRDFResource*         mozSqlService::kSQL_Database;
-
-
-mozSqlService::mozSqlService()
-  : mConnectionCache(nsnull)
-{
-  NS_INIT_ISUPPORTS();
-}
-
-mozSqlService::~mozSqlService()
-{
-  gRDFService->UnregisterDataSource(this);
-
-  delete mConnectionCache;
-
-  NS_IF_RELEASE(kSQL_AliasesRoot);
-  NS_IF_RELEASE(kSQL_Name);
-  NS_IF_RELEASE(kSQL_Type);
-  NS_IF_RELEASE(kSQL_Hostname);
-  NS_IF_RELEASE(kSQL_Port);
-  NS_IF_RELEASE(kSQL_Database);
-
-  nsServiceManager::ReleaseService(kRDFContainerUtilsCID, gRDFContainerUtils);
-  gRDFContainerUtils = nsnull;
-
-  nsServiceManager::ReleaseService(kRDFServiceCID, gRDFService);
-  gRDFService = nsnull;
-}
-
-NS_IMPL_ISUPPORTS3(mozSqlService,
-                   mozISqlService,
-                   nsIRDFDataSource,
-                   nsIRDFRemoteDataSource);
-
-NS_IMETHODIMP
-mozSqlService::GetErrorMessage(nsAString& aErrorMessage)
-{
-  aErrorMessage = mErrorMessage;
-  return NS_OK;
-}
-
-nsresult
-mozSqlService::Init()
-{
-  nsresult rv;
-
-  rv = nsServiceManager::GetService(kRDFServiceCID, NS_GET_IID(nsIRDFService), 
-                                    (nsISupports**) &gRDFService);
-  if (NS_FAILED(rv)) return rv;
-
-  rv = nsServiceManager::GetService(kRDFContainerUtilsCID, NS_GET_IID(nsIRDFContainerUtils),
-                                    (nsISupports**) &gRDFContainerUtils);
-
-  if (NS_FAILED(rv)) return rv;
-
-  gRDFService->GetResource(NS_LITERAL_CSTRING("SQL:AliasesRoot"),
-                           &kSQL_AliasesRoot);
-  gRDFService->GetResource(NS_LITERAL_CSTRING(SQL_NAMESPACE_URI "name"),
-                           &kSQL_Name);
-  gRDFService->GetResource(NS_LITERAL_CSTRING(SQL_NAMESPACE_URI "type"),
-                           &kSQL_Type);
-  gRDFService->GetResource(NS_LITERAL_CSTRING(SQL_NAMESPACE_URI "hostname"),
-                           &kSQL_Hostname);
-  gRDFService->GetResource(NS_LITERAL_CSTRING(SQL_NAMESPACE_URI "port"),
-                           &kSQL_Port);
-  gRDFService->GetResource(NS_LITERAL_CSTRING(SQL_NAMESPACE_URI "database"),
-                           &kSQL_Database);
-
-  nsCOMPtr<nsIFile> file;
-  rv = NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, getter_AddRefs(file));
-  if (NS_FAILED(rv)) return rv;
-  rv = file->AppendNative(NS_LITERAL_CSTRING("sql.rdf"));
-  if (NS_FAILED(rv)) return rv;
-
-  nsCAutoString sql;
-  NS_GetURLSpecFromFile(file, sql);
-
-  rv = gRDFService->GetDataSourceBlocking(sql.get(), getter_AddRefs(mInner));
-  if (NS_FAILED(rv)) return rv;
-  nsCOMPtr<nsIRDFXMLSink> sink = do_QueryInterface(mInner);
-  if (sink) {
-    nsCOMPtr<nsIAtom> prefix = getter_AddRefs(NS_NewAtom("SQL"));
-    sink->AddNameSpace(prefix, NS_ConvertASCIItoUCS2(SQL_NAMESPACE_URI));
-  }
-
-  return gRDFService->RegisterDataSource(this, PR_FALSE);
-}
-
-NS_IMETHODIMP
-mozSqlService::AddAlias(const nsACString& aURI,
-                        const nsAString& aName,
-                        const nsAString& aType,
-                        const nsAString& aHostname,
-                        PRInt32 aPort,
-                        const nsAString& aDatabase)
-{
-  nsCOMPtr<nsIRDFResource> resource;
-  gRDFService->GetResource(aURI, getter_AddRefs(resource));
-
-  nsCOMPtr<nsIRDFLiteral> rdfLiteral;
-  nsCOMPtr<nsIRDFInt> rdfInt;
-
-  gRDFService->GetLiteral(PromiseFlatString(aName).get(), getter_AddRefs(rdfLiteral));
-  mInner->Assert(resource, kSQL_Name, rdfLiteral, PR_TRUE);
-
-  gRDFService->GetLiteral(PromiseFlatString(aType).get(), getter_AddRefs(rdfLiteral));
-  mInner->Assert(resource, kSQL_Type, rdfLiteral, PR_TRUE);
-
-  gRDFService->GetLiteral(PromiseFlatString(aHostname).get(), getter_AddRefs(rdfLiteral));
-  mInner->Assert(resource, kSQL_Hostname, rdfLiteral, PR_TRUE);
-
-  gRDFService->GetIntLiteral(aPort, getter_AddRefs(rdfInt));
-  mInner->Assert(resource, kSQL_Port, rdfInt, PR_TRUE);
-
-  gRDFService->GetLiteral(PromiseFlatString(aDatabase).get(), getter_AddRefs(rdfLiteral));
-  mInner->Assert(resource, kSQL_Database, rdfLiteral, PR_TRUE);
-
-  nsresult rv = EnsureAliasesContainer();
-  if (NS_FAILED(rv))
-    return rv;
-  mAliasesContainer->AppendElement(resource);
-
-  Flush();
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-mozSqlService::HasAlias(const nsACString& aURI, PRBool* _retval)
-{
-  nsCOMPtr<nsIRDFResource> resource;
-  gRDFService->GetResource(aURI, getter_AddRefs(resource));
-
-  nsresult rv = EnsureAliasesContainer();
-  if (NS_FAILED(rv))
-    return rv;
-
-  PRInt32 aliasIndex;
-  mAliasesContainer->IndexOf(resource, &aliasIndex);
-
-  *_retval = aliasIndex != -1;
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-mozSqlService::GetAlias(const nsACString& aURI,
-                        nsAString& aName,
-                        nsAString& aType,
-                        nsAString& aHostname,
-                        PRInt32* aPort,
-                        nsAString& aDatabase)
-{
-  nsCOMPtr<nsIRDFResource> resource;
-  gRDFService->GetResource(aURI, getter_AddRefs(resource));
-
-  nsCOMPtr<nsIRDFNode> rdfNode;
-  nsCOMPtr<nsIRDFLiteral> rdfLiteral;
-  nsCOMPtr<nsIRDFInt> rdfInt;
-  const PRUnichar* value;
-  
-  mInner->GetTarget(resource, kSQL_Name, PR_TRUE, getter_AddRefs(rdfNode));
-  if (rdfNode) {
-    rdfLiteral = do_QueryInterface(rdfNode);
-    rdfLiteral->GetValueConst(&value);
-    aName.Assign(value);
-  }
-
-  mInner->GetTarget(resource, kSQL_Type, PR_TRUE, getter_AddRefs(rdfNode));
-  if (rdfNode) {
-    rdfLiteral = do_QueryInterface(rdfNode);
-    rdfLiteral->GetValueConst(&value);
-    aType.Assign(value);
-  }
-
-  mInner->GetTarget(resource, kSQL_Hostname, PR_TRUE, getter_AddRefs(rdfNode));
-  if (rdfNode) {
-    rdfLiteral = do_QueryInterface(rdfNode);
-    rdfLiteral->GetValueConst(&value);
-    aHostname.Assign(value);
-  }
-
-  mInner->GetTarget(resource, kSQL_Port, PR_TRUE, getter_AddRefs(rdfNode));
-  if (rdfNode) {
-    rdfInt = do_QueryInterface(rdfNode);
-    rdfInt->GetValue(aPort);
-  }
-
-  mInner->GetTarget(resource, kSQL_Database, PR_TRUE, getter_AddRefs(rdfNode));
-  if (rdfNode) {
-    rdfLiteral = do_QueryInterface(rdfNode);
-    rdfLiteral->GetValueConst(&value);
-    aDatabase.Assign(value);
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-mozSqlService::UpdateAlias(const nsACString& aURI,
-                           const nsAString& aName,
-                           const nsAString& aType,
-                           const nsAString& aHostname,
-                           PRInt32 aPort,
-                           const nsAString& aDatabase)
-{
-  nsCOMPtr<nsIRDFResource> resource;
-  gRDFService->GetResource(aURI, getter_AddRefs(resource));
-
-  nsCOMPtr<nsIRDFNode> rdfNode;
-  nsCOMPtr<nsIRDFLiteral> rdfLiteral;
-  nsCOMPtr<nsIRDFInt> rdfInt;
-
-  mInner->GetTarget(resource, kSQL_Name, PR_TRUE, getter_AddRefs(rdfNode));
-  gRDFService->GetLiteral(PromiseFlatString(aName).get(), getter_AddRefs(rdfLiteral));
-  mInner->Change(resource, kSQL_Name, rdfNode, rdfLiteral);
-
-  mInner->GetTarget(resource, kSQL_Type, PR_TRUE, getter_AddRefs(rdfNode));
-  gRDFService->GetLiteral(PromiseFlatString(aType).get(), getter_AddRefs(rdfLiteral));
-  mInner->Change(resource, kSQL_Type, rdfNode, rdfLiteral);
-
-  mInner->GetTarget(resource, kSQL_Hostname, PR_TRUE, getter_AddRefs(rdfNode));
-  gRDFService->GetLiteral(PromiseFlatString(aHostname).get(), getter_AddRefs(rdfLiteral));
-  mInner->Change(resource, kSQL_Hostname, rdfNode, rdfLiteral);
-
-  mInner->GetTarget(resource, kSQL_Port, PR_TRUE, getter_AddRefs(rdfNode));
-  gRDFService->GetIntLiteral(aPort, getter_AddRefs(rdfInt));
-  mInner->Change(resource, kSQL_Port, rdfNode, rdfInt);
-
-  mInner->GetTarget(resource, kSQL_Database, PR_TRUE, getter_AddRefs(rdfNode));
-  gRDFService->GetLiteral(PromiseFlatString(aDatabase).get(), getter_AddRefs(rdfLiteral));
-  mInner->Change(resource, kSQL_Database, rdfNode, rdfLiteral);
-
-  Flush();
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-mozSqlService::RemoveAlias(const nsACString &aURI)
-{
-  nsCOMPtr<nsIRDFResource> resource;
-  gRDFService->GetResource(aURI, getter_AddRefs(resource));
-
-  nsCOMPtr<nsIRDFNode> rdfNode;
-
-  mInner->GetTarget(resource, kSQL_Name, PR_TRUE, getter_AddRefs(rdfNode));
-  mInner->Unassert(resource, kSQL_Name, rdfNode);
-
-  mInner->GetTarget(resource, kSQL_Type, PR_TRUE, getter_AddRefs(rdfNode));
-  mInner->Unassert(resource, kSQL_Type, rdfNode);
-
-  mInner->GetTarget(resource, kSQL_Hostname, PR_TRUE, getter_AddRefs(rdfNode));
-  mInner->Unassert(resource, kSQL_Hostname, rdfNode);
-
-  mInner->GetTarget(resource, kSQL_Port, PR_TRUE, getter_AddRefs(rdfNode));
-  mInner->Unassert(resource, kSQL_Port, rdfNode);
-
-  mInner->GetTarget(resource, kSQL_Database, PR_TRUE, getter_AddRefs(rdfNode));
-  mInner->Unassert(resource, kSQL_Database, rdfNode);
-
-  nsresult rv = EnsureAliasesContainer();
-  if (NS_FAILED(rv))
-    return rv;
-  mAliasesContainer->RemoveElement(resource, PR_TRUE);
-
-  Flush();
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-mozSqlService::GetConnection(const nsACString &aURI, mozISqlConnection **_retval)
-{
-  nsCStringKey key(aURI);
-  nsCOMPtr<nsIWeakReference> weakRef;
-  nsCOMPtr<mozISqlConnection> conn;
-
-  if (mConnectionCache) {
-    weakRef = getter_AddRefs(NS_STATIC_CAST(nsIWeakReference*, mConnectionCache->Get(&key)));
-    if (weakRef) {
-      conn = do_QueryReferent(weakRef);
-      if (conn)
-        NS_ADDREF(*_retval = conn);
-    }
-  }
-
-  if (! *_retval) {
-    nsresult rv = GetNewConnection(aURI, getter_AddRefs(conn));
-    if (NS_FAILED(rv))
-      return rv;
-
-    weakRef = do_GetWeakReference(conn);
-
-    if (! mConnectionCache)
-      mConnectionCache = new nsSupportsHashtable(16);
-    mConnectionCache->Put(&key, weakRef);
-
-    NS_ADDREF(*_retval = conn);
-  }
-
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-mozSqlService::GetNewConnection(const nsACString &aURI, mozISqlConnection **_retval)
-{
-  PRBool hasAlias;
-  HasAlias(aURI, &hasAlias);
-  if (!hasAlias)
-    return NS_ERROR_FAILURE;
-
-  nsresult rv;
-
-  nsAutoString name;
-  nsAutoString type;
-  nsAutoString hostname;
-  PRInt32 port;
-  nsAutoString database;
-  GetAlias(aURI, name, type, hostname, &port, database);
-
-  nsCAutoString contractID(
-    NS_LITERAL_CSTRING("@mozilla.org/sql/connection;1?type=") +
-    NS_ConvertUCS2toUTF8(type));
-
-  nsCOMPtr<mozISqlConnection> conn = do_CreateInstance(contractID.get());
-  if (! conn)
-    return NS_ERROR_FAILURE;
-
-  nsCOMPtr<nsIWindowWatcher> watcher(do_GetService(NS_WINDOWWATCHER_CONTRACTID));
-  nsCOMPtr<nsIPrompt> prompter;
-  watcher->GetNewPrompter(0, getter_AddRefs(prompter));
-
-  PRBool retval;
-  do {
-    nsXPIDLString username;
-    nsXPIDLString password;
-    prompter->PromptUsernameAndPassword(
-      nsnull, // in wstring dialogTitle
-      nsnull, // in wstring text
-      getter_Copies(username),
-      getter_Copies(password),
-      nsnull, // in wstring checkMsg
-      nsnull, // inout boolean checkValue
-      &retval
-    );
-
-    if (retval) {
-      rv = conn->Init(hostname, port, database, username, password);
-      if (NS_FAILED(rv)) {
-        conn->GetErrorMessage(mErrorMessage);
-        prompter->Alert(nsnull, mErrorMessage.get());
-      }
-    }
-  } while(retval && NS_FAILED(rv));
-
-  NS_IF_ADDREF(*_retval = conn);
-
-  return rv;
-}
-
-NS_IMETHODIMP
-mozSqlService::GetURI(char** aURI)
-{
-  if (!aURI)
-    return NS_ERROR_NULL_POINTER;
-  
-  *aURI = nsCRT::strdup("rdf:sql");
-  if (!(*aURI))
-    return NS_ERROR_OUT_OF_MEMORY;
-  
-  return NS_OK;
-}
-
-NS_IMETHODIMP 
-mozSqlService::GetSource(nsIRDFResource* aProperty,
-                         nsIRDFNode* aTarget,
-                         PRBool aTruthValue,
-                         nsIRDFResource** aSource) 
-{
-  return mInner->GetSource(aProperty, aTarget, aTruthValue, aSource);
-}
-   
-NS_IMETHODIMP
-mozSqlService::GetSources(nsIRDFResource* aProperty,
-                          nsIRDFNode* aTarget,
-                          PRBool aTruthValue,
-                          nsISimpleEnumerator** aSources) {
-  return mInner->GetSources(aProperty, aTarget, aTruthValue, aSources);
-}
-   
-NS_IMETHODIMP
-mozSqlService::GetTarget(nsIRDFResource* aSource,
-                         nsIRDFResource* aProperty,
-                         PRBool aTruthValue,
-                         nsIRDFNode** aTarget) {
-  return mInner->GetTarget(aSource, aProperty, aTruthValue, aTarget);
-}
-   
-NS_IMETHODIMP
-mozSqlService::GetTargets(nsIRDFResource* aSource,
-                          nsIRDFResource* aProperty,
-                          PRBool aTruthValue,
-                          nsISimpleEnumerator** aTargets) {
-  return mInner->GetTargets(aSource, aProperty, aTruthValue, aTargets);
-}
-   
-NS_IMETHODIMP 
-mozSqlService::Assert(nsIRDFResource* aSource,
-                      nsIRDFResource* aProperty,
-                      nsIRDFNode* aTarget,
-                      PRBool aTruthValue) 
-{
-  return mInner->Assert(aSource, aProperty, aTarget, aTruthValue);
-}
-   
-NS_IMETHODIMP 
-mozSqlService::Unassert(nsIRDFResource* aSource,
-                        nsIRDFResource* aProperty,
-                        nsIRDFNode* aTarget) 
-{
-  return mInner->Unassert(aSource, aProperty, aTarget);
-}
-   
-NS_IMETHODIMP 
-mozSqlService::Change(nsIRDFResource* aSource,
-                      nsIRDFResource* aProperty,
-                      nsIRDFNode* aOldTarget,
-                      nsIRDFNode* aNewTarget) 
-{
-  return mInner->Change(aSource, aProperty, aOldTarget, aNewTarget);
-}
-   
-NS_IMETHODIMP 
-mozSqlService::Move(nsIRDFResource* aOldSource,
-                    nsIRDFResource* aNewSource,
-                    nsIRDFResource* aProperty,
-                    nsIRDFNode* aTarget) 
-{
-  return mInner->Move(aOldSource, aNewSource, aProperty, aTarget);
-}
-   
-NS_IMETHODIMP 
-mozSqlService::HasAssertion(nsIRDFResource* aSource,
-                            nsIRDFResource* aProperty,
-                            nsIRDFNode* aTarget,
-                            PRBool aTruthValue,
-                            PRBool* hasAssertion) 
-{
-  return mInner->HasAssertion(aSource, aProperty, aTarget, aTruthValue, hasAssertion);
-}
-   
-NS_IMETHODIMP 
-mozSqlService::AddObserver(nsIRDFObserver* aObserver) 
-{
-  return mInner->AddObserver(aObserver);
-}
-   
-NS_IMETHODIMP 
-mozSqlService::RemoveObserver(nsIRDFObserver* aObserver) 
-{
-  return mInner->RemoveObserver(aObserver);
-}
-   
-NS_IMETHODIMP 
-mozSqlService::HasArcIn(nsIRDFNode* aNode,
-                       nsIRDFResource* aArc,
-                       PRBool* _retval) 
-{
-  return mInner->HasArcIn(aNode, aArc, _retval);
-}
-
-NS_IMETHODIMP 
-mozSqlService::HasArcOut(nsIRDFResource* aSource,
-                         nsIRDFResource* aArc,
-                         PRBool* _retval) 
-{
-  return mInner->HasArcOut(aSource, aArc, _retval);
-}
-
-NS_IMETHODIMP 
-mozSqlService::ArcLabelsIn(nsIRDFNode* aNode,
-                           nsISimpleEnumerator** aLabels) 
-{
-  return mInner->ArcLabelsIn(aNode, aLabels);
-}
-
-NS_IMETHODIMP 
-mozSqlService::ArcLabelsOut(nsIRDFResource* aSource,
-                            nsISimpleEnumerator** aLabels) 
-{
-  return mInner->ArcLabelsIn(aSource, aLabels);
-}
-
-NS_IMETHODIMP 
-mozSqlService::GetAllResources(nsISimpleEnumerator** aResult) 
-{
-  return mInner->GetAllResources(aResult);
-}
-
-NS_IMETHODIMP 
-mozSqlService::GetAllCmds(nsIRDFResource* aSource,
-                          nsISimpleEnumerator** aCommands) 
-{
-  return mInner->GetAllCmds(aSource, aCommands);
-}
-
-NS_IMETHODIMP 
-mozSqlService::IsCommandEnabled(nsISupportsArray* aSources,
-                                nsIRDFResource* aCommand,
-                                nsISupportsArray* aArguments,
-                                PRBool* aResult) 
-{
-  return mInner->IsCommandEnabled(aSources, aCommand, aArguments, aResult);
-}
-
-NS_IMETHODIMP 
-mozSqlService::DoCommand(nsISupportsArray* aSources,
-                         nsIRDFResource* aCommand,
-                         nsISupportsArray* aArguments) 
-{
-  return mInner->DoCommand(aSources, aCommand, aArguments);
-}
-
-NS_IMETHODIMP 
-mozSqlService::BeginUpdateBatch()
-{
-  return mInner->BeginUpdateBatch();
-}
-
-NS_IMETHODIMP 
-mozSqlService::EndUpdateBatch()
-{
-  return mInner->EndUpdateBatch();
-}
-
-
-// nsIRDFRemoteDataSource
-NS_IMETHODIMP
-mozSqlService::GetLoaded(PRBool* aResult)
-{
-  nsCOMPtr<nsIRDFRemoteDataSource> remote(do_QueryInterface(mInner));
-  return remote->GetLoaded(aResult);
-}
-
-NS_IMETHODIMP
-mozSqlService::Init(const char* aURI)
-{
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-mozSqlService::Refresh(PRBool aBlocking)
-{
-  nsCOMPtr<nsIRDFRemoteDataSource> remote(do_QueryInterface(mInner));
-  return remote->Refresh(aBlocking);
-}
-
-NS_IMETHODIMP
-mozSqlService::Flush()
-{
-  nsCOMPtr<nsIRDFRemoteDataSource> remote(do_QueryInterface(mInner));
-  return remote->Flush();
-}
-
-NS_IMETHODIMP
-mozSqlService::FlushTo(const char *aURI)
-{
-  nsCOMPtr<nsIRDFRemoteDataSource> remote(do_QueryInterface(mInner));
-  return remote->FlushTo(aURI);
-}
-
-
-nsresult
-mozSqlService::EnsureAliasesContainer()
-{
-  if (! mAliasesContainer) {
-    PRBool isContainer;
-    nsresult rv = gRDFContainerUtils->IsContainer(mInner, kSQL_AliasesRoot, &isContainer);
-    if (NS_FAILED(rv)) return rv;
-
-    if (!isContainer) {
-      rv = gRDFContainerUtils->MakeSeq(mInner, kSQL_AliasesRoot, getter_AddRefs(mAliasesContainer));
-      if (NS_FAILED(rv)) return rv;
-    }
-    else {
-      mAliasesContainer = do_CreateInstance(NS_RDF_CONTRACTID "/container;1", &rv);
-      if (NS_FAILED(rv)) return rv;
-      rv = mAliasesContainer->Init(mInner, kSQL_AliasesRoot);
-      if (NS_FAILED(rv)) return rv;
-    }
-  }
-
-  return NS_OK;
-}

mozilla/extensions/sql/base/src/mozSqlService.h

@@ -1,52 +0,0 @@
-#ifndef mozSqlService_h
-#define mozSqlService_h
-
-#include "nsHashtable.h"
-#include "nsIRDFDataSource.h"
-#include "nsIRDFRemoteDataSource.h"
-#include "nsIRDFService.h"
-#include "nsIRDFContainerUtils.h"
-#include "mozISqlService.h"
-
-#define MOZ_SQLSERVICE_CLASSNAME "SQL service"
-#define MOZ_SQLSERVICE_CID \
-{0x1ceb35b7, 0xdaa8, 0x4ce4, {0xac, 0x67, 0x12, 0x5f, 0xb1, 0x7c, 0xb0, 0x19}}
-#define MOZ_SQLSERVICE_CONTRACTID "@mozilla.org/sql/service;1"
-#define MOZ_SQLDATASOURCE_CONTRACTID "@mozilla.org/rdf/datasource;1?name=sql"
-
-class mozSqlService : public mozISqlService,
-                      public nsIRDFDataSource,
-                      public nsIRDFRemoteDataSource
-{
-  public:
-    mozSqlService();
-    virtual ~mozSqlService();
-    nsresult Init();
-
-    NS_DECL_ISUPPORTS
-    NS_DECL_MOZISQLSERVICE
-    NS_DECL_NSIRDFDATASOURCE
-    NS_DECL_NSIRDFREMOTEDATASOURCE
-
-  protected:
-    nsresult EnsureAliasesContainer();
-
-  private:
-    static nsIRDFService*               gRDFService;
-    static nsIRDFContainerUtils*        gRDFContainerUtils;
-
-    static nsIRDFResource*              kSQL_AliasesRoot;
-    static nsIRDFResource*              kSQL_Name;
-    static nsIRDFResource*              kSQL_Type;
-    static nsIRDFResource*              kSQL_Hostname;
-    static nsIRDFResource*              kSQL_Port;
-    static nsIRDFResource*              kSQL_Database;
-	
-    nsString                            mErrorMessage;
-    nsCOMPtr<nsIRDFDataSource>          mInner;
-    nsCOMPtr<nsIRDFContainer>           mAliasesContainer;
-    nsSupportsHashtable*                mConnectionCache;
-
-};
-
-#endif /* mozSqlService_h */

mozilla/extensions/sql/build/Makefile.in

@@ -1,21 +0,0 @@
-DEPTH           = ../../..
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS            = \
-		src
-
-include $(topsrcdir)/config/rules.mk
-
-XPI_FILE = sql-$(shell date +%Y%m%d)-$(OS_ARCH).xpi
-
-xpi:
-	zip -j $(DIST)/$(XPI_FILE) $(srcdir)/install.js
-	cd $(DIST); zip -r $(XPI_FILE) \
-	bin/components/sql.xpt \
-	bin/components/sqlpgsql.xpt \
-	bin/components/$(LIB_PREFIX)sql$(DLL_SUFFIX) \
-	bin/chrome/sql.jar

mozilla/extensions/sql/build/install.js

@@ -1,58 +0,0 @@
-// this function verifies disk space in kilobytes
-function verifyDiskSpace(dirPath, spaceRequired)
-{
-  var spaceAvailable;
-
-  // Get the available disk space on the given path
-  spaceAvailable = fileGetDiskSpaceAvailable(dirPath);
-
-  // Convert the available disk space into kilobytes
-  spaceAvailable = parseInt(spaceAvailable / 1024);
-
-  // do the verification
-  if(spaceAvailable < spaceRequired)
-  {
-    logComment("Insufficient disk space: " + dirPath);
-    logComment("  required : " + spaceRequired + " K");
-    logComment("  available: " + spaceAvailable + " K");
-    return(false);
-  }
-
-  return(true);
-}
-
-var srDest = 200;
-
-var err = initInstall("SQL Support", "SQL", "0.1"); 
-logComment("initInstall: " + err);
-
-var fProgram = getFolder("Program");
-logComment("fProgram: " + fProgram);
-
-if (verifyDiskSpace(fProgram, srDest))
-{
-  err = addDirectory("Program", "0.1", "bin", fProgram, "", true);
-
-  logComment("addDirectory() returned: " + err);
-
-  var chromeFolder = getFolder("Chrome", "sql.jar");
-  registerChrome(CONTENT | DELAYED_CHROME, chromeFolder, "content/sql/");
-  registerChrome(LOCALE | DELAYED_CHROME, chromeFolder, "locale/en-US/sql/");
-
-  err = getLastError();
-  if (err == ACCESS_DENIED) {
-    alert("Unable to write to program directory " + fProgram + ".\n You will need to restart the browser with administrator/root privileges to install this software. After installing as root (or administrator), you will need to restart the browser one more time to register the installed software.\n After the second restart, you can go back to running the browser without privileges!");
-    cancelInstall(err);
-    logComment("cancelInstall() due to error: " + err);
-  }
-  else if (err != SUCCESS) {
-    cancelInstall(err);
-    logComment("cancelInstall() due to error: " + err);
-  }
-  else {
-    performInstall(); 
-    logComment("performInstall() returned: " + err);
-  }
-}
-else
-  cancelInstall(INSUFFICIENT_DISK_SPACE);

mozilla/extensions/sql/build/src/Makefile.in

@@ -1,40 +0,0 @@
-DEPTH			= ../../../..
-topsrcdir		= @top_srcdir@
-srcdir			= @srcdir@
-VPATH			= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE			= sql
-MODULE_NAME    		= sqlModule
-LIBRARY_NAME		= sql
-SHORT_LIBNAME		= sql
-EXPORT_LIBRARY  	= 1
-IS_COMPONENT		= 1
-REQUIRES		= xpcom \
-		  	  string \
-		  	  rdf \
-			  $(NULL)
-
-CPPSRCS			= \
-  		  	  mozSqlModule.cpp
-
-SHARED_LIBRARY_LIBS	= \
-		 	  $(DIST)/lib/$(LIB_PREFIX)sqlbase_s.$(LIB_SUFFIX)
-
-EXTRA_DSO_LDOPTS	= \
-			  $(MOZ_COMPONENT_LIBS) \
-			  $(MOZ_UNICHARUTIL_LIBS) \
-    			  $(NULL)
-
-ifdef MOZ_ENABLE_PGSQL
-DEFINES             	+= -DMOZ_ENABLE_PGSQL
-SHARED_LIBRARY_LIBS 	+= $(DIST)/lib/$(LIB_PREFIX)sqlpgsql_s.$(LIB_SUFFIX)
-EXTRA_DSO_LDOPTS    	+= -L$(MOZ_PGSQL_LIBS) -lpq
-endif
-
-include $(topsrcdir)/config/rules.mk
-
-ifdef MOZ_ENABLE_PGSQL
-INCLUDES		+= -I$(MOZ_PGSQL_INCLUDES)
-endif

mozilla/extensions/sql/build/src/mozSqlModule.cpp

@@ -1,33 +0,0 @@
-#include "nsIGenericFactory.h"
-#include "mozSqlService.h"
-#ifdef MOZ_ENABLE_PGSQL
-#include "mozSqlConnectionPgsql.h"
-#endif
-
-NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(mozSqlService, Init)
-#ifdef MOZ_ENABLE_PGSQL
-NS_GENERIC_FACTORY_CONSTRUCTOR(mozSqlConnectionPgsql)
-#endif
-
-static nsModuleComponentInfo components[] =
-{
-  { MOZ_SQLSERVICE_CLASSNAME,
-    MOZ_SQLSERVICE_CID,
-    MOZ_SQLSERVICE_CONTRACTID,
-    mozSqlServiceConstructor
-  },
-  { MOZ_SQLSERVICE_CLASSNAME,
-    MOZ_SQLSERVICE_CID,
-    MOZ_SQLDATASOURCE_CONTRACTID,
-    mozSqlServiceConstructor
-  },
-#ifdef MOZ_ENABLE_PGSQL
-  { MOZ_SQLCONNECTIONPGSQL_CLASSNAME,
-    MOZ_SQLCONNECTIONPGSQL_CID,
-    MOZ_SQLCONNECTIONPGSQL_CONTRACTID,
-    mozSqlConnectionPgsqlConstructor
-  }
-#endif
-};
-
-NS_IMPL_NSGETMODULE("sql", components)

mozilla/extensions/sql/pgsql/Makefile.in

@@ -1,10 +0,0 @@
-DEPTH           = ../../..
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-
-DIRS            = \
-		  public \
-		  src
-
-include $(topsrcdir)/config/rules.mk

mozilla/extensions/sql/pgsql/public/Makefile.in

@@ -1,14 +0,0 @@
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-MODULE		= sql
-XPIDL_MODULE	= sqlpgsql
-
-XPIDLSRCS	= \
-		mozISqlConnectionPgsql.idl \
-		mozISqlResultPgsql.idl \
-		$(NULL)
-
-include $(topsrcdir)/config/rules.mk

mozilla/extensions/sql/pgsql/public/mozISqlConnectionPgsql.idl

@@ -1,8 +0,0 @@
-#include "nsISupports.idl"
-
-[scriptable, uuid(0cf1eefe-611d-48fa-ae27-0a6f40d6a33e)]
-
-interface mozISqlConnectionPgsql : nsISupports
-{
-
-};

mozilla/extensions/sql/pgsql/public/mozISqlResultPgsql.idl

@@ -1,8 +0,0 @@
-#include "nsISupports.idl"
-
-[scriptable, uuid(f6573169-286d-4a20-8253-9abb07bdba29)]
-
-interface mozISqlResultPgsql : nsISupports
-{
-
-};

mozilla/extensions/sql/pgsql/src/Makefile.in

@@ -1,28 +0,0 @@
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-MODULE		= sql
-LIBRARY_NAME	= sqlpgsql_s
-REQUIRES	= xpcom \
-		  string \
-		  locale \
-		  rdf \
-		  $(NULL)
-
-CPPSRCS		= \
-		mozSqlConnectionPgsql.cpp \
-		mozSqlResultPgsql.cpp
-
-EXPORTS		= \
-		mozSqlConnectionPgsql.h \
-		mozSqlResultPgsql.h
-
-FORCE_STATIC_LIB=1
-
-include $(topsrcdir)/config/rules.mk
-
-INCLUDES	+= -I$(MOZ_PGSQL_INCLUDES)

mozilla/extensions/sql/pgsql/src/mozSqlConnectionPgsql.cpp

@@ -1,240 +0,0 @@
-#include "prprf.h"
-#include "mozSqlConnectionPgsql.h"
-#include "mozSqlResultPgsql.h"
-
-mozSqlConnectionPgsql::mozSqlConnectionPgsql()
-  : mConnection(nsnull)
-{
-}
-
-mozSqlConnectionPgsql::~mozSqlConnectionPgsql()
-{
-  if (mConnection)
-    PQfinish(mConnection);
-}
-
-NS_IMPL_ADDREF_INHERITED(mozSqlConnectionPgsql, mozSqlConnection)
-NS_IMPL_RELEASE_INHERITED(mozSqlConnectionPgsql, mozSqlConnection)
-
-// QueryInterface
-NS_INTERFACE_MAP_BEGIN(mozSqlConnectionPgsql)
-  NS_INTERFACE_MAP_ENTRY(mozISqlConnectionPgsql)
-NS_INTERFACE_MAP_END_INHERITING(mozSqlConnection)
-
-NS_IMETHODIMP
-mozSqlConnectionPgsql::Init(const nsAString & aHost, PRInt32 aPort,
-                            const nsAString & aDatabase, const nsAString & aUsername,
-                            const nsAString & aPassword)
-{
-  if (mConnection)
-    return NS_OK;
-
-  if (aPort == -1)
-    aPort = 5432;
-  char port[11];
-  char options[] = "";
-  char tty[] = "";
-  PR_snprintf(port, 11, "%d", aPort);
-
-  mConnection = PQsetdbLogin(NS_ConvertUCS2toUTF8(aHost).get(),
-                             port, options, tty,
-                             NS_ConvertUCS2toUTF8(aDatabase).get(),
-                             NS_ConvertUCS2toUTF8(aUsername).get(),
-                             NS_ConvertUCS2toUTF8(aPassword).get());
-
-  return Setup();
-}
-
-NS_IMETHODIMP
-mozSqlConnectionPgsql::GetPrimaryKeys(const nsAString& aSchema, const nsAString& aTable, mozISqlResult** _retval)
-{
-  nsAutoString select;
-  nsAutoString from;
-  nsAutoString where;
-  if (mVersion >= SERVER_VERSION(7,3,0)) {
-    select = NS_LITERAL_STRING("SELECT n.nspname AS TABLE_SCHEM, ");
-    from = NS_LITERAL_STRING(" FROM pg_catalog.pg_namespace n, pg_catalog.pg_class ct, pg_catalog.pg_class ci, pg_catalog.pg_attribute a, pg_catalog.pg_index i");
-    where = NS_LITERAL_STRING(" AND ct.relnamespace = n.oid ");
-    if (!aSchema.IsEmpty()) {
-      where.Append(NS_LITERAL_STRING(" AND n.nspname = '") + aSchema);
-      where.Append(PRUnichar('\''));
-    }
-  }
-  else {
-    select = NS_LITERAL_STRING("SELECT NULL AS TABLE_SCHEM, ");
-    from = NS_LITERAL_STRING(" FROM pg_class ct, pg_class ci, pg_attribute a, pg_index i ");
-  }
-
-  if (!aTable.IsEmpty()) {
-    where.Append(NS_LITERAL_STRING(" AND ct.relname = '") + aTable);
-    where.Append(PRUnichar('\''));
-  }
-
-  NS_NAMED_LITERAL_STRING(select2, " ct.relname AS TABLE_NAME, a.attname AS COLUMN_NAME, a.attnum AS KEY_SEQ, ci.relname AS PK_NAME ");
-  NS_NAMED_LITERAL_STRING(where2, " WHERE ct.oid=i.indrelid AND ci.oid=i.indexrelid AND a.attrelid=ci.oid AND i.indisprimary ");
-  NS_NAMED_LITERAL_STRING(order2, " ORDER BY table_name, pk_name, key_seq");
-
-  return RealExec(select + select2 + from + where2 + where + order2, _retval, nsnull);
-}
-
-nsresult
-mozSqlConnectionPgsql::Setup()
-{
-  if (PQstatus(mConnection) == CONNECTION_BAD) {
-    mErrorMessage.Assign(NS_ConvertUTF8toUCS2(PQerrorMessage(mConnection)));
-    mConnection = nsnull;
-    return NS_ERROR_FAILURE;
-  }
-
-  PQsetClientEncoding(mConnection, "UNICODE");
-
-/*
-  PGresult* result = PQexec(mConnection, "SET DATESTYLE TO US");
-  PRInt32 stat = PQresultStatus(result);
-  if (stat != PGRES_COMMAND_OK) {
-    mErrorMessage.Assign(NS_ConvertUTF8toUCS2(PQresultErrorMessage(result)));
-    PQfinish(mConnection);
-    mConnection = nsnull;
-    return NS_ERROR_FAILURE;
-  }
-*/
-
-  PGresult* result = PQexec(mConnection, "select version()");
-  PRInt32 stat = PQresultStatus(result);
-  if (stat != PGRES_TUPLES_OK) {
-    mErrorMessage.Assign(NS_ConvertUTF8toUCS2(PQresultErrorMessage(result)));
-    return NS_ERROR_FAILURE;
-  }
-  char* version = PQgetvalue(result, 0, 0);
-  NS_ConvertUTF8toUCS2 buffer(version);
-  nsAString::const_iterator start, end, iter;
-  buffer.BeginReading(iter);
-  buffer.EndReading(end);
-  while (iter != end && !nsCRT::IsAsciiSpace(*iter))
-    ++iter;
-  while (iter != end && nsCRT::IsAsciiSpace(*iter))
-    ++iter;
-  start = iter;
-  while (iter != end && !nsCRT::IsAsciiSpace(*iter))
-    ++iter;
-  mServerVersion = Substring(start,iter);
-
-  PRInt32 numbers[3] = {0,0,0};
-  mServerVersion.BeginReading(iter);
-  mServerVersion.EndReading(end);
-  for (PRInt32 i = 0; i < 3; i++) {
-    start = iter;
-    while (iter != end && *iter != PRUnichar('.'))
-      ++iter;
-    nsAutoString v(Substring(start,iter));
-    PRInt32 err;
-    numbers[i] = v.ToInteger(&err);
-    while (iter != end && *iter == PRUnichar('.'))
-      ++iter;
-  }
-  mVersion = SERVER_VERSION(numbers[0], numbers[1], numbers[2]);
-
-  return NS_OK;
-}
-
-nsresult
-mozSqlConnectionPgsql::RealExec(const nsAString& aQuery,
-                                mozISqlResult** aResult, PRInt32* aAffectedRows)
-{
-  if (! mConnection)
-    return NS_ERROR_NOT_INITIALIZED;
-
-  PGresult* r;
-  r = PQexec(mConnection, NS_ConvertUCS2toUTF8(aQuery).get());
-  PRInt32 stat = PQresultStatus(r);
-
-  if (PQstatus(mConnection) == CONNECTION_BAD) {
-    PQreset(mConnection);
-    nsresult rv = Setup();
-    if (NS_FAILED(rv))
-      return rv;
-    r = PQexec(mConnection, NS_ConvertUCS2toUTF8(aQuery).get());
-    stat = PQresultStatus(r);
-  }
-
-  if (stat == PGRES_TUPLES_OK) {
-    if (!aResult)
-      return NS_ERROR_NULL_POINTER;
-
-    static char select1[] = "select t.oid, case when t.typbasetype = 0 then t.typname else (select t2.typname from pg_type t2 where t2.oid=t.typbasetype) end as typname from pg_type t where t.oid in (";
-    static char select2[] = "select oid, typname from pg_type where oid in (";
-    char* select;
-    if (mVersion >= SERVER_VERSION(7,3,0))
-      select = select1;
-    else
-      select = select2;
-    PRInt32 columnCount = PQnfields(r);
-    char* query = (char*)malloc(strlen(select) + columnCount * 11 + 2);
-    strcpy(query, select);
-    for (PRInt32 i = 0; i < columnCount; i++) {
-      PRInt32 oid = PQftype(r, i);
-      char oidStr[11];
-      if (i)
-        sprintf(oidStr, ",%d", oid);
-      else
-        sprintf(oidStr, "%d", oid);
-      strcat(query, oidStr);
-    }
-    strcat(query, ")");
-    PGresult* types = PQexec(mConnection, query);
-    free(query);
-    stat = PQresultStatus(types);
-    if (stat != PGRES_TUPLES_OK) {
-      mErrorMessage.Assign(NS_ConvertUTF8toUCS2(PQresultErrorMessage(types)));
-      return NS_ERROR_FAILURE;
-    }
-
-    if (*aResult) {
-      ((mozSqlResultPgsql*)*aResult)->SetResult(r, types);
-      nsresult rv = ((mozSqlResult*)*aResult)->Rebuild();
-      if (NS_FAILED(rv))
-        return rv;
-      NS_ADDREF(*aResult);
-    }
-    else {
-      mozSqlResult* result = new mozSqlResultPgsql(this, aQuery);
-      if (! result)
-        return NS_ERROR_OUT_OF_MEMORY;
-      ((mozSqlResultPgsql*)result)->SetResult(r, types);
-      nsresult rv = result->Init();
-      if (NS_FAILED(rv))
-        return rv;
-      NS_ADDREF(*aResult = result);
-    }
-  }
-  else if (stat == PGRES_COMMAND_OK) {
-    if (!aAffectedRows)
-      return NS_ERROR_NULL_POINTER;
-    PR_sscanf(PQcmdTuples(r), "%d", aAffectedRows);
-    mLastID = PQoidValue(r);
-  }
-  else {
-    mErrorMessage.Assign(NS_ConvertUTF8toUCS2(PQresultErrorMessage(r)));
-    return NS_ERROR_FAILURE;
-  }
-
-  return NS_OK;
-}
-
-nsresult
-mozSqlConnectionPgsql::CancelExec()
-{
-  if (!PQrequestCancel(mConnection)) {
-    mErrorMessage.Assign(NS_ConvertUTF8toUCS2(PQerrorMessage(mConnection)));
-    return NS_ERROR_FAILURE;
-  }
-
-  return NS_OK;
-}
-
-nsresult
-mozSqlConnectionPgsql::GetIDName(nsAString& aIDName)
-{
-  aIDName = NS_LITERAL_STRING("OID");
-  return NS_OK;
-}

mozilla/extensions/sql/pgsql/src/mozSqlConnectionPgsql.h

@@ -1,47 +0,0 @@
-#ifndef mozSqlConnectionPgsql_h
-#define mozSqlConnectionPgsql_h                                                  
-
-#include "libpq-fe.h"
-#include "mozSqlConnection.h"
-#include "mozISqlConnectionPgsql.h"
-
-#define MOZ_SQLCONNECTIONPGSQL_CLASSNAME "PosgreSQL SQL Connection"
-#define MOZ_SQLCONNECTIONPGSQL_CID \
-{0x0cf1eefe, 0x611d, 0x48fa, {0xae, 0x27, 0x0a, 0x6f, 0x40, 0xd6, 0xa3, 0x3e }}
-#define MOZ_SQLCONNECTIONPGSQL_CONTRACTID "@mozilla.org/sql/connection;1?type=pgsql"
-
-#define SERVER_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-
-class mozSqlConnectionPgsql : public mozSqlConnection,
-                              public mozISqlConnectionPgsql
-{
-  public:
-    mozSqlConnectionPgsql();
-    virtual ~mozSqlConnectionPgsql();
-
-    NS_DECL_ISUPPORTS
-
-    NS_IMETHOD Init(const nsAString& aHost, PRInt32 aPort,
-                    const nsAString& aDatabase, const nsAString& aUsername,
-		    const nsAString& aPassword);
-
-    NS_IMETHOD GetPrimaryKeys(const nsAString& aSchema, const nsAString& aTable, mozISqlResult** _retval);
-
-    NS_DECL_MOZISQLCONNECTIONPGSQL
-
-  protected:
-    nsresult Setup();
-
-    virtual nsresult RealExec(const nsAString& aQuery,
-                              mozISqlResult** aResult, PRInt32* aAffectedRows);
-
-    virtual nsresult CancelExec();
-
-    virtual nsresult GetIDName(nsAString& aIDName);
-
-  private:
-    PGconn*             mConnection;
-    PRInt32             mVersion;
-};
-
-#endif // mozSqlConnectionPgsql_h

mozilla/extensions/sql/pgsql/src/mozSqlResultPgsql.cpp

@@ -1,235 +0,0 @@
-
-#include "prprf.h"
-#include "nsReadableUtils.h"
-#include "mozSqlResultPgsql.h"
-
-mozSqlResultPgsql::mozSqlResultPgsql(mozISqlConnection* aConnection,
-                                     const nsAString& aQuery)
-  : mozSqlResult(aConnection, aQuery),
-    mResult(nsnull),
-    mTypes(nsnull)
-{
-}
-
-void
-mozSqlResultPgsql::SetResult(PGresult* aResult,
-                             PGresult* aTypes)
-{
-  mResult = aResult;
-  mTypes = aTypes;
-}
-
-mozSqlResultPgsql::~mozSqlResultPgsql()
-{
-  ClearNativeResult();
-}
-
-NS_IMPL_ADDREF_INHERITED(mozSqlResultPgsql, mozSqlResult)
-NS_IMPL_RELEASE_INHERITED(mozSqlResultPgsql, mozSqlResult)
-
-// QueryInterface
-NS_INTERFACE_MAP_BEGIN(mozSqlResultPgsql)
-  NS_INTERFACE_MAP_ENTRY(mozISqlResultPgsql)
-NS_INTERFACE_MAP_END_INHERITING(mozSqlResult)
-
-PRInt32
-mozSqlResultPgsql::GetColType(PRInt32 aColumnIndex)
-{
-  PRInt32 oid = PQftype(mResult, aColumnIndex);
-
-  for (PRInt32 i = 0; i < PQntuples(mTypes); i++) {
-    char* value = PQgetvalue(mTypes, i, 0);
-    PRInt32 o;
-    PR_sscanf(value, "%d", &o);
-    if (o == oid) {
-      char* type = PQgetvalue(mTypes, i, 1);
-      if (! strcmp(type, "int2"))
-        return mozISqlResult::TYPE_INT;
-      else if (! strcmp(type, "int4"))
-        return mozISqlResult::TYPE_INT;
-      else if (! strcmp(type, "float4"))
-        return mozISqlResult::TYPE_STRING;
-      else if (! strcmp(type, "numeric"))
-        return mozISqlResult::TYPE_STRING;
-      else if (! strcmp(type, "date"))
-        return mozISqlResult::TYPE_STRING;
-      else if (! strcmp(type, "time"))
-        return mozISqlResult::TYPE_STRING;
-      else if (! strcmp(type, "timestamp"))
-        return mozISqlResult::TYPE_STRING;
-      else if (! strcmp(type, "bool"))
-        return mozISqlResult::TYPE_BOOL;
-      else
-        return mozISqlResult::TYPE_STRING;
-    }
-  }
-
-  return mozISqlResult::TYPE_STRING;
-}
-
-nsresult
-mozSqlResultPgsql::BuildColumnInfo()
-{
-  for (PRInt32 i = 0; i < PQnfields(mResult); i++) {
-    char* n = PQfname(mResult, i);
-    PRUnichar* name = ToNewUnicode(NS_ConvertUTF8toUCS2(n));
-    PRInt32 type = GetColType(i);
-    PRInt32 size = PQfsize(mResult, i);
-    PRInt32 mod = PQfmod(mResult, i);
-
-    nsCAutoString uri(NS_LITERAL_CSTRING("http://www.mozilla.org/SQL-rdf#"));
-    uri.Append(n);
-    nsCOMPtr<nsIRDFResource> property;
-    gRDFService->GetResource(uri, getter_AddRefs(property));
-
-    ColumnInfo* columnInfo = ColumnInfo::Create(mAllocator, name, type, size, mod, property);
-    mColumnInfo.AppendElement(columnInfo); 
-  }
-
-  return NS_OK;
-}
-
-nsresult
-mozSqlResultPgsql::BuildRows()
-{
-  for(PRInt32 i = 0; i < PQntuples(mResult); i++) {
-    nsCOMPtr<nsIRDFResource> resource;
-    nsresult rv = gRDFService->GetAnonymousResource(getter_AddRefs(resource));
-    if (NS_FAILED(rv)) return rv;
-
-    Row* row = Row::Create(mAllocator, resource, mColumnInfo);
-
-    for (PRInt32 j = 0; j < mColumnInfo.Count(); j++) {
-      if (! PQgetisnull(mResult, i, j)) {
-        char* value = PQgetvalue(mResult, i, j);
-        Cell* cell = row->mCells[j];
-        cell->SetNull(PR_FALSE);
-        PRInt32 type = cell->GetType();
-        if (type == mozISqlResult::TYPE_STRING)
-          cell->SetString(ToNewUnicode(NS_ConvertUTF8toUCS2(value)));
-        else if (type == mozISqlResult::TYPE_INT)
-          PR_sscanf(value, "%d", &cell->mInt);
-        else if (type == mozISqlResult::TYPE_FLOAT)
-          PR_sscanf(value, "%f", &cell->mFloat);
-        else if (type == mozISqlResult::TYPE_DECIMAL)
-          PR_sscanf(value, "%f", &cell->mFloat);
-        else if (type == mozISqlResult::TYPE_DATE ||
-                 type == mozISqlResult::TYPE_TIME ||
-                 type == mozISqlResult::TYPE_DATETIME)
-          PR_ParseTimeString(value, PR_FALSE, &cell->mDate);
-        else if (type == mozISqlResult::TYPE_BOOL)
-          cell->mBool = !strcmp(value, "t");
-      }
-    }
-
-    mRows.AppendElement(row);
-    nsVoidKey key(resource);
-    mSources.Put(&key, row);
-  }
-
-  return NS_OK;
-}
-
-void
-mozSqlResultPgsql::ClearNativeResult()
-{
-  if (mResult) {
-    PQclear(mResult);
-    mResult = nsnull;
-  }
-  if (mTypes) {
-    PQclear(mTypes);
-    mTypes = nsnull;
-  }
-}
-
-nsresult
-mozSqlResultPgsql::EnsureTablePrivileges()
-{
-  nsresult rv = EnsureTableName();
-  if (NS_FAILED(rv))
-    return rv;
-
-  NS_NAMED_LITERAL_STRING(select, "select ");
-  NS_NAMED_LITERAL_STRING(func, "has_table_privilege(SESSION_USER, '");
-  NS_NAMED_LITERAL_STRING(comma, ", ");
-  NS_NAMED_LITERAL_STRING(ins, "', 'INSERT')");
-  NS_NAMED_LITERAL_STRING(upd, "', 'UPDATE')");
-  NS_NAMED_LITERAL_STRING(del, "','DELETE')");
-
-  nsCOMPtr<mozISqlResult> result;
-  rv = mConnection->ExecuteQuery(
-    select + func + mTableName + ins +
-    comma + func + mTableName + upd +
-    comma + func + mTableName + del,
-    getter_AddRefs(result));
-  if (NS_FAILED(rv)) {
-    mConnection->GetErrorMessage(mErrorMessage);
-    return rv;
-  }
-
-  nsCOMPtr<mozISqlResultEnumerator> enumerator;
-  rv = result->Enumerate(getter_AddRefs(enumerator));
-  if (NS_FAILED(rv))
-    return rv;
-
-  rv = enumerator->First();
-  if (NS_FAILED(rv))
-    return rv;
-
-  rv = enumerator->GetBool(0, &mCanInsert);
-  if (NS_FAILED(rv))
-    return rv;
-  rv = enumerator->GetBool(1, &mCanUpdate);
-  if (NS_FAILED(rv))
-    return rv;
-  return enumerator->GetBool(2, &mCanDelete);
-}
-
-nsresult
-mozSqlResultPgsql::CanInsert(PRBool* _retval)
-{
-  if (mCanInsert >= 0) {
-    *_retval = mCanInsert;
-    return NS_OK;
-  }
-
-  nsresult rv = EnsureTablePrivileges();
-  if (NS_FAILED(rv))
-    return rv;
-  *_retval = mCanInsert;
-
-  return NS_OK;
-}
-
-nsresult
-mozSqlResultPgsql::CanUpdate(PRBool* _retval)
-{
-  if (mCanUpdate >= 0) {
-    *_retval = mCanUpdate;
-    return NS_OK;
-  }
-
-  nsresult rv = EnsureTablePrivileges();
-  if (NS_FAILED(rv))
-    return rv;
-  *_retval = mCanUpdate;
-
-  return NS_OK;
-}
-
-nsresult
-mozSqlResultPgsql::CanDelete(PRBool* _retval)
-{
-  if (mCanDelete >= 0) {
-    *_retval = mCanDelete;
-    return NS_OK;
-  }
-
-  nsresult rv = EnsureTablePrivileges();
-  if (NS_FAILED(rv))
-    return rv;
-  *_retval = mCanDelete;
-
-  return NS_OK;
-}

mozilla/extensions/sql/pgsql/src/mozSqlResultPgsql.h

@@ -1,39 +0,0 @@
-#ifndef mozSqlResultPgsql_h
-#define mozSqlResultPgsql_h                                                  
-
-#include "libpq-fe.h"
-#include "mozSqlResult.h"
-#include "mozISqlResultPgsql.h"
-
-class mozSqlResultPgsql : public mozSqlResult,
-                          public mozISqlResultPgsql
-{
-  public:
-    mozSqlResultPgsql(mozISqlConnection* aConnection,
-                      const nsAString& aQuery);
-    void SetResult(PGresult* aResult,
-                   PGresult* aTypes);
-    virtual ~mozSqlResultPgsql();
-
-    NS_DECL_ISUPPORTS
-
-    NS_DECL_MOZISQLRESULTPGSQL 
-
-  protected:
-    PRInt32 GetColType(PRInt32 aColumnIndex);
-
-    virtual nsresult BuildColumnInfo();
-    virtual nsresult BuildRows();
-    virtual void ClearNativeResult();
-
-    nsresult EnsureTablePrivileges();
-    virtual nsresult CanInsert(PRBool* _retval);
-    virtual nsresult CanUpdate(PRBool* _retval);
-    virtual nsresult CanDelete(PRBool* _retval);
-
-  private:
-    PGresult*   mResult;
-    PGresult*   mTypes;
-};
-
-#endif // mozSqlResultPgsql_h

mozilla/extensions/sql/sqltest/Makefile.in

@@ -1,15 +0,0 @@
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-include $(topsrcdir)/config/rules.mk
-
-XPI_FILE = sqltest-$(shell date +%Y%m%d).xpi
-
-xpi:
-	zip -j $(DIST)/$(XPI_FILE) $(srcdir)/install.js
-	cd $(DIST); zip -r $(XPI_FILE) \
-	bin/chrome/sqltest.jar

mozilla/extensions/sql/sqltest/contents.rdf

@@ -1,17 +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:sqltest"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:package:sqltest"
-        chrome:displayName="SQL test"
-        chrome:author="mozilla.org"
-        chrome:name="sqltest">
-  </RDF:Description>
-
-</RDF:RDF>

mozilla/extensions/sql/sqltest/install.js

@@ -1,57 +0,0 @@
-// this function verifies disk space in kilobytes
-function verifyDiskSpace(dirPath, spaceRequired)
-{
-  var spaceAvailable;
-
-  // Get the available disk space on the given path
-  spaceAvailable = fileGetDiskSpaceAvailable(dirPath);
-
-  // Convert the available disk space into kilobytes
-  spaceAvailable = parseInt(spaceAvailable / 1024);
-
-  // do the verification
-  if(spaceAvailable < spaceRequired)
-  {
-    logComment("Insufficient disk space: " + dirPath);
-    logComment("  required : " + spaceRequired + " K");
-    logComment("  available: " + spaceAvailable + " K");
-    return(false);
-  }
-
-  return(true);
-}
-
-var srDest = 100;
-
-var err = initInstall("SQL test", "SQLTEST", "0.1"); 
-logComment("initInstall: " + err);
-
-var fProgram = getFolder("Program");
-logComment("fProgram: " + fProgram);
-
-if (verifyDiskSpace(fProgram, srDest))
-{
-  err = addDirectory("Program", "0.1", "bin", fProgram, "", true);
-
-  logComment("addDirectory() returned: " + err);
-
-  var chromeFolder = getFolder("Chrome", "sqltest.jar");
-  registerChrome(CONTENT | DELAYED_CHROME, chromeFolder, "content/sqltest/");
-
-  err = getLastError();
-  if (err == ACCESS_DENIED) {
-    alert("Unable to write to program directory " + fProgram + ".\n You will need to restart the browser with administrator/root privileges to install this software. After installing as root (or administrator), you will need to restart the browser one more time to register the installed software.\n After the second restart, you can go back to running the browser without privileges!");
-    cancelInstall(err);
-    logComment("cancelInstall() due to error: " + err);
-  }
-  else if (err != SUCCESS) {
-    cancelInstall(err);
-    logComment("cancelInstall() due to error: " + err);
-  }
-  else {
-    performInstall(); 
-    logComment("performInstall() returned: " + err);
-  }
-}
-else
-  cancelInstall(INSUFFICIENT_DISK_SPACE);

mozilla/extensions/sql/sqltest/jar.mn

@@ -1,7 +0,0 @@
-sqltest.jar:
-    content/sqltest/contents.rdf			(contents.rdf)
-    content/sqltest/sqltest.xul				(sqltest.xul)
-    content/sqltest/sqltest.js				(sqltest.js)
-    content/sqltest/sqltest.css				(sqltest.css)
-    content/sqltest/sqltestDialog.xul			(sqltestDialog.xul)
-    content/sqltest/sqltestDialog.js			(sqltestDialog.js)

mozilla/extensions/sql/sqltest/sqltest.css

@@ -1,8 +0,0 @@
-treechildren:-moz-tree-cell {
-  border-right: 1px solid ThreeDFace;
-  border-bottom: 1px solid ThreeDFace;
-}
-
-.spacer {
-  height: 10px;
-}

mozilla/extensions/sql/sqltest/sqltest.js

@@ -1,126 +0,0 @@
-const alias = "urn:aliases:sqltest";
-const complete = Components.interfaces.mozISqlRequest.STATUS_COMPLETE;
-
-var connection;
-var result;
-
-var startupObserver = {
-  onStartRequest: function(request, ctxt) {
-  },
-  onStopRequest: function(request, ctxt) {
-    if (request.status == complete) {
-      result = request.result;
-      var ds = result.QueryInterface(Components.interfaces.nsIRDFDataSource);
-
-      var menulist = document.getElementById("statesMenulist");
-      menulist.database.AddDataSource(ds);
-      menulist.builder.rebuild();
-      menulist.selectedIndex = 0;
-
-      var tree = document.getElementById("statesTree");
-      tree.database.AddDataSource(ds);
-      tree.builder.rebuild();
-    }
-    else {
-      alert(request.errorMessage);
-    }
-  }
-};
-
-var observer = {
-  onStartRequest: function(request, ctxt) {
-  },
-  
-  onStopRequest: function(request, ctxt) {
-    if (request.status == complete) {
-      var element = document.getElementById("asyncStateName");
-      if (request.result.rowCount) {
-        var enumerator = request.result.enumerate();
-        enumerator.first();
-        element.value = enumerator.getVariant(0);
-      }
-      else {
-        element.value = "Not found";
-      }
-    }
-    else {
-      alert(request.errorMessage);
-    }
-  }
-};
-
-function init() {
-  var service = Components.classes["@mozilla.org/sql/service;1"]
-                .getService(Components.interfaces.mozISqlService);
-
-  if (!service.hasAlias(alias)) {
-    alert("The alias for the sqltest was not defined.");
-    return;
-  }
-
-  try {
-    connection = service.getConnection(alias);
-  }
-  catch (ex) {
-    alert(service.errorMessage);
-    return;
-  }
-
-  var query = "select code, name from states";
-  var request = connection.asyncExecuteQuery(query, null, startupObserver);
-}
-
-function syncFindState() {
-  var code = document.getElementById("syncStateCode").value
-  var query = "select name from states where code = '" + code + "'";
-  try {
-    var result = connection.executeQuery(query);
-    var element = document.getElementById("syncStateName");
-    if (result.rowCount) {
-      var enumerator = result.enumerate();
-      enumerator.first();
-      element.value = enumerator.getVariant(0);
-    }
-    else {
-      element.value = "Not found";
-    }
-  }
-  catch (ex) {
-    alert(connection.errorMessage);
-  }
-}
-
-function asyncFindState() {
-  var code = document.getElementById("asyncStateCode").value;
-  var query = "select name from states where code = '" + code + "'";
-  var request = connection.asyncExecuteQuery(query, null, observer);
-}
-
-function getSelectedRowIndex() {
-  var tree = document.getElementById("statesTree");
-  var currentIndex = tree.currentIndex;
-  var resource = tree.builderView.getResourceAtIndex(currentIndex);
-  var datasource = result.QueryInterface(Components.interfaces.mozISqlDataSource);
-  return datasource.getIndexOfResource(resource);
-}
-
-function doInsert() {
-  window.openDialog("sqltestDialog.xul", "testDialog", "chrome,modal=yes,resizable=no", result);
-}
-
-function doUpdate() {
-  var rowIndex = this.getSelectedRowIndex();
-  window.openDialog("sqltestDialog.xul", "testDialog", "chrome,modal=yes,resizable=no", result, rowIndex);
-}
-
-function doDelete() {
-  var rowIndex = this.getSelectedRowIndex();
-  var enumerator = result.enumerate();
-  enumerator.absolute(rowIndex);
-  try {
-    enumerator.deleteRow();
-  }
-  catch(ex) {
-    alert(enumerator.errorMessage);
-  }
-}

mozilla/extensions/sql/sqltest/sqltest.xul

@@ -1,118 +0,0 @@
-<?xml version="1.0"?>
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="sqltest.css" type="text/css"?>
-
-<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        orient="vertical"
-        width="640" height="480"
-        title="SQL test"
-        onload="init()">
-
-  <script type="application/x-javascript" src="sqltest.js"/>
-
-  <popupset>
-    <popup id="editContextMenu">
-      <menuitem label="Insert" oncommand="doInsert()"/>
-      <menuitem label="Update" oncommand="doUpdate()"/>
-      <menuitem label="Delete" oncommand="doDelete()"/>
-    </popup>
-  </popupset>
-
-  <tabbox flex="1">
-    <tabs>
-      <tab label="Sync test"/>
-      <tab label="Async test"/>
-      <tab label="Widgets"/>
-    </tabs>
-    <tabpanels flex="1">
-      <vbox>
-        <text class="label" value="Type a state code and then hit ENTER. You should get a state name."/>
-        <spacer class="spacer"/>
-        <grid>
-          <columns>
-            <column/>
-          </columns>
-          <rows>
-            <row>
-              <text class="label" value="State code:"/>
-              <hbox>
-                <textbox id="syncStateCode" size="2" maxlength="2" onkeyup="if (event.keyCode == 13) syncFindState()"/>
-              </hbox>
-            </row>
-            <row>
-              <text class="label" value="State name:"/>
-              <textbox id="syncStateName"/>
-            </row>
-          </rows>
-        </grid>
-      </vbox>
-      <vbox>
-        <text class="label" value="Type a state code and then hit ENTER. You should get a state name."/>
-        <spacer class="spacer"/>
-        <grid>
-          <columns>
-            <column/>
-          </columns>
-          <rows>
-            <row>
-              <text class="label" value="State code:"/>
-              <hbox>
-                <textbox id="asyncStateCode" size="2" maxlength="2" onkeyup="if (event.keyCode == 13) asyncFindState()"/>
-              </hbox>
-            </row>
-            <row>
-              <text class="label" value="State name:"/>
-              <textbox id="asyncStateName"/>
-            </row>
-          </rows>
-        </grid>
-      </vbox>
-      <vbox>
-        <text class="label" value="You should see a menulist filled with all the states."/>
-        <spacer class="spacer"/>
-        <hbox>
-          <menulist id="statesMenulist"
-                    datasources="rdf:null" ref="SQL:ResultRoot">
-            <template>
-              <menupopup>
-                <menuitem uri="..."
-                          value="rdf:http://www.mozilla.org/SQL-rdf#code"
-                          label="rdf:http://www.mozilla.org/SQL-rdf#name"/>
-              </menupopup>
-            </template>
-          </menulist>
-        </hbox>
-        <spacer class="spacer"/>
-        <text value="You should see codes and names of all states in this tree. You can even edit them using the context menu."/>
-        <spacer class="spacer"/>
-        <tree id="statesTree" flex="1"
-              context="editContextMenu"
-              seltype="single" enableColumnDrag="true"
-              datasources="rdf:null" ref="SQL:ResultRoot" flags="dont-build-content">
-          <treecols>
-            <treecol id="codeCol"
-                     label="State code"
-                     sort="rdf:http://www.mozilla.org/SQL-rdf#code"
-                     sortActive="true" sortDirection="ascending"/>
-            <splitter class="tree-splitter"/>
-            <treecol id="nameCol" flex="1"
-                     label="State name"
-                     sort="rdf:http://www.mozilla.org/SQL-rdf#name"/>
-          </treecols>
-          <template>
-            <treechildren>
-              <treeitem uri="rdf:*">
-                <treerow>
-                  <treecell label="rdf:http://www.mozilla.org/SQL-rdf#code"/>
-                  <treecell label="rdf:http://www.mozilla.org/SQL-rdf#name"/>
-                </treerow>
-              </treeitem>
-            </treechildren>
-          </template>
-        </tree>
-      </vbox>
-    </tabpanels>
-  </tabbox>
-
-</window>

mozilla/extensions/sql/sqltest/sqltestDialog.js

@@ -1,41 +0,0 @@
-var result;
-var enumerator;
-
-function init() {
-  result = window.arguments[0];
-  enumerator = result.enumerate();
-  if (window.arguments.length == 2) {
-    enumerator.absolute(window.arguments[1]);
-    var columnCount = result.columnCount;
-    for(var i = 0; i < columnCount; i++) {
-      if (!enumerator.isNull(i)) {
-        var element = document.getElementById(result.getColumnName(i));
-        element.value = enumerator.getVariant(i);
-      }
-    }
-  }
-}
-
-function onAccept() {
-  var columnCount = result.columnCount;
-  for (var i = 0; i < columnCount; i++) {
-    var element = document.getElementById(result.getColumnName(i));
-    if (element.value)
-      enumerator.setVariant(i, element.value);
-    else
-      enumerator.setNull(i);
-  }
-
-  try {
-    if (window.arguments.length == 2)
-      enumerator.updateRow();
-    else
-      enumerator.insertRow();
-  }
-  catch(ex) {
-    alert(enumerator.errorMessage);
-    return false;
-  }
-
-  return true;
-}

mozilla/extensions/sql/sqltest/sqltestDialog.xul

@@ -1,33 +0,0 @@
-<?xml version="1.0"?>
-
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-
-<dialog id="testDialog"
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  title="Test dialog"
-  buttons="accept,cancel" buttonpack="center"
-  ondialogaccept="return onAccept();"
-  onload="init()">
-
-  <script type="application/x-javascript" src="sqltestDialog.js"/>
-
-  <grid flex="1">
-    <columns>
-      <column/>
-      <column flex="1"/>
-    </columns>
-    <rows>
-      <row>
-        <label value="Code:"/>  
-        <hbox>
-          <textbox id="code" size="2" maxlength="2" oninput="this.value = this.value.toUpperCase()"/>
-        </hbox>
-      </row>
-      <row>
-        <label value="Name:"/>
-        <textbox id="name" size="30" maxlength="30"/>
-      </row>
-    </rows>
-  </grid>
-
-</dialog>

mozilla/extensions/sql/sqltest/states.sql

@@ -1,4 +0,0 @@
-create table states (
-  code	varchar(2) primary key,
-  name	varchar(30)
-);

mozilla/extensions/sql/sqltest/states.txt

@@ -1,51 +0,0 @@
-AL	Alabama
-AK	Alaska
-AZ	Arizona
-AR	Arkansas
-CA	California
-CO	Colorado
-CT	Connecticut
-DE	Delaware
-FL	Florida
-GA	Georgia
-HI	Hawaii
-ID	Idaho
-IL	Illinois
-IN	Indiana
-IA	Iowa
-KS	Kansas
-KY	Kentucky
-LA	Louisiana
-ME	Maine
-MD	Maryland
-MA	Massachusetts
-MI	Michigan
-MN	Minnesota
-MS	Mississippi
-MO	Missouri
-MT	Montana
-NE	Nebraska
-NV	Nevada
-NH	New Hampshire
-NJ	New Jersey
-NM	New Mexico
-NY	New York
-NC	North Carolina
-ND	North Dakota
-OH	Ohio
-OK	Oklahoma
-OR	Oregon
-PA	Pennsylvania
-RI	Rhode Island
-SC	South Carolina
-SD	South Dakota
-TN	Tennessee
-TX	Texas
-UT	Utah
-VT	Vermont
-VA	Virginia
-WA	Washington
-DC	Washington,D.C.
-WV	West Virginia
-WI	Wisconsin
-WY	Wyoming

mozilla/extensions/sql/tests/Makefile.in

@@ -1,6 +0,0 @@
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(topsrcdir)/config/rules.mk

mozilla/mailnews/base/public/nsIMapiRegistry.idl

@@ -19,7 +19,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *   Jan Varga <varga@utcru.sk>
+ * 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
@@ -37,41 +37,34 @@
 
 #include "nsISupports.idl"
 
-interface mozISqlConnection;
-interface mozISqlRequestObserver;
-interface mozISqlResult;
+interface nsIDOMWindow;
 
 /**
- * @status UNDER_REVIEW
+ * 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 {
 
-[scriptable, uuid(f67cb817-5e07-49ff-aacc-5c80585c5031)]
-interface mozISqlRequest : nsISupports
-{
-  readonly attribute AString errorMessage;
+   /** This is set to TRUE if Mozilla is the default Application
+    */
+   attribute boolean isDefaultMailClient;
 
-  readonly attribute mozISqlResult result;
-
-  readonly attribute long affectedRows;
-
-  readonly attribute long lastID;
-
-
-  readonly attribute AString query;
-
-  readonly attribute nsISupports ctxt;
-
-  readonly attribute mozISqlRequestObserver observer;
-
-
-  const long STATUS_NONE        = 0;
-  const long STATUS_EXECUTED    = 1;
-  const long STATUS_COMPLETE    = 2;
-  const long STATUS_ERROR       = 3;
-  const long STATUS_CANCELLED   = 4;
-  
-  readonly attribute long status;
-  
-  void cancel();
+   /** 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/makefile.win

@@ -0,0 +1,27 @@
+#!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): Srilatha Moturi  <srilatha@netscape.com>
+#                 Krishna Mohan Khandrika <kkhandrika@netscape.com>
+
+DEPTH=..\..
+
+DIRS=mapihook resources mapiDll
+
+include <$(DEPTH)\config\rules.mak>

mozilla/mailnews/mapi/mapiDll/Mapi32.DEF

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

mozilla/mailnews/mapi/mapiDll/MapiDll.cpp

@@ -0,0 +1,346 @@
+/* ***** 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

@@ -0,0 +1,62 @@
+# ***** 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

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

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

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

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

@@ -0,0 +1,114 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
+ * Contributor(s): Rajiv Dayal (rdayal@netscape.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+// This idl will be compiled by MIDL.  MS-COM is used 
+// as brdige between MAPI clients and the Mozilla.
+
+import "unknwn.idl";
+
+typedef wchar_t LOGIN_PW_TYPE[256];
+
+typedef struct
+{
+    unsigned long     ulReserved;            
+    unsigned long     flFlags;               /* Flags */
+    unsigned long     nPosition_NotUsed;     /* character in text to be replaced by attachment */
+    LPTSTR            lpszPathName;          /* Full path name including file name */
+    LPTSTR            lpszFileName;          /* Real (original) file name */
+    unsigned char *   lpFileType_NotUsed ;
+} nsMapiFileDesc, * lpnsMapiFileDesc;
+
+
+typedef struct
+{
+    unsigned long      ulReserved;           
+    unsigned long      ulRecipClass;  /* MAPI_TO, MAPI_CC, MAPI_BCC, MAPI_ORIG    */
+    LPTSTR             lpszName;      /* Recipient name to display */
+    LPTSTR             lpszAddress;   /* Recipient email address */
+    unsigned long      ulEIDSize_NotUsed;     
+    unsigned char  *   lpEntryID_NotUsed ;
+} nsMapiRecipDesc, * lpnsMapiRecipDesc;
+
+typedef struct
+{
+    unsigned long    ulReserved;					
+    LPTSTR           lpszSubject;  /* Message Subject */
+    LPTSTR           lpszNoteText; /* Message Text */
+    LPTSTR           lpszMessageType_NotUsed;		
+    LPTSTR           lpszDateReceived_notUsed;	 /* in YYYY/MM/DD HH:MM format */
+    LPTSTR           lpszConversationID_NotUsed; /* conversation thread ID */
+    unsigned long    flFlags; /* unread,return receipt */
+    lpnsMapiRecipDesc  lpOriginator;  /* Originator descriptor  */
+    unsigned long      nRecipCount;   /* Number of recipients   */
+    lpnsMapiRecipDesc  lpRecips;      /* Recipient descriptors  */
+    unsigned long      nFileCount;    /* # of file attachments  */
+    lpnsMapiFileDesc   lpFiles;       /* Attachment descriptors */
+} nsMapiMessage, * lpnsMapiMessage;
+
+
+[
+    object,
+    uuid(6EDCD38E-8861-11d5-A3DD-00B0D0F3BAA7),
+    helpstring("nsIMapi Inteface"),
+    pointer_default(unique)
+]
+
+interface nsIMapi : IUnknown
+{
+    HRESULT Login(unsigned long aUIArg, LOGIN_PW_TYPE aLogin,
+                  LOGIN_PW_TYPE aPassWord, unsigned long aFlags,
+                  [out] unsigned long *aSessionId);
+
+    HRESULT Initialize();
+    HRESULT IsValid();
+    HRESULT IsValidSession([in] unsigned long aSession);
+
+    HRESULT SendMail([in] unsigned long aSession, [in] lpnsMapiMessage aMessage,
+                  [in] short aRecipCount, [in, size_is(aRecipCount)] lpnsMapiRecipDesc aRecips, 
+                  [in] short aFileCount, [in, size_is(aFileCount)] lpnsMapiFileDesc aFiles, 
+                  [in] unsigned long aFlags, [in] unsigned long aReserved) ;
+
+    HRESULT SendDocuments( [in] unsigned long aSession, 
+                  [in] LPTSTR aDelimChar, [in] LPTSTR aFilePaths,
+                  [in] LPTSTR aFileNames, [in] ULONG aFlags ) ;
+
+    HRESULT Logoff (unsigned long aSession);
+    HRESULT CleanUp();
+};
+
+
+

mozilla/mailnews/mapi/mapihook/makefile.win

@@ -0,0 +1,41 @@
+# ***** 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

@@ -0,0 +1,49 @@
+# ***** 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

@@ -0,0 +1,70 @@
+/* ***** 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

@@ -19,7 +19,6 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *   Jan Varga <varga@utcru.sk>
  *
  * 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
@@ -38,15 +37,28 @@
 #include "nsISupports.idl"
 
 /**
- * @status UNDER_DEVELOPMENT
+ * This interface provides support for registering Mozilla as a COM component
+ * for extending the use of Mail/News through Simple MAPI.
+ * 
  */
 
-[scriptable, uuid(555f2485-ba82-4c5c-9dd2-d801104dc09e)]
-interface mozISqlInputStream : nsISupports
-{
+[noscript, uuid(8967fed2-c8bb-11d5-a3e9-00b0d0f3baa7)]
+interface nsIMapiSupport : nsISupports {
 
-  AString getColumnHeader(in long aColumnIndex);
+   /** Initiates MAPI support
+    */
 
-  void setColumnHeader(in long aColumnIndex, in AString aLabel);
+   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

@@ -0,0 +1,323 @@
+/* ***** 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

@@ -19,7 +19,7 @@
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *   Jan Varga <varga@utcru.sk>
+ * 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
@@ -35,22 +35,22 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsISupports.idl"
+#ifndef _REGISTRY_H_
+#define _REGISTRY_H_
 
-interface mozISqlRequest;
+#include <objbase.h>
 
-/**
- * @status UNDER_REVIEW
- */
+// This function will register a component in the Registry.
 
-[scriptable, uuid(9e950bc0-e252-41ef-ac6f-3e3c4acd9dd8)]
-interface mozISqlRequestObserver : nsISupports
-{
+HRESULT RegisterServer(const CLSID& clsid, 
+                       const char* szFriendlyName,
+                       const char* szVerIndProgID,
+                       const char* szProgID) ;
 
-  void onStartRequest(in mozISqlRequest aRequest,
-                      in nsISupports aContext);
+// This function will unregister a component.
 
-  void onStopRequest(in mozISqlRequest aRequest,
-                     in nsISupports aContext);
+HRESULT UnregisterServer(const CLSID& clsid,
+                         const char* szVerIndProgID,
+                         const char* szProgID) ;
 
-};
+#endif

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

@@ -0,0 +1,107 @@
+# ***** 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

@@ -0,0 +1,118 @@
+/* ***** 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

@@ -11,15 +11,14 @@
  * for the specific language governing rights and limitations under the
  * License.
  *
- * The Original Code is mozilla.org code.
+ * The Original Code is Mozilla
  *
  * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
+ * Netscape Communications Corp.
  * Portions created by the Initial Developer are Copyright (C) 2001
  * the Initial Developer. All Rights Reserved.
  *
- * Contributor(s):
- *   Jan Varga <varga@utcru.sk>
+ * 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
@@ -35,31 +34,36 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsISupports.idl"
+#ifndef MSG_MAPI_FACTORY_H
+#define MSG_MAPI_FACTORY_H
 
-interface nsIRDFResource;
+#include <windows.h>
+#include <objbase.h>
+#include "nspr.h"
 
-/**
- * @status UNDER_REVIEW
- */
 
-[scriptable, uuid(3c0a954f-b595-46a4-932c-3660f55e2e10)]
-interface mozISqlDataSource : nsISupports
+class CMapiFactory : public IClassFactory
 {
+public :
 
-  /**
-   * Retrieve the RDF resource associated with the specified row.
-   *
-   * @param aRowIndex   The row index.
-   */
+    // IUnknown
 
-  nsIRDFResource getResourceAtIndex(in long aRowIndex);
+    STDMETHODIMP            QueryInterface (REFIID aIid, void** aPpv);
+    STDMETHODIMP_(ULONG)    AddRef(void);
+    STDMETHODIMP_(ULONG)    Release(void);
 
-  /**
-   * Retrieve the index associated with specified RDF resource.
-   *
-   * @param aResource   The resource.
-   */
-  long getIndexOfResource(in nsIRDFResource aResource);
+    // 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

@@ -0,0 +1,777 @@
+/* ***** 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

@@ -0,0 +1,66 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla
+ *
+ * The Initial Developer of the Original Code is
+ * Netscape Communications Corp.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef MSG_MAPI_HOOK_H_
+#define MSG_MAPI_HOOK_H_
+
+#include "prtypes.h"
+
+class nsMapiHook
+{
+    public :
+
+        static PRBool Initialize();
+        static PRBool DisplayLoginDialog(PRBool aLogin, PRUnichar **aUsername, 
+                        PRUnichar **aPassword);
+        static PRBool VerifyUserName(const PRUnichar *aUsername, char **aIdKey);
+
+        static PRBool IsBlindSendAllowed () ;
+        static nsresult BlindSendMail (unsigned long aSession, nsIMsgCompFields * aCompFields) ;
+        static nsresult ShowComposerWindow (unsigned long aSession, nsIMsgCompFields * aCompFields) ;
+        static nsresult PopulateCompFields(lpnsMapiMessage aMessage, nsIMsgCompFields * aCompFields) ;
+        static nsresult PopulateCompFieldsWithConversion(lpnsMapiMessage aMessage, 
+                                        nsIMsgCompFields * aCompFields) ;
+        static nsresult PopulateCompFieldsForSendDocs(nsIMsgCompFields * aCompFields, 
+                                        ULONG aFlags, LPTSTR aDelimChar, LPTSTR aFilePaths) ;
+        static nsresult HandleAttachments (nsIMsgCompFields * aCompFields, PRInt32 aFileCount, 
+                                        lpnsMapiFileDesc aFiles, BOOL aIsUnicode) ;
+        static void CleanUp();
+
+        static PRBool isMapiService;
+};
+
+#endif  // MSG_MAPI_HOOK_H_

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

@@ -0,0 +1,266 @@
+/* ***** 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

@@ -0,0 +1,92 @@
+/* ***** 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

@@ -0,0 +1,376 @@
+/* ***** 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

@@ -0,0 +1,112 @@
+/* ***** 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

@@ -0,0 +1,209 @@
+/* ***** 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

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

@@ -0,0 +1,167 @@
+/* ***** 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

@@ -0,0 +1,76 @@
+/* ***** 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

@@ -0,0 +1,743 @@
+/* ***** 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

@@ -0,0 +1,112 @@
+/* ***** 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

@@ -0,0 +1,30 @@
+<?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

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

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

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

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

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

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

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

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

@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+<!-- 
+The contents of this file are subject to the Mozilla Public
+License Version 1.1 (the "License"); you may not use this file
+except in compliance with the License. You may obtain a copy of
+the License at http://www.mozilla.org/MPL/
+
+oftware distributed under the License is distributed on an "AS
+IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+implied. See the License for the specific language governing
+rights and limitations under the License.
+
+The Original Code is mozilla.org code.
+The Initial Developer of the Original Code is Netscape
+Communications Corporation.  Portions created by Netscape are 
+Copyright (C) 2001 Netscape Communications Corporation.  All
+Rights Reserved.
+ 
+Contributor(s): 
+  Srilatha Moturi <srilatha@netscape.com>
+-->
+
+<!DOCTYPE window [
+<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % prefMailnewsOverlayDTD SYSTEM "chrome://messenger-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

@@ -2,22 +2,22 @@
 <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 locales being supplied by this package -->
+  <!-- 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:displayName="English(US)"
-        chrome:author="mozilla.org"
-        chrome:name="en-US"
-        chrome:previewURL="http://www.mozilla.org/locales/en-US.gif">
+  <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:sql"/>
+        <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

@@ -0,0 +1,4 @@
+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

@@ -0,0 +1,40 @@
+#!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

@@ -0,0 +1,23 @@
+# 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

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

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

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

mozilla/mailnews/mapi/resources/makefile.win

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