merge from head

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

mozilla/extensions/psm-glue/Makefile.in

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

mozilla/extensions/psm-glue/makefile.win

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

mozilla/extensions/psm-glue/public/MANIFEST

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

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

@@ -1,45 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-#   Hubbie Shaw
-#   Doug Turner <dougt@netscape.com>
-#   Terry Hayes <thayes@netscape.com>
-# 
-
-MODULE = psmglue
-
-DEPTH		= ../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-XPIDLSRCS = \
-	nsIPSMComponent.idl \
-	nsIPSMUIHandler.idl \
-	nsISecureBrowserUI.idl \
-    nsIPSMSocketInfo.idl \
-	nsISSLSocketProvider.idl \
-	nsISecretDecoderRing.idl \
-	$(NULL)
-
-PREF_JS_EXPORTS	= $(srcdir)/psm-glue.js
-
-include $(topsrcdir)/config/rules.mk

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,29 +0,0 @@
-#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
-#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
-#
-# Contributor(s): 
-# 
-
-Title=Security Warning
-MixedContentMessage=You have requested a secure document that contains some insecure information.
-LeaveSiteMessage=You have requested an insecure document. The document and any information you send back could be observed by a third party while in transit.
-EnterSiteMessage=You have requested a secure document. The document and any information you send back are encrypted for privacy while in transit.
-PostToInsecure=Warning! Although this document is secure, the information you have submitted is insecure and could be observed by a third party while in transit. If you are submitting passwords, credit card numbers, or other information you would like to keep private, it would be safer for you to cancel the submission.
-PostToInsecureFromInsecure=Any information you submit is insecure and could be observed by a third party while in transit. If you are submitting passwords, credit card numbers, or other information you would like to keep private, it would be safer for you to cancel the submission. 
-DontShowAgain=Show Me This Alert Next Time.
-FindText=Please find the Personal Security Manager application

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

mozilla/widget/Makefile.in

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

mozilla/widget/build.bat

@@ -0,0 +1,21 @@
+rem -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+rem 
+rem  The contents of this file are subject to the Netscape Public License
+rem  Version 1.0 (the "NPL"); you may not use this file except in
+rem  compliance with the NPL.  You may obtain a copy of the NPL at
+rem  http://www.mozilla.org/NPL/
+rem 
+rem  Software distributed under the NPL is distributed on an "AS IS" basis,
+rem  WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+rem  for the specific language governing rights and limitations under the
+rem  NPL.
+rem 
+rem  The Initial Developer of this code under the NPL is Netscape
+rem  Communications Corporation.  Portions created by Netscape are
+rem  Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+rem  Reserved.
+rem 
+
+del s:\ns\raptor\ui\src\windows\win32_d.obj\%1.obj
+del s:\ns\raptor\ui\tests\windows\win32_d.obj\winmain.obj
+nmake -f makefile.win

mozilla/widget/macbuild/Widget.prefix

@@ -0,0 +1,11 @@
+//
+// Widget.Prefix
+//
+// Global prefix file for the Widget project.
+//
+
+#include "MacPrefix.h"
+
+#include <Quickdraw.h>
+#include <Events.h>
+#include <MacWindows.h>

mozilla/widget/macbuild/WidgetDebug.prefix

@@ -0,0 +1,11 @@
+//
+// WidgetDebug.Prefix
+//
+// Global prefix file for the debug Widget project.
+//
+
+#include "MacPrefix_debug.h"
+
+#include <Quickdraw.h>
+#include <Events.h>
+#include <MacWindows.h>

mozilla/widget/macbuild/WidgetSharedDebugPrefix.h

@@ -0,0 +1,22 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#define MAC_SHARED 1
+#define _IMPL_NS_WIDGET 1
+
+#include "WidgetDebug.prefix"

mozilla/widget/macbuild/WidgetSharedPrefix.h

@@ -0,0 +1,22 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#define MAC_SHARED 1
+#define _IMPL_NS_WIDGET 1
+
+#include "Widget.prefix"

mozilla/widget/macbuild/WidgetStaticDebugPrefix.h

@@ -0,0 +1,21 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#define MAC_STATIC 1
+
+#include "WidgetDebug.prefix"

mozilla/widget/macbuild/WidgetStaticPrefix.h

@@ -0,0 +1,21 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+
+#define MAC_STATIC 1
+
+#include "Widget.prefix"

mozilla/widget/macbuild/widget.toc

@@ -0,0 +1,35 @@
+# target: widgetDebug.shlb
+mozilla/widget/src/mac/nsAppShell.cpp
+mozilla/widget/src/mac/nsButton.cpp
+mozilla/widget/src/mac/nsCheckButton.cpp
+mozilla/widget/src/mac/nsFileWidget.cpp
+mozilla/widget/src/mac/nsLookAndFeel.cpp
+mozilla/widget/src/mac/nsMacControl.cpp
+mozilla/widget/src/mac/nsMacEventHandler.cpp
+mozilla/widget/src/mac/nsMacMessagePump.cpp
+mozilla/widget/src/mac/nsMacMessageSink.cpp
+mozilla/widget/src/mac/nsMacWindow.cpp
+mozilla/widget/src/mac/nsMenu.cpp
+mozilla/widget/src/mac/nsMenuBar.cpp
+mozilla/widget/src/mac/nsMenuItem.cpp
+mozilla/widget/src/mac/nsRadioButton.cpp
+mozilla/widget/src/mac/nsScrollbar.cpp
+mozilla/widget/src/mac/nsTextAreaWidget.cpp
+mozilla/widget/src/mac/nsTextWidget.cpp
+mozilla/widget/src/mac/nsToolkit.cpp
+mozilla/widget/src/mac/nsWidgetFactory.cpp
+mozilla/widget/src/mac/nsWidgetSupport.cpp
+mozilla/widget/src/mac/nsWindow.cpp
+mozilla/widget/src/xpwidgets/nsBaseWidget.cpp
+mozilla/widget/src/xpwidgets/nsHTColumn.cpp
+mozilla/widget/src/xpwidgets/nsHTControlStripItem.cpp
+mozilla/widget/src/xpwidgets/nsHTDataModel.cpp
+mozilla/widget/src/xpwidgets/nsHTItem.cpp
+mozilla/widget/src/xpwidgets/nsHTTreeDataModel.cpp
+mozilla/widget/src/xpwidgets/nsHTTreeItem.cpp
+mozilla/widget/src/xpwidgets/nsImageButton.cpp
+mozilla/widget/src/xpwidgets/nsMenuButton.cpp
+mozilla/widget/src/xpwidgets/nsToolbar.cpp
+mozilla/widget/src/xpwidgets/nsToolbarItemHolder.cpp
+mozilla/widget/src/xpwidgets/nsToolbarManager.cpp
+mozilla/widget/src/xpwidgets/nsTreeView.cpp

mozilla/widget/makefile.win

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

mozilla/widget/public/MANIFEST

@@ -0,0 +1,33 @@
+#
+# This is a list of local files which get copied to the mozilla:dist:widget directory
+#
+
+nsIDragSessionMac.h
+nsIWidget.h
+nsIKBStateControl.h
+nsIButton.h
+nsICheckButton.h
+nsIListWidget.h
+nsIComboBox.h
+nsITextWidget.h
+nsITextAreaWidget.h
+nsIComboBox.h
+nsIListBox.h
+nsIScrollbar.h
+nsGUIEvent.h
+nsIRadioButton.h
+nsIMouseListener.h
+nsIEventListener.h
+nsIFileWidget.h
+nsIMenuListener.h
+nsWidgetsCID.h
+nsILabel.h
+nsILookAndFeel.h
+nsWidgetSupport.h
+nsIMenu.h
+nsIMenuBar.h
+nsIMenuItem.h
+nsIPopUpMenu.h
+nsIKeyBindMgr.h
+nsStringUtil.h
+nsIContextMenu.h

mozilla/widget/public/MANIFEST_IDL

@@ -0,0 +1,16 @@
+#
+# This is a list of local files which get copied to the mozilla:dist:idl directory
+#
+
+nsIAppShell.idl
+nsIFilePicker.idl
+nsIFileSpecWithUI.idl
+nsISound.idl
+nsIToolkit.idl
+nsITransferable.idl
+nsIDragSession.idl
+nsIDragService.idl
+nsIFormatConverter.idl
+nsIClipboard.idl
+nsIClipboardOwner.idl
+nsIRollupListener.idl

mozilla/widget/public/Makefile.in

@@ -0,0 +1,92 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= raptor
+XPIDL_MODULE	= widget
+
+EXPORTS		= \
+		nsIFontSizeIterator.h \
+		nsIFontNameIterator.h \
+		nsIFontRetrieverService.h \
+		nsIMenuBar.h \
+		nsIMenu.h \
+		nsIMenuItem.h \
+		nsIPopUpMenu.h \
+		nsIFileWidget.h \
+		nsStringUtil.h \
+		nsIKBStateControl.h \
+		nsIButton.h \
+		nsICheckButton.h \
+		nsIListWidget.h \
+		nsIComboBox.h \
+		nsITextWidget.h \
+		nsITextAreaWidget.h \
+		nsIComboBox.h \
+		nsIListBox.h \
+		nsIScrollbar.h \
+		nsGUIEvent.h \
+		nsIRadioButton.h \
+		nsIMouseListener.h \
+		nsIEventListener.h \
+		nsIMenuListener.h \
+		nsWidgetsCID.h \
+		nsILookAndFeel.h \
+		nsILabel.h \
+		nsIMenuBar.h \
+		nsIMenu.h \
+		nsIMenuItem.h \
+		nsIPopUpMenu.h \
+		nsIFontNameIterator.h \
+		nsIFontSizeIterator.h \
+		nsIFontRetrieverService.h \
+		nsIContextMenu.h \
+		$(NULL)
+
+XPIDLSRCS	= \
+		nsIAppShell.idl \
+		nsIFilePicker.idl \
+		nsIFileSpecWithUI.idl \
+		nsIToolkit.idl \
+		nsISound.idl \
+		nsITransferable.idl \
+		nsIDragSession.idl \
+		nsIDragService.idl \
+		nsIFormatConverter.idl \
+		nsIClipboard.idl \
+		nsIClipboardOwner.idl \
+		nsIRollupListener.idl \
+		nsIWidget.idl \
+		nsIWindow.idl \
+		$(NULL)
+
+EXPORTS		:= $(addprefix $(srcdir)/, $(EXPORTS))
+
+include $(topsrcdir)/config/rules.mk
+
+DEFINES		+= -D_IMPL_NS_UI
+

mozilla/widget/public/makefile.win

@@ -0,0 +1,78 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH=..\..
+
+
+DEFINES=-D_IMPL_NS_UI 
+MODULE=raptor 
+XPIDL_MODULE=widget
+
+XPIDLSRCS =               \
+  .\nsIAppShell.idl \
+  .\nsIFilePicker.idl          \
+  .\nsIFileSpecWithUI.idl          \
+  .\nsISound.idl          \
+  .\nsIToolkit.idl        \
+  .\nsITransferable.idl          \
+  .\nsIDragSession.idl          \
+  .\nsIDragService.idl          \
+  .\nsIFormatConverter.idl          \
+  .\nsIClipboard.idl            \
+  .\nsIClipboardOwner.idl       \
+  .\nsIRollupListener.idl \
+  $(NULL)
+
+EXPORTS=\
+  nsIFontSizeIterator.h \
+  nsIFontNameIterator.h \
+  nsIFontRetrieverService.h \
+  nsIFileWidget.h            \
+  nsIWidget.h \
+  nsIKBStateControl.h \
+  nsIButton.h \
+  nsICheckButton.h \
+  nsIListWidget.h \
+  nsIComboBox.h \
+  nsITextWidget.h \
+  nsITextAreaWidget.h \
+  nsIComboBox.h \
+  nsIListBox.h \
+  nsIScrollbar.h \
+  nsGUIEvent.h \
+  nsIRadioButton.h \
+  nsIMouseListener.h \
+  nsIEventListener.h \
+  nsIMenuListener.h \
+  nsWidgetsCID.h \
+  nsStringUtil.h \
+  nsILookAndFeel.h \
+  nsILabel.h \
+  nsIMenuBar.h \
+  nsIMenu.h \
+  nsIMenuItem.h \
+  nsIContextMenu.h \
+  nsIPopUpMenu.h \
+  $(NULL)
+
+
+include <$(DEPTH)\config\rules.mak>
+

mozilla/widget/public/nsGUIEvent.h

@@ -0,0 +1,509 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsGUIEvent_h__
+#define nsGUIEvent_h__
+
+#include "nsPoint.h"
+#include "nsRect.h"
+
+class nsIRenderingContext;
+class nsIRegion;
+class nsIWidget;
+class nsIMenuItem;
+
+/**
+ * Return status for event processors.
+ */
+
+enum nsEventStatus {  
+    /// The event is ignored, do default processing
+  nsEventStatus_eIgnore,            
+    /// The event is consumed, don't do default processing
+  nsEventStatus_eConsumeNoDefault, 
+    /// The event is consumed, but do default processing
+  nsEventStatus_eConsumeDoDefault  
+};
+
+/**
+ * General event
+ */
+
+struct nsEvent {
+  /// See event struct types
+  PRUint8     eventStructType;
+  /// See GUI MESSAGES,
+  PRUint32    message;              
+  /// in widget relative coordinates, modified to be relative to current view in layout.
+  nsPoint     point;               
+  // in widget relative coordinates, not modified by layout code.
+  nsPoint     refPoint;               
+  /// elapsed time, in milliseconds, from the time the system was started to the time the message was created
+  PRUint32    time;      
+  // flags to hold event flow stage and capture/bubble cancellation status
+  PRUint32    flags;
+};
+
+/**
+ * General graphic user interface event
+ */
+
+struct nsGUIEvent : public nsEvent {
+                /// Originator of the event
+  nsIWidget*  widget;           
+                /// Internal platform specific message.
+  void*     nativeMsg;        
+};
+
+/**
+ * Window resize event
+ */
+
+struct nsSizeEvent : public nsGUIEvent {
+                /// x,y width, height in pixels (client area)
+    nsRect          *windowSize;    
+                /// width of entire window (in pixels)
+    PRInt32         mWinWidth;    
+                /// height of entire window (in pixels)
+    PRInt32         mWinHeight;    
+};
+
+/**
+ * Window repaint event
+ */
+
+struct nsPaintEvent : public nsGUIEvent {
+                /// Context to paint in.
+    nsIRenderingContext *renderingContext;
+                /// area to paint  (should be used instead of rect)
+    nsIRegion           *region;
+                /// x,y, width, height in pixels of area to paint
+    nsRect              *rect;      
+};
+
+/**
+ * Scrollbar event
+ */
+
+struct nsScrollbarEvent : public nsGUIEvent {
+                /// ranges between scrollbar 0 and (maxRange - thumbSize). See nsIScrollbar
+    PRUint32        position; 
+};
+
+
+struct nsInputEvent : public nsGUIEvent {
+                /// PR_TRUE indicates the shift key is down
+    PRBool          isShift;        
+                /// PR_TRUE indicates the control key is down
+    PRBool          isControl;      
+                /// PR_TRUE indicates the alt key is down
+    PRBool          isAlt;          
+                /// PR_TRUE indicates the meta key is down
+                /// (or, on Mac, the Command key)
+    PRBool          isMeta;
+};
+
+/**
+ * Mouse event
+ */
+
+struct nsMouseEvent : public nsInputEvent {
+                /// The number of mouse clicks
+    PRUint32        clickCount;          
+                /// Special return code for MOUSE_ACTIVATE to signal
+                /// if the target accepts activation (1), or denies it (0)
+    PRBool          acceptActivation;           
+};
+
+/**
+ * Keyboard event
+ */
+
+struct nsKeyEvent : public nsInputEvent {
+                /// see NS_VK codes
+    PRUint32        keyCode;   
+                /// OS translated Unicode char
+    PRUint32        charCode;
+                // indicates whether the event signifies a printable character
+    PRBool          isChar;
+};
+
+/**
+ * IME Related Events
+ */
+struct nsTextRange {
+	PRUint32	mStartOffset;
+	PRUint32	mEndOffset;
+	PRUint32	mRangeType;
+};
+
+typedef struct nsTextRange nsTextRange;
+typedef nsTextRange* nsTextRangeArray;
+
+struct nsTextEventReply {
+	nsPoint		mCursorPosition;
+	PRBool		mCursorIsCollapsed;
+};
+
+typedef struct nsTextEventReply nsTextEventReply;
+
+struct nsTextEvent : public nsInputEvent {
+	PRUnichar*			theText;
+	nsTextEventReply	theReply;
+	PRUint32			rangeCount;
+	nsTextRangeArray	rangeArray;
+  PRBool          isChar;
+};
+
+struct nsCompositionEvent : public nsInputEvent {
+	PRUint32			compositionMessage;
+	nsTextEventReply	theReply;
+};
+
+/**
+ * Tooltip event
+ */
+struct nsTooltipEvent : public nsGUIEvent {
+                /// Index of tooltip area which generated the event. @see SetTooltips in nsIWidget
+    PRUint32        tipIndex;           
+};
+
+/**
+ * MenuItem event
+ * 
+ * When this event occurs the widget field in nsGUIEvent holds the "target"
+ * for the event
+ */
+
+struct nsMenuEvent : public nsGUIEvent {
+  nsIMenuItem * mMenuItem;
+  PRUint32      mCommand;           
+};
+
+
+/**
+ * Event status for D&D Event
+ */
+enum nsDragDropEventStatus {  
+    /// The event is a enter
+  nsDragDropEventStatus_eDragEntered,            
+    /// The event is exit
+  nsDragDropEventStatus_eDragExited, 
+    /// The event is drop
+  nsDragDropEventStatus_eDrop  
+};
+
+/**
+ * Event Struct Types
+ */
+#define NS_EVENT            1
+#define NS_GUI_EVENT        2
+#define NS_SIZE_EVENT       3
+#define NS_PAINT_EVENT      4
+#define NS_SCROLLBAR_EVENT  5
+#define NS_INPUT_EVENT      6
+#define NS_KEY_EVENT        7
+#define NS_MOUSE_EVENT      8
+
+#define NS_MENU_EVENT       10
+#define NS_DRAGDROP_EVENT   11
+#define NS_TEXT_EVENT		12
+#define NS_COMPOSITION_START	13
+#define NS_COMPOSITION_END		14
+ 
+ /**
+ * GUI MESSAGES
+ */
+ //@{
+
+#define NS_WINDOW_START                 100
+
+// Widget is being created
+#define NS_CREATE                       (NS_WINDOW_START)
+// Widget is being destroyed
+#define NS_DESTROY                      (NS_WINDOW_START + 1)
+// Widget was resized
+#define NS_SIZE                         (NS_WINDOW_START + 2)
+// Widget gained focus
+#define NS_GOTFOCUS                     (NS_WINDOW_START + 3)
+// Widget lost focus
+#define NS_LOSTFOCUS                    (NS_WINDOW_START + 4)
+// Widget got activated
+#define NS_ACTIVATE                     (NS_WINDOW_START + 5)
+// Widget got deactivated
+#define NS_DEACTIVATE                   (NS_WINDOW_START + 6)
+// Widget needs to be repainted
+#define NS_PAINT                        (NS_WINDOW_START + 30)
+// Key is pressed within a window
+#define NS_KEY_PRESS                    (NS_WINDOW_START + 31)
+// Key is released within a window
+#define NS_KEY_UP                       (NS_WINDOW_START + 32)
+// Key is pressed within a window
+#define NS_KEY_DOWN                     (NS_WINDOW_START + 33)
+// Window has been moved to a new location.
+// The events point contains the x, y location in screen coordinates
+#define NS_MOVE                         (NS_WINDOW_START + 34) 
+
+// Tab control's selected tab has changed
+#define NS_TABCHANGE                    (NS_WINDOW_START + 35)
+
+
+
+// Menu item selected
+#define NS_MENU_SELECTED                (NS_WINDOW_START + 38)
+
+// Form control changed: currently == combo box selection changed
+// but could be expanded to mean textbox, checkbox changed, etc.
+// This is a GUI specific event that does not necessarily correspond
+// directly to a mouse click or a key press.
+#define NS_CONTROL_CHANGE                (NS_WINDOW_START + 39)
+
+// Indicates the display has changed depth
+#define NS_DISPLAYCHANGED                (NS_WINDOW_START + 40)
+
+
+#define NS_MOUSE_MESSAGE_START          300
+#define NS_MOUSE_MOVE                   (NS_MOUSE_MESSAGE_START)
+#define NS_MOUSE_LEFT_BUTTON_UP         (NS_MOUSE_MESSAGE_START + 1)
+#define NS_MOUSE_LEFT_BUTTON_DOWN       (NS_MOUSE_MESSAGE_START + 2)
+#define NS_MOUSE_MIDDLE_BUTTON_UP       (NS_MOUSE_MESSAGE_START + 10)
+#define NS_MOUSE_MIDDLE_BUTTON_DOWN     (NS_MOUSE_MESSAGE_START + 11)
+#define NS_MOUSE_RIGHT_BUTTON_UP        (NS_MOUSE_MESSAGE_START + 20)
+#define NS_MOUSE_RIGHT_BUTTON_DOWN      (NS_MOUSE_MESSAGE_START + 21)
+#define NS_MOUSE_ENTER                  (NS_MOUSE_MESSAGE_START + 22)
+#define NS_MOUSE_EXIT                   (NS_MOUSE_MESSAGE_START + 23)
+#define NS_MOUSE_LEFT_DOUBLECLICK       (NS_MOUSE_MESSAGE_START + 24)
+#define NS_MOUSE_MIDDLE_DOUBLECLICK     (NS_MOUSE_MESSAGE_START + 25)
+#define NS_MOUSE_RIGHT_DOUBLECLICK      (NS_MOUSE_MESSAGE_START + 26)
+#define NS_MOUSE_LEFT_CLICK             (NS_MOUSE_MESSAGE_START + 27)
+#define NS_MOUSE_MIDDLE_CLICK           (NS_MOUSE_MESSAGE_START + 28)
+#define NS_MOUSE_RIGHT_CLICK            (NS_MOUSE_MESSAGE_START + 29)
+#define NS_MOUSE_ACTIVATE               (NS_MOUSE_MESSAGE_START + 30)
+
+#define NS_SCROLLBAR_MESSAGE_START      1000
+#define NS_SCROLLBAR_POS                (NS_SCROLLBAR_MESSAGE_START)
+#define NS_SCROLLBAR_PAGE_NEXT          (NS_SCROLLBAR_MESSAGE_START + 1)
+#define NS_SCROLLBAR_PAGE_PREV          (NS_SCROLLBAR_MESSAGE_START + 2)
+#define NS_SCROLLBAR_LINE_NEXT          (NS_SCROLLBAR_MESSAGE_START + 3)
+#define NS_SCROLLBAR_LINE_PREV          (NS_SCROLLBAR_MESSAGE_START + 4)
+
+#define NS_STREAM_EVENT_START           1100
+#define NS_PAGE_LOAD                    (NS_STREAM_EVENT_START)
+#define NS_PAGE_UNLOAD                  (NS_STREAM_EVENT_START + 1)
+#define NS_IMAGE_LOAD                   (NS_STREAM_EVENT_START + 2)
+#define NS_IMAGE_ABORT                  (NS_STREAM_EVENT_START + 3)
+#define NS_IMAGE_ERROR                  (NS_STREAM_EVENT_START + 4)
+
+#define NS_FORM_EVENT_START             1200
+#define NS_FORM_SUBMIT                  (NS_FORM_EVENT_START)
+#define NS_FORM_RESET                   (NS_FORM_EVENT_START + 1)
+#define NS_FORM_CHANGE                  (NS_FORM_EVENT_START + 2)
+#define NS_FORM_SELECTED                (NS_FORM_EVENT_START + 3)
+#define NS_FORM_INPUT                   (NS_FORM_EVENT_START + 4)
+
+//Need separate focus/blur notifications for non-native widgets
+#define NS_FOCUS_EVENT_START            1300
+#define NS_FOCUS_CONTENT                (NS_FOCUS_EVENT_START)
+#define NS_BLUR_CONTENT                 (NS_FOCUS_EVENT_START + 1)
+
+
+#define NS_DRAGDROP_EVENT_START         1400
+#define NS_DRAGDROP_ENTER               (NS_DRAGDROP_EVENT_START)
+#define NS_DRAGDROP_OVER                (NS_DRAGDROP_EVENT_START + 1)
+#define NS_DRAGDROP_EXIT                (NS_DRAGDROP_EVENT_START + 2)
+#define NS_DRAGDROP_DROP                (NS_DRAGDROP_EVENT_START + 3)
+#define NS_DRAGDROP_GESTURE             (NS_DRAGDROP_EVENT_START + 4)
+
+// Events for popups
+#define NS_MENU_EVENT_START            1500
+#define NS_MENU_CREATE                (NS_MENU_EVENT_START)
+#define NS_MENU_DESTROY               (NS_MENU_EVENT_START+1)
+#define NS_MENU_ACTION                (NS_MENU_EVENT_START+2)
+#define NS_XUL_BROADCAST              (NS_MENU_EVENT_START+3)
+#define NS_XUL_COMMAND_UPDATE         (NS_MENU_EVENT_START+4)
+//@}
+
+
+#define NS_IS_MOUSE_EVENT(evnt) \
+       (((evnt)->message == NS_MOUSE_LEFT_BUTTON_DOWN) || \
+        ((evnt)->message == NS_MOUSE_LEFT_BUTTON_UP) || \
+        ((evnt)->message == NS_MOUSE_LEFT_CLICK) || \
+        ((evnt)->message == NS_MOUSE_LEFT_DOUBLECLICK) || \
+        ((evnt)->message == NS_MOUSE_MIDDLE_BUTTON_DOWN) || \
+        ((evnt)->message == NS_MOUSE_MIDDLE_BUTTON_UP) || \
+        ((evnt)->message == NS_MOUSE_MIDDLE_CLICK) || \
+        ((evnt)->message == NS_MOUSE_MIDDLE_DOUBLECLICK) || \
+        ((evnt)->message == NS_MOUSE_RIGHT_BUTTON_DOWN) || \
+        ((evnt)->message == NS_MOUSE_RIGHT_BUTTON_UP) || \
+        ((evnt)->message == NS_MOUSE_RIGHT_CLICK) || \
+        ((evnt)->message == NS_MOUSE_RIGHT_DOUBLECLICK) || \
+        ((evnt)->message == NS_MOUSE_ENTER) || \
+        ((evnt)->message == NS_MOUSE_EXIT) || \
+        ((evnt)->message == NS_MOUSE_MOVE))
+
+#define NS_IS_KEY_EVENT(evnt) \
+       (((evnt)->message == NS_KEY_DOWN) ||  \
+        ((evnt)->message == NS_KEY_PRESS) || \
+        ((evnt)->message == NS_KEY_UP))
+
+/*
+ * Virtual key bindings for keyboard events
+ * NOTE: These are repeated in nsIDOMEvent.h and must be kept in sync
+ */
+
+#define NS_VK_CANCEL         0x03
+#define NS_VK_BACK           0x08
+#define NS_VK_TAB            0x09
+#define NS_VK_CLEAR          0x0C
+#define NS_VK_RETURN         0x0D
+#define NS_VK_ENTER          0x0E
+#define NS_VK_SHIFT          0x10
+#define NS_VK_CONTROL        0x11
+#define NS_VK_ALT            0x12
+#define NS_VK_PAUSE          0x13
+#define NS_VK_CAPS_LOCK      0x14
+#define NS_VK_ESCAPE         0x1B
+#define NS_VK_SPACE          0x20
+#define NS_VK_PAGE_UP        0x21
+#define NS_VK_PAGE_DOWN      0x22
+#define NS_VK_END            0x23
+#define NS_VK_HOME           0x24
+#define NS_VK_LEFT           0x25
+#define NS_VK_UP             0x26
+#define NS_VK_RIGHT          0x27
+#define NS_VK_DOWN           0x28
+#define NS_VK_PRINTSCREEN    0x2C
+#define NS_VK_INSERT         0x2D
+#define NS_VK_DELETE         0x2E
+
+// NS_VK_0 - NS_VK_9 match their ascii values
+#define NS_VK_0              0x30
+#define NS_VK_1              0x31
+#define NS_VK_2              0x32
+#define NS_VK_3              0x33
+#define NS_VK_4              0x34
+#define NS_VK_5              0x35
+#define NS_VK_6              0x36
+#define NS_VK_7              0x37
+#define NS_VK_8              0x38
+#define NS_VK_9              0x39
+
+#define NS_VK_SEMICOLON      0x3B
+#define NS_VK_EQUALS         0x3D
+
+// NS_VK_A - NS_VK_Z match their ascii values
+#define NS_VK_A              0x41
+#define NS_VK_B              0x42
+#define NS_VK_C              0x43
+#define NS_VK_D              0x44
+#define NS_VK_E              0x45
+#define NS_VK_F              0x46
+#define NS_VK_G              0x47
+#define NS_VK_H              0x48
+#define NS_VK_I              0x49
+#define NS_VK_J              0x4A
+#define NS_VK_K              0x4B
+#define NS_VK_L              0x4C
+#define NS_VK_M              0x4D
+#define NS_VK_N              0x4E
+#define NS_VK_O              0x4F
+#define NS_VK_P              0x50
+#define NS_VK_Q              0x51
+#define NS_VK_R              0x52
+#define NS_VK_S              0x53
+#define NS_VK_T              0x54
+#define NS_VK_U              0x55
+#define NS_VK_V              0x56
+#define NS_VK_W              0x57
+#define NS_VK_X              0x58
+#define NS_VK_Y              0x59
+#define NS_VK_Z              0x5A
+
+#define NS_VK_NUMPAD0        0x60
+#define NS_VK_NUMPAD1        0x61
+#define NS_VK_NUMPAD2        0x62
+#define NS_VK_NUMPAD3        0x63
+#define NS_VK_NUMPAD4        0x64
+#define NS_VK_NUMPAD5        0x65
+#define NS_VK_NUMPAD6        0x66
+#define NS_VK_NUMPAD7        0x67
+#define NS_VK_NUMPAD8        0x68
+#define NS_VK_NUMPAD9        0x69
+#define NS_VK_MULTIPLY       0x6A
+#define NS_VK_ADD            0x6B
+#define NS_VK_SEPARATOR      0x6C
+#define NS_VK_SUBTRACT       0x6D
+#define NS_VK_DECIMAL        0x6E
+#define NS_VK_DIVIDE         0x6F
+#define NS_VK_F1             0x70
+#define NS_VK_F2             0x71
+#define NS_VK_F3             0x72
+#define NS_VK_F4             0x73
+#define NS_VK_F5             0x74
+#define NS_VK_F6             0x75
+#define NS_VK_F7             0x76
+#define NS_VK_F8             0x77
+#define NS_VK_F9             0x78
+#define NS_VK_F10            0x79
+#define NS_VK_F11            0x7A
+#define NS_VK_F12            0x7B
+#define NS_VK_F13            0x7C
+#define NS_VK_F14            0x7D
+#define NS_VK_F15            0x7E
+#define NS_VK_F16            0x7F
+#define NS_VK_F17            0x80
+#define NS_VK_F18            0x81
+#define NS_VK_F19            0x82
+#define NS_VK_F20            0x83
+#define NS_VK_F21            0x84
+#define NS_VK_F22            0x85
+#define NS_VK_F23            0x86
+#define NS_VK_F24            0x87
+
+#define NS_VK_NUM_LOCK       0x90
+#define NS_VK_SCROLL_LOCK    0x91
+
+#define NS_VK_COMMA          0xBC
+#define NS_VK_PERIOD         0xBE
+#define NS_VK_SLASH          0xBF
+#define NS_VK_BACK_QUOTE     0xC0
+#define NS_VK_OPEN_BRACKET   0xDB
+#define NS_VK_BACK_SLASH     0xDC
+#define NS_VK_CLOSE_BRACKET  0xDD
+#define NS_VK_QUOTE          0xDE
+
+#define NS_EVENT_FLAG_NONE          0x0000
+#define NS_EVENT_FLAG_INIT          0x0001
+#define NS_EVENT_FLAG_BUBBLE        0x0002
+#define NS_EVENT_FLAG_CAPTURE       0x0004
+#define NS_EVENT_FLAG_STOP_DISPATCH 0x0008
+#define NS_EVENT_FLAG_NO_DEFAULT    0x0010
+
+// IME Constants  -- keep in synch with nsIDOMTextRange.h
+#define NS_TEXTRANGE_CARETPOSITION				0x01
+#define NS_TEXTRANGE_RAWINPUT					0X02
+#define NS_TEXTRANGE_SELECTEDRAWTEXT			0x03
+#define NS_TEXTRANGE_CONVERTEDTEXT				0x04
+#define NS_TEXTRANGE_SELECTEDCONVERTEDTEXT		0x05
+
+#endif // nsGUIEvent_h__
+

mozilla/widget/public/nsIAppShell.idl

@@ -0,0 +1,122 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Mozilla browser.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Stuart Parmenter <pavlov@netscape.com>
+ */
+
+
+#include "nsISupports.idl"
+
+native int(int);
+[ptr] native nsDispatchListener(nsDispatchListener);
+[ptr] native nsIEventQueue(nsIEventQueue);
+[ptr] native UndefinednsIWidget(nsIWidget);
+[ref] native PRBoolRef(PRBool);
+[ref] native voidStarRef(void *);
+
+%{ C++
+#include "nsIEventQueue.h"
+
+/**
+ * Flags for the getNativeData function.
+ * See GetNativeData()
+ */
+#define NS_NATIVE_SHELL   0
+
+/**
+ * During the nsIAppShell Run method notify this listener 
+ * after each message dispatch.
+ * @see SetDispatchListener member function of nsIAppShell 
+ */
+class nsDispatchListener {
+public:
+  virtual void AfterDispatch() = 0;
+};
+
+class nsIWidget;
+%}
+
+
+[uuid(a0757c31-eeac-11d1-9ec1-00aa002fb821)]
+interface nsIAppShell : nsISupports
+{
+ /**
+  * Creates an application shell
+  */ 
+
+  void Create(inout int argc, inout string argv);
+
+ /**
+  * Enter an event loop.
+  * Don't leave until application exits.
+  */
+  
+  void Run();
+
+ /**
+  * Prepare to process events. 
+  */
+  
+  void Spinup();
+
+ /**
+  * Prepare to stop processing events.  
+  */
+  
+  void Spindown();
+
+ /**
+  * An event queue has been created or destroyed. Hook or unhook it from
+  * your system, as necessary.
+  * @param aQueue the queue in question
+  * @param aListen PR_TRUE for a new queue wanting hooking up. PR_FALSE
+  *                for a queue wanting to be unhooked.
+  */
+  void ListenToEventQueue(in nsIEventQueue aQueue, in PRBool aListen);
+
+ /**
+  * After event dispatch execute app specific code
+  */
+  
+  void GetNativeEvent(in PRBoolRef aRealEvent, in voidStarRef aEvent);
+
+ /**
+  * After event dispatch execute app specific code
+  */
+  
+  void DispatchNativeEvent(in PRBool aRealEvent, in voidStar aEvent);
+
+ /**
+  * After event dispatch execute app specific code
+  */
+  
+  void SetDispatchListener(in nsDispatchListener aDispatchListener);
+
+  /**
+   * Exit the handle event loop
+   */
+
+  void Exit();
+
+};
+
+#endif // nsIAppShell_h__
+
+

mozilla/widget/public/nsIButton.h

@@ -0,0 +1,63 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIButton_h__
+#define nsIButton_h__
+
+#include "nsIWidget.h"
+#include "nsString.h"
+
+// {18032AD0-B265-11d1-AA2A-000000000000}
+#define NS_IBUTTON_IID      \
+{ 0x18032ad0, 0xb265, 0x11d1, \
+    { 0xaa, 0x2a, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } }
+
+/**
+ * Push button widget.
+ * Automatically shows itself as depressed when clicked on.
+ */
+class nsIButton : public nsISupports {
+
+public:
+   NS_DEFINE_STATIC_IID_ACCESSOR(NS_IBUTTON_IID) 
+ 
+   /**
+    * Set the label
+    *
+    * @param  Set the label to aText
+    * @result NS_Ok if no errors
+    */
+  
+    NS_IMETHOD SetLabel(const nsString &aText) = 0;
+    
+   /**
+    * Get the button label
+    *
+    * @param aBuffer contains label upon return
+    * @result NS_Ok if no errors
+    */
+ 
+    NS_IMETHOD GetLabel(nsString &aBuffer) = 0;
+
+};
+
+#endif

mozilla/widget/public/nsICheckButton.h

@@ -0,0 +1,81 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsICheckButton_h__
+#define nsICheckButton_h__
+
+// {961085F5-BD28-11d1-97EF-00609703C14E}
+#define NS_ICHECKBUTTON_IID \
+{ 0x961085f5, 0xbd28, 0x11d1, { 0x97, 0xef, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
+
+#include "nsISupports.h"
+#include "nsIWidget.h"
+
+
+/**
+ * Checkbox widget. 
+ * Can show itself in a checked or unchecked state. 
+ * The checkbox widget does not automatically show itself checked or unchecked when clicked on.
+ */
+class nsICheckButton : public nsISupports {
+
+public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_ICHECKBUTTON_IID)
+    
+   /**
+    * Set the button label
+    *
+    * @param aText  button label
+    * @result set to NS_OK if method successful
+    */
+  
+    NS_IMETHOD SetLabel(const nsString &aText) = 0;
+    
+   /**
+    * Get the button label
+    *
+    * @param aBuffer contains label upon return
+    * @result set to NS_OK if method successful
+    */
+ 
+    NS_IMETHOD GetLabel(nsString &aBuffer) = 0;
+
+    /**
+     * Set the check state.
+     * @param aState PR_TRUE show as checked. PR_FALSE show unchecked.
+     * @result set to NS_OK if method successful
+     */
+
+    NS_IMETHOD SetState(const PRBool aState) = 0;
+    
+    /**
+     * Get the check state.
+     * @param aState PR_TRUE if checked. PR_FALSE if unchecked.
+     * @result set to NS_OK if method successful
+     */
+
+    NS_IMETHOD GetState(PRBool& aState) = 0;
+
+};
+
+#endif  // nsICheckButton_h__
+

mozilla/widget/public/nsIClipboard.idl

@@ -0,0 +1,88 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is Mozilla Communicator.
+ * 
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corp.  Portions created by Netscape are Copyright (C) 1999 Netscape 
+ * Communications Corp.  All Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Mike Pinkerton
+ */
+
+
+#include "nsISupports.idl"
+#include "nsISupportsArray.idl"
+#include "nsITransferable.idl"
+#include "nsIClipboardOwner.idl"
+
+
+[scriptable, uuid(8B5314BA-DB01-11d2-96CE-0060B0FB9956)]
+interface nsIClipboard : nsISupports
+{
+   /**
+    * Given a transferable, set the data on the native clipboard
+    *
+    * @param  aTransferable The transferable
+    * @param  anOwner The owner of the transferable
+    * @result NS_Ok if no errors
+    */
+  
+    void setData ( in nsITransferable aTransferable, in nsIClipboardOwner anOwner) ;
+
+   /**
+    * Given a transferable, get the clipboard data.
+    *
+    * @param  aTransferable The transferable
+    * @result NS_Ok if no errors
+    */
+  
+    void getData ( in nsITransferable aTransferable ) ;
+
+   /**
+    * This empties the clipboard and notifies the clipboard owner.
+    * This empties the "logical" clipboard. It does not clear the native clipboard.
+    *
+    * @result NS_OK if successful.
+    */
+  
+    void emptyClipboard ( ) ;
+
+   /**
+    * Some platforms support deferred notification for putting data on the clipboard
+    * This method forces the data onto the clipboard in its various formats
+    * This may be used if the application going away.
+    *
+    * @result NS_OK if successful.
+    */
+  
+    void forceDataToClipboard ( ) ;
+
+   /**
+    * This provides a way to give correct UI feedback about, for instance, a paste 
+    * should be allowed. It does _NOT_ actually retreive the data and should be a very
+    * inexpensive call. All it does is check if there is data on the clipboard matching
+    * any of the flavors in the given list.
+    *
+    * @aFlavorList - nsISupportsString's in a nsISupportsArray (for JavaScript).
+    * @outResult - if data is present matching one of 
+    * @result NS_OK if successful.
+    */
+    boolean hasDataMatchingFlavors ( in nsISupportsArray aFlavorList )  ;
+  
+};
+
+
+%{ C++
+
+%}

mozilla/widget/public/nsIClipboardOwner.idl

@@ -0,0 +1,45 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is Mozilla Communicator.
+ * 
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corp.  Portions created by Netscape are Copyright (C) 1999 Netscape 
+ * Communications Corp.  All Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Mike Pinkerton
+ */
+
+
+#include "nsISupports.idl"
+#include "nsITransferable.idl"
+
+
+[scriptable, uuid(5A31C7A1-E122-11d2-9A57-000064657374)]
+interface nsIClipboardOwner : nsISupports
+{
+   /**
+    * Notifies the owner of the clipboard transferable that the
+    * transferable is being removed from the clipboard
+    *
+    * @param  aTransferable The transferable
+    * @result NS_Ok if no errors
+    */
+  
+    void LosingOwnership ( in nsITransferable aTransferable ) ;
+};
+
+
+%{ C++
+
+%}

mozilla/widget/public/nsIComboBox.h

@@ -0,0 +1,141 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIComboBox_h__
+#define nsIComboBox_h__
+
+#include "nsIListWidget.h"
+#include "nsString.h"
+
+// {961085F6-BD28-11d1-97EF-00609703C14E}
+#define NS_ICOMBOBOX_IID \
+{ 0x961085f6, 0xbd28, 0x11d1, { 0x97, 0xef, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
+
+
+/**
+ * Initialize combobox data
+ */
+
+struct nsComboBoxInitData : public nsWidgetInitData {
+  nsComboBoxInitData()
+    : mDropDownHeight(0)
+  {
+  }
+
+  PRUint32 mDropDownHeight; // in pixels
+};
+
+/**
+ * Single selection drop down list. See nsIListWidget for capabilities 
+ */
+
+class nsIComboBox : public nsISupports {
+public:
+     NS_DEFINE_STATIC_IID_ACCESSOR(NS_ICOMBOBOX_IID);
+
+    /**
+     * Set an item at the specific position
+     *
+     * @param   aItem     the item name. The item has to be null terminated
+     * @param   aPosition the position the item should be inserted at
+     *                    0 is at the top of the list
+     *                    -1 is at the end of the list
+     */
+    NS_IMETHOD AddItemAt(nsString &aItem, PRInt32 aPosition) = 0;
+
+    /**
+     * Finds the first occurrence of the specified item
+     *
+     * @param   aItem     the string to be filled
+     * @param   aStartPos the starting position (index)
+     * @return  PR_TRUE if successful, PR_FALSE otherwise
+     *
+     */
+    virtual PRInt32  FindItem(nsString &aItem, PRInt32 aStartPos) = 0;
+
+    /**
+     * Returns the number of items in the list
+     *
+     * @return  the number of items
+     *
+     */
+    virtual PRInt32  GetItemCount() = 0;
+
+    /**
+     * Remove the first occurrence of the specified item
+     *
+     * @param   aPosition the item position
+     *                    0 is at the top of the list
+     *                    -1 is at the end of the list
+     *
+     * @return  PR_TRUE if successful, PR_FALSE otherwise
+     *
+     */
+    virtual PRBool RemoveItemAt(PRInt32 aPosition) = 0;
+
+    /**
+     * Gets an item at a specific location
+     *
+     * @param   anItem    on return contains the string of the item at that position
+     * @param   aPosition the Position of the item
+     *
+     */
+     virtual PRBool GetItemAt(nsString& anItem, PRInt32 aPosition) = 0;
+
+    /**
+     * Gets the selected item for a single selection list
+     *
+     * @param   aItem  on return contains the string of the selected item
+     *
+     */
+     NS_IMETHOD GetSelectedItem(nsString &aItem) = 0;
+
+    /**
+     * Returns with the index of the selected item
+     *
+     * @return  PRInt32, index of selected item
+     *
+     */
+    virtual PRInt32 GetSelectedIndex()  = 0;
+
+    /**
+     * Select the item at the specified position
+     *
+     * @param   PRInt32, the item position
+     *                   0 is at the top of the list
+     *                   -1 is at the end of the list
+     *
+     */
+    NS_IMETHOD SelectItem(PRInt32 aPosition)  = 0;
+
+    /**
+     * Deselects all the items in the list
+     *
+     */
+    NS_IMETHOD Deselect()  = 0;
+};
+
+
+#endif // nsIComboBox_h__
+
+
+

mozilla/widget/public/nsIContextMenu.h

@@ -0,0 +1,148 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIContextMenu_h__
+#define nsIContextMenu_h__
+
+#include "nsISupports.h"
+#include "nsString.h"
+#include "nsIDOMNode.h"
+#include "nsIDOMElement.h"
+#include "nsIWebShell.h"
+
+class nsIMenuBar;
+class nsIMenu;
+class nsIMenuItem;
+class nsIMenuListener;
+
+//Generate this!
+// {35A3DEC1-4992-11d2-8DBA-00609703C14E}
+#define NS_ICONTEXTMENU_IID      \
+{ 0x35a3dec1, 0x4992, 0x11d2, \
+  { 0x8d, 0xba, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
+
+/**
+ * Menu widget
+ */
+class nsIContextMenu : public nsISupports {
+
+  public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_ICONTEXTMENU_IID)
+
+  /**
+    * Creates the context menu
+    *
+    */
+    NS_IMETHOD Create(nsISupports * aParent, const nsString& anAlignment, const nsString& anAnchorAlignment) = 0;
+
+   /**
+    * Get the context menu's Parent
+    *
+    */
+    NS_IMETHOD GetParent(nsISupports *&aParent) = 0;
+
+   /**
+    * Adds a context menu Item
+    *
+    */
+    NS_IMETHOD AddItem(nsISupports* aItem) = 0;
+
+   /**
+    * Adds a separator
+    *
+    */
+    NS_IMETHOD AddSeparator() = 0;
+
+   /**
+    * Returns the number of context menu items
+    * This does count separators as items
+    */
+    NS_IMETHOD GetItemCount(PRUint32 &aCount) = 0;
+
+   /**
+    * Returns a Menu or Menu Item at a specified Index
+    *
+    */
+    NS_IMETHOD GetItemAt(const PRUint32 aPos, nsISupports *& aMenuItem) = 0;
+
+   /**
+    * Inserts a Menu Item at a specified Index
+    *
+    */
+    NS_IMETHOD InsertItemAt(const PRUint32 aPos, nsISupports * aMenuItem) = 0;
+
+   /**
+    * Removes an Menu Item from a specified Index
+    *
+    */
+    NS_IMETHOD RemoveItem(const PRUint32 aPos) = 0;
+
+   /**
+    * Removes all the Menu Items
+    *
+    */
+    NS_IMETHOD RemoveAll() = 0;
+
+   /**
+    * Gets Native MenuHandle
+    *
+    */
+    NS_IMETHOD  GetNativeData(void** aData) = 0;
+
+   /**
+    * Adds menu listener for dynamic construction
+    *
+    */
+    NS_IMETHOD AddMenuListener(nsIMenuListener * aMenuListener) = 0;
+
+   /**
+    * Removes menu listener for dynamic construction
+    *
+    */
+    NS_IMETHOD RemoveMenuListener(nsIMenuListener * aMenuListener) = 0;
+
+   /**
+    * Set location
+    *
+    */
+    NS_IMETHOD SetLocation(PRInt32 aX, PRInt32 aY) = 0;
+
+   /**
+    * Set DOMNode
+    *
+    */
+    NS_IMETHOD SetDOMNode(nsIDOMNode * aMenuNode) = 0;
+
+	/**
+    * Set DOMElement
+    *
+    */
+    NS_IMETHOD SetDOMElement(nsIDOMElement * aMenuElement) = 0;
+
+	/**
+    * Set WebShell
+    *
+    */
+    NS_IMETHOD SetWebShell(nsIWebShell * aWebShell) = 0;
+};
+
+#endif

mozilla/widget/public/nsIDragService.idl

@@ -0,0 +1,70 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is Mozilla Communicator.
+ * 
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corp.  Portions created by Netscape are Copyright (C) 1999 Netscape 
+ * Communications Corp.  All Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Mike Pinkerton
+ */
+
+#include "nsISupports.idl"
+#include "nsISupportsArray.idl"
+#include "nsIDragSession.idl"
+#include "nsIScriptableRegion.idl"
+
+
+[scriptable, uuid(8B5314BB-DB01-11d2-96CE-0060B0FB9956)]
+interface nsIDragService : nsISupports
+{
+  const long DRAGDROP_ACTION_NONE = 0;
+  const long DRAGDROP_ACTION_COPY = 1;
+  const long DRAGDROP_ACTION_MOVE = 2;
+  const long DRAGDROP_ACTION_LINK = 4;
+  
+  /**
+    * Starts a modal drag session with an array of transaferables 
+    *
+    * @param  aTransferables - an array of transferables to be dragged
+    * @param  aRegion - a region containing rectangles for cursor feedback, 
+    *            in window coordinates.
+    * @param  aActionType - specified which of copy/move/link are allowed
+    */
+  void invokeDragSession ( in nsISupportsArray aTransferables, 
+                             in nsIScriptableRegion aRegion, in unsigned long aActionType );
+
+  /**
+    * Returns the current Drag Session  
+    */
+  nsIDragSession getCurrentSession ( ) ;
+
+  /**
+    * Tells the Drag Service to start a drag session. This is called when
+    * an external drag occurs
+    */
+  void startDragSession ( ) ;
+
+  /**
+    * Tells the Drag Service to end a drag session. This is called when
+    * an external drag occurs
+    */
+  void endDragSession ( ) ;
+  
+};
+
+
+%{ C++
+
+%}

mozilla/widget/public/nsIDragSession.idl

@@ -0,0 +1,80 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is Mozilla Communicator.
+ * 
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corp.  Portions created by Netscape are Copyright (C) 1999 Netscape 
+ * Communications Corp.  All Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Mike Pinkerton
+ */
+
+#include "nsISupports.idl"
+#include "nsISupportsArray.idl"
+#include "nsITransferable.idl"
+
+%{ C++
+#include "nsSize.h"
+%}
+
+native nsSize (nsSize);
+
+
+[scriptable, uuid(CBA22C53-FCCE-11d2-96D4-0060B0FB9956)]
+interface nsIDragSession : nsISupports
+{
+  /**
+    * Set the current state of the drag whether it can be dropped or not.
+    * usually the target "frame" sets this so the native system can render the correct feedback
+    */
+  attribute boolean canDrop;
+  
+  /**
+    * Sets the action (copy, move, link, et.c) for the current drag 
+    */ 
+  attribute unsigned long dragAction;
+  
+  /**
+    * Sets the current width and height if the drag target area. 
+    * It will contain the current size of the Frame that the drag is currently in
+    */  
+  attribute nsSize targetSize;
+ 
+  /**
+    * Get the number items that were dropped
+    */
+  readonly attribute unsigned long numDropItems;
+
+  /**
+    * Get data from a Drag&Drop. Can be called while the drag is in process
+    * or after the drop has completed.  
+    *
+    * @param  aTransferable the transferable for the data to be put into
+    * @param  aItemIndex which of multiple drag items, zero-based
+    */
+  void getData ( in nsITransferable aTransferable, in unsigned long aItemIndex ) ;
+
+   /**
+    * Check to set if ant of the native data on the clipboard matches this data flavor
+    *
+    * @result NS_OK if if the data flavor is supported and, NS_ERROR_FAILURE is it is not
+    */
+  boolean isDataFlavorSupported ( in string aDataFlavor ) ;
+  
+};
+
+
+%{ C++
+
+%}

mozilla/widget/public/nsIDragSessionMac.h

@@ -0,0 +1,51 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIDragSessionMac_h__
+#define nsIDragSessionMac_h__
+
+#include "nsISupports.h"
+#include <Drag.h>
+
+
+#define NS_IDRAGSESSIONMAC_IID      \
+{ 0x36c4c380, 0x09e2, 0x11d3, { 0xb0, 0x33, 0xa4, 0x20, 0xf4, 0x2c, 0xfd, 0x7c } };
+
+
+class nsIDragSessionMac : public nsISupports {
+
+  public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDRAGSESSIONMAC_IID)
+
+  /**
+    * Since the drag may originate in an external application, we need some way of
+    * communicating the DragManager's DragRef to the session so it can use it
+    * when filling in data requests.
+    *
+    * @param  aDragRef the MacOS DragManager's ref number for the current drag
+    */
+
+   NS_IMETHOD SetDragReference ( DragReference aDragRef ) = 0; 
+
+};
+
+#endif

mozilla/widget/public/nsIEventListener.h

@@ -0,0 +1,52 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIEventListener_h__
+#define nsIEventListener_h__
+
+#include "nsISupports.h"
+#include "nsGUIEvent.h"
+
+/**
+ * Event listener interface.
+ * Alternative to a callback for recieving events.
+ */
+
+// {c83f6b80-d7ce-11d2-8360-c4c894c4917c}
+#define NS_IEVENTLISTENER_IID \
+{ 0xc83f6b80, 0xd7ce, 0x11d2, { 0x83, 0x60, 0xc4, 0xc8, 0x94, 0xc4, 0x91, 0x7c } }
+
+class nsIEventListener : public nsISupports {
+public:
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IEVENTLISTENER_IID)
+  
+ /**
+  * Processes all events. 
+  * If a mouse listener is registered this method will not process mouse events. 
+  * @param anEvent the event to process. See nsGUIEvent.h for event types.
+  */
+
+  virtual nsEventStatus ProcessEvent(const nsGUIEvent & anEvent) = 0;
+
+};
+
+#endif // nsIEventListener_h__

mozilla/widget/public/nsIFileDialogsMgr.h

@@ -0,0 +1,75 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIFileDialogsMgr_h__
+#define nsIFileDialogsMgr_h__
+
+#include "nsISupports.h"
+#include "nsFileSpec.h"
+
+// {0ef98781-e34b-11d2-b345-00a0cc3c1cde}
+#define NS_IFILEDIALOGSMGR_IID \
+{ 0xef98781, 0xe34b, 0x11d2, { 0xb3, 0x45, 0x0, 0xa0, 0xcc, 0x3c, 0x1c, 0xde } }
+
+#define NS_FILEDIALOGSMGR_CID      \
+{ 0xef98784, 0xe34b, 0x11d2, { 0xb3, 0x45, 0x0, 0xa0, 0xcc, 0x3c, 0x1c, 0xde } }
+
+enum nsFileDlgResults {
+  nsFileDlgResults_Cancel,    // User hit cancel, ignore selection
+  nsFileDlgResults_OK,        // User hit Ok, process selection 
+  nsFileDlgResults_Replace    // User acknowledged file already exists so ok to replace, process selection
+};
+
+/**
+ * (native) File Dialogs utility.
+ * Provides an XP wrapper to platform native file dialogs:
+ *  GetFile   - Presents a file browser and returns an nsFileSpec for the selected file
+ *  GetFolder - Presents a folder/path selection dialog and returns an nsFileSpec
+ *  PutFile   - Presents a file save dialog to the user and returns an nsFileSpec with
+ *              the name and path to save the file
+ * 
+ */
+
+class nsIFileDialogsMgr : public nsISupports
+{
+public:
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFILEDIALOGSMGR_IID)
+    
+  NS_IMETHOD GetFile(
+    nsFileSpec       & theFileSpec,     // Populate with initial path for file dialog
+    nsFileDlgResults & theResult,       // Result from the file selection dialog prompt
+    const nsString   * promptString,    // Window title for file selection dialog
+    void             * filterList) = 0;
+    
+  NS_IMETHOD GetFolder(
+    nsFileSpec       & theFileSpec,     // Populate with initial path for file dialog 
+    nsFileDlgResults & theResult,       // Result from the folder selection dialog prompt
+    const nsString   * promptString) = 0;  // Window title for folder selection dialog
+    
+  NS_IMETHOD PutFile(
+    nsFileSpec       & theFileSpec,     // Populate with initial path for file dialog 
+    nsFileDlgResults & theResult,       // Result from the file save dialog prompt
+    const nsString   * promptString) = 0;  // Window title for file save dialog
+
+};
+
+#endif // nsIFileDialogsMgr_h__

mozilla/widget/public/nsIFilePicker.idl

@@ -0,0 +1,96 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Mozilla browser.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation. Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Stuart Parmenter <pavlov@netscape.com>
+ */
+
+#include "nsISupports.idl"
+#include "nsIFileSpec.idl"
+
+interface nsIDOMWindow;
+
+[scriptable, uuid(c47de916-1dd1-11b2-8141-82507fa02b21)]
+interface nsIFilePicker : nsISupports
+{
+  const short modeLoad        = 0;              // Load a file or directory
+  const short modeSave        = 1;              // Save a file or directory
+  const short modeGetFolder   = 2;              // Select a fodler/directory
+
+  const short returnOK        = 0;              // User hit cancel, ignore selection
+  const short returnCancel    = 1;              // User hit Ok, process selection
+  const short returnReplace   = 2;              // User acknowledged file already exists so ok to replace, process selection
+
+ /**
+  * Create the file widget.
+  *
+  * @param      parent   nsIDOMWindow parent.  This dialog should be dependant on this parent.
+  * @param      title    The title for the file widget
+  * @param      mode     load, save, or get folder
+  *
+  */
+  void create(in nsIDOMWindow parent, in wstring title, in short mode);
+
+ /**
+  * Set the list of file filters 
+  *
+  * @param      titles           array of filter titles
+  * @param      filters          array of filters to associate with titles 
+  * @param      numberOfFilters  number of filters.  
+  *
+  */
+  void setFilterList(in long numberOfFilters,
+                     [array, size_is(numberOfFilters)] in wstring titles,
+                     [array, size_is(numberOfFilters)] in wstring filters);
+
+ /**
+  * Get the index into the filter list for the type of file the user wants to save
+  *
+  * @param      selectedFilter    the index of the selected item in the filter list
+  *
+  */
+  readonly attribute long selectedFilter;
+
+  /* what is this? */
+  attribute wstring defaultString;
+
+ /**
+  * Set the directory that the file open/save dialog initially displays
+  *
+  * @param      displayDirectory  the name of the directory
+  *
+  */
+  attribute nsIFileSpec displayDirectory;
+
+
+ /**
+  * Get the nsFileSpec for the file or directory.
+  *
+  * @return Returns the file currently selected
+  */
+  readonly attribute nsIFileSpec file;
+
+ /**
+  * Show File Dialog. The dialog is displayed modally.
+  *
+  * @return returnOK if the user selects OK, returnCancel if the user selects cancel
+  *
+  */
+  short show();
+};

mozilla/widget/public/nsIFileSpecWithUI.idl

@@ -0,0 +1,112 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+// This is the only correct cross-platform way to specify a file.
+// Strings are not such a way. If you grew up on windows or unix, you
+// may think they are. Welcome to reality.
+
+#include "nsIFileSpec.idl"
+
+%{C++
+#include "nscore.h" // for NS_WIDGET
+#include "nsIComponentManager.h"
+%}
+native StandardFilterMask(nsIFileSpecWithUI::StandardFilterMask);
+
+[scriptable, uuid(8ddf7681-139a-11d3-915f-dc1f8c138b7c)]
+interface nsIFileSpecWithUI : nsIFileSpec
+{
+%{C++
+	//
+	// The "choose" functions present the file picker UI in order to set the
+	// value of the file spec.
+%}
+
+%{C++
+	// The mask for standard filters is given as follows:
+	enum StandardFilterMask
+	{
+		eAllReadable		= (1<<0)
+	,	eHTMLFiles			= (1<<1)
+	,	eXMLFiles			= (1<<2)
+	,	eImageFiles			= (1<<3)
+    ,   eMailFiles          = (1<<4)
+    ,   eTextFiles          = (1<<5)
+	,	eAllFiles			= (1<<6)
+	
+	// Mask containing all the above default filters
+	,	eAllStandardFilters = (
+							  eAllReadable
+							| eHTMLFiles
+							| eXMLFiles
+							| eImageFiles
+                            | eMailFiles
+                            | eTextFiles
+							| eAllFiles)
+    ,   eAllMailOutputFilters = (
+                                 eHTMLFiles
+                               | eMailFiles
+                               | eTextFiles)
+	
+	// The "extra filter" bit should be set if the "extra filter"
+	// is passed in to chooseInputFile.
+	,   eExtraFilter        = (1<<31)
+	};
+	enum { kNumStandardFilters = 7, kNumMailFilters = 3 };
+%}
+	[noscript] void chooseInputFile(
+		in string title
+	,	in StandardFilterMask standardFilterMask
+	,	in string extraFilterTitle
+	,	in string extraFilter
+		);
+
+	[noscript] void chooseOutputFile(in string windowTitle, 
+                                     in string suggestedLeafName,
+                                     in StandardFilterMask standardFilterMask);
+
+  string chooseFile(in string title);
+	string chooseDirectory(in string title);
+};
+	
+%{C++
+// Define Progid and CID
+// {e3326a80-2816-11d3-a7e5-98cb48c74f3c}
+#define NS_FILESPECWITHUI_CID \
+{ 0xe3326a80, 0x2816, 0x11d3, { 0xa7, 0xe5, 0x98, 0xcb, 0x48, 0xc7, 0x4f, 0x3c } }
+
+#define NS_FILESPECWITHUI_PROGID "component://netscape/filespecwithui"
+#define NS_FILESPECWITHUI_CLASSNAME "nsIFileSpecWithUI"
+
+// Factory methods
+inline nsIFileSpecWithUI* NS_CreateFileSpecWithUI()
+{
+     nsIFileSpecWithUI* spec = nsnull;
+     nsresult rv = nsComponentManager::CreateInstance(
+     	(const char*)NS_FILESPECWITHUI_PROGID,
+     	(nsISupports*)nsnull,
+     	(const nsID&)nsIFileSpecWithUI::GetIID(),
+     	(void**)&spec);
+     NS_ASSERTION(NS_SUCCEEDED(rv), "ERROR: Could not make a file spec.");
+     return spec;
+}
+%}

mozilla/widget/public/nsIFileWidget.h

@@ -0,0 +1,178 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIFileWidget_h__
+#define nsIFileWidget_h__
+
+#include "nsString.h"
+#include "nsFileSpec.h"
+
+class nsIWidget;
+class nsIDeviceContext;
+class nsIAppShell;
+class nsIToolkit;
+
+// {F8030015-C342-11d1-97F0-00609703C14E}
+#define NS_IFILEWIDGET_IID \
+{ 0xf8030015, 0xc342, 0x11d1, { 0x97, 0xf0, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
+
+
+/**
+ * File selector mode 
+ */
+
+enum nsFileDlgMode {
+        /// Load a file or directory
+      eMode_load,
+        /// Save a file or directory
+      eMode_save,
+        /// Select a fodler/directory
+      eMode_getfolder
+      };
+
+
+enum nsFileDlgResults {
+  nsFileDlgResults_Cancel,    // User hit cancel, ignore selection
+  nsFileDlgResults_OK,        // User hit Ok, process selection 
+  nsFileDlgResults_Replace    // User acknowledged file already exists so ok to replace, process selection
+};
+
+/**
+ * File selector widget.
+ * Modally selects files for loading or saving from a list.
+ */
+
+class nsIFileWidget : public nsISupports 
+{
+
+public:
+
+  
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFILEWIDGET_IID)
+
+ /**
+  * Create the file filter. This differs from the standard
+  * widget Create method because it passes in the mode
+  *
+  * @param      aParent  the parent to place this widget into
+  * @param      aTitle   The title for the file widget
+  * @param      aMode    load or save              
+  * @return     void
+  *
+  */
+  NS_IMETHOD Create(nsIWidget *aParent,
+                      const nsString& aTitle,
+                      nsFileDlgMode aMode,
+                      nsIDeviceContext *aContext = nsnull,
+                      nsIAppShell *aAppShell = nsnull,
+                      nsIToolkit *aToolkit = nsnull,
+                      void *aInitData = nsnull) = 0;
+
+
+ /**
+  * Set the list of file filters 
+  *
+  * @param      aNumberOfFilter  number of filters.
+  * @param      aTitle           array of filter titles
+  * @param      aFilter          array of filters to associate with titles            
+  * @return     void
+  *
+  */
+
+  NS_IMETHOD SetFilterList(PRUint32 aNumberOfFilters,const nsString aTitles[],const nsString aFilters[]) = 0;
+
+  
+ /**
+  * Get the index into the filter list for the type of file the user wants to save
+  *
+  * @param      theType          the index into the filter list
+  * @return     void
+  *
+  */
+
+  NS_IMETHOD GetSelectedType(PRInt16& theType) = 0;
+
+ /**
+  * Show File Dialog. The dialog is displayed modally.
+  *
+  * @return PR_TRUE if user selects OK, PR_FALSE if user selects CANCEL
+  *
+  */
+
+  virtual PRBool Show() = 0;
+
+ /**
+  * Get the nsFileSpec for the file or directory.
+  *
+  * @param aFile on exit it contains the file or directory selected
+  */
+  
+  NS_IMETHOD GetFile(nsFileSpec& aFile) = 0;
+
+
+ /**
+  * Set the default string that appears in file open/save dialog 
+  *
+  * @param      aString          the name of the file
+  * @return     void
+  *
+  */
+  NS_IMETHOD SetDefaultString(const nsString& aString) = 0;
+
+ /**
+  * Set the directory that the file open/save dialog initially displays
+  *
+  * @param      aDirectory          the name of the directory
+  * @return     void
+  *
+  */
+  NS_IMETHOD SetDisplayDirectory(const nsFileSpec& aDirectory) = 0;
+
+ /**
+  * Get the directory that the file open/save dialog was last displaying
+  *
+  * @param      aDirectory          the name of the directory
+  * @return     void
+  *
+  */
+  NS_IMETHOD GetDisplayDirectory(nsFileSpec& aDirectory) = 0;
+
+
+  virtual nsFileDlgResults GetFile(
+    nsIWidget        * aParent,
+    const nsString   & promptString,    // Window title for the dialog
+    nsFileSpec       & theFileSpec) = 0;     // Populate with initial path for file dialog
+    
+  virtual nsFileDlgResults GetFolder(
+    nsIWidget        * aParent,
+    const nsString   & promptString,    // Window title for the dialog
+    nsFileSpec       & theFileSpec) = 0;     // Populate with initial path for file dialog 
+    
+  virtual nsFileDlgResults PutFile(
+    nsIWidget        * aParent,
+    const nsString   & promptString,    // Window title for the dialog
+    nsFileSpec       & theFileSpec) = 0;     // Populate with initial path for file dialog 
+
+};
+
+#endif // nsIFileWidget_h__
+

mozilla/widget/public/nsIFontNameIterator.h

@@ -0,0 +1,51 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIFontNameIterator_h__
+#define nsIFontNameIterator_h__
+
+#include "nsISupports.h"
+class nsString;
+
+// {CEEB39D1-0949-11d3-9A87-0050046CDA96}
+#define NS_IFONTNAMEITERATOR_IID \
+{ 0xceeb39d1, 0x949, 0x11d3, { 0x9a, 0x87, 0x0, 0x50, 0x4, 0x6c, 0xda, 0x96 } };
+
+class nsIFontNameIterator : public nsISupports
+		// Fonts are identified by strings, |Get| and |Advance| are distinct to facility wrapping
+		//	with C++ objects as standard iterators.
+	{
+		public:
+      NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFONTNAMEITERATOR_IID)
+
+			NS_IMETHOD Reset() = 0;
+				// does not need to be called initially, returns iterator to initial state
+
+		  NS_IMETHOD Get( nsString* aFontName ) = 0;
+				// returns an error when no more names are available
+
+			NS_IMETHOD Advance() = 0;
+				// returns an error when no more names are available
+	};
+
+
+#endif

mozilla/widget/public/nsIFontRetrieverService.h

@@ -0,0 +1,50 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIFontRetrieverService_h__
+#define nsIFontRetrieverService_h__
+
+#include "nsISupports.h"
+
+class nsIFontNameIterator;
+class nsIFontSizeIterator;
+class nsString;
+
+// {285EF9B2-094A-11d3-9A87-0050046CDA96}
+#define NS_IFONTRETRIEVERSERVICE_IID \
+{ 0x285ef9b2, 0x94a, 0x11d3, { 0x9a, 0x87, 0x0, 0x50, 0x4, 0x6c, 0xda, 0x96 } };
+
+class nsIFontRetrieverService : public nsISupports
+		// This (singleton) service exists soley as a factory to manufacture iterators
+{
+		public:
+      NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFONTRETRIEVERSERVICE_IID)
+
+			NS_IMETHOD CreateFontNameIterator( nsIFontNameIterator** aIterator ) = 0;
+
+			NS_IMETHOD CreateFontSizeIterator( const nsString &aFontName, nsIFontSizeIterator** aIterator ) = 0;
+
+			NS_IMETHOD IsFontScalable( const nsString &aFontName, PRBool* aResult ) = 0;	
+};
+
+
+#endif

mozilla/widget/public/nsIFontSizeIterator.h

@@ -0,0 +1,51 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIFontSizeIterator_h__
+#define nsIFontSizeIterator_h__
+
+#include "nsISupports.h"
+class nsString;
+
+// {285EF9B1-094A-11d3-9A87-0050046CDA96}
+#define NS_IFONTSIZEITERATOR_IID \
+{ 0x285ef9b1, 0x94a, 0x11d3, { 0x9a, 0x87, 0x0, 0x50, 0x4, 0x6c, 0xda, 0x96 } };
+
+class nsIFontSizeIterator : public nsISupports
+		// Font sizes are identified with doubles (e.g., for the possibility of fractional sizes from MM, etc.).
+		//	|Get| and |Advance| are distinct to facility wrapping with C++ objects as standard iterators.
+	{
+		public:
+      NS_DEFINE_STATIC_IID_ACCESSOR(NS_IFONTSIZEITERATOR_IID)
+
+			NS_IMETHOD Reset() = 0;
+				// does not need to be called initially, returns iterator to initial state
+
+			NS_IMETHOD Get( double* aFontSize ) = 0;
+				// returns an error when no more sizes are available
+
+			NS_IMETHOD Advance() = 0;
+				// returns an error when no more sizes are available
+	};
+
+
+#endif

mozilla/widget/public/nsIFormatConverter.idl

@@ -0,0 +1,69 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#include "nsISupports.idl"
+#include "nsISupportsArray.idl"
+
+
+[scriptable, uuid(948A0023-E3A7-11d2-96CF-0060B0FB9956)]
+interface nsIFormatConverter : nsISupports
+{  
+  /**
+    * Get the list of the "input" data flavors (mime types as nsISupportsString),
+    * in otherwords, the flavors that this converter can convert "from" (the 
+    * incoming data to the converter).
+    */
+  nsISupportsArray getInputDataFlavors ( ) ;
+
+  /**
+    * Get the list of the "output" data flavors (mime types as nsISupportsString),
+    * in otherwords, the flavors that this converter can convert "to" (the 
+    * outgoing data to the converter).
+    *
+    * @param  aDataFlavorList fills list with supported flavors
+    */
+  nsISupportsArray getOutputDataFlavors ( ) ;
+
+  /**
+    * Determines whether a converion from one flavor to another is supported
+    *
+    * @param  aFromFormatConverter flavor to convert from
+    * @param  aFromFormatConverter flavor to convert to
+    */
+  boolean canConvert ( in string aFromDataFlavor, in string aToDataFlavor ) ;
+
+  /**
+    * Converts from one flavor to another.
+    *
+    * @param  aFromFormatConverter flavor to convert from
+    * @param  aFromFormatConverter flavor to convert to (destination own the memory)
+    * @returns returns NS_OK if it was converted
+    */
+  void convert ( in string aFromDataFlavor, in nsISupports aFromData, in unsigned long aDataLen,
+                   in string aToDataFlavor, out nsISupports aToData, out unsigned long aDataToLen ) ; 
+
+};
+
+
+%{ C++
+
+%}

mozilla/widget/public/nsIKeyBindMgr.h

@@ -0,0 +1,60 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the 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) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIKeyBindMgr_h__
+#define nsIKeyBindMgr_h__
+
+#include "nsISupports.h"
+#include "nsIDOMNode.h"
+#include "nsGUIEvent.h"
+#include "nsIWebShell.h"
+#include "nsIContent.h"
+
+// {a91c0821-de58-11d2-b345-00a0cc3c1cde}
+#define NS_IKEYBINDMGR_IID \
+{ 0xa91c0821, 0xde58, 0x11d2, \
+{ 0xb3, 0x45, 0x0, 0xa0, 0xcc, 0x3c, 0x1c, 0xde } }
+
+// {8B5314BD-DB01-11d2-96CE-0060B0FB9977}
+#define NS_KEYBINDMGR_CID      \
+{ 0x8b5314bd, 0xdb01, 0x11d2, { 0x96, 0xce, 0x0, 0x60, 0xb0, 0xfb, 0x99, 0x77 } }
+
+/**
+ * Keyboard Binding utility.
+ * Given a key event and a DOM node to search executes any 'key' command
+ * that matches the event
+ */
+
+class nsIKeyBindMgr : public nsISupports
+{
+public:
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_IKEYBINDMGR_IID)
+    
+  NS_IMETHOD ProcessKeyEvent(
+    nsIDOMDocument   * domDoc, 
+    const nsKeyEvent & theEvent, 
+    nsIWebShell      * webShell,  
+    nsEventStatus    & theStatus) = 0;
+
+};
+
+#endif // nsIKeyBindMgr_h__

mozilla/widget/public/nsILabel.h

@@ -0,0 +1,91 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsILabel_h__
+#define nsILabel_h__
+
+#include "nsIWidget.h"
+#include "nsString.h"
+
+/* F3131891-3DC7-11d2-8DB8-00609703C14E */
+#define NS_ILABEL_IID \
+{ 0xf3131891, 0x3dc7, 0x11d2, \
+    { 0x8d, 0xb8, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
+
+/**
+ * Label Alignments 
+ */
+
+enum nsLabelAlignment {   
+    eAlign_Right,
+    eAlign_Left,
+    eAlign_Center
+  }; 
+
+struct nsLabelInitData : public nsWidgetInitData {
+  nsLabelInitData()
+    : mAlignment(eAlign_Left)
+  {
+  }
+
+  nsLabelAlignment mAlignment;
+};
+
+/**
+ * Label widget.
+ * Automatically shows itself as depressed when clicked on.
+ */
+class nsILabel : public nsISupports {
+
+  public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_ILABEL_IID)
+ 
+   /**
+    * Set the label
+    *
+    * @param  Set the label to aText
+    * @result NS_Ok if no errors
+    */
+  
+    NS_IMETHOD SetLabel(const nsString &aText) = 0;
+    
+   /**
+    * Get the button label
+    *
+    * @param aBuffer contains label upon return
+    * @result NS_Ok if no errors
+    */
+ 
+    NS_IMETHOD GetLabel(nsString &aBuffer) = 0;
+
+
+   /**
+    * Set the Label Alignemnt for creation
+    *
+    * @param aAlignment the alignment
+    * @result NS_Ok if no errors
+    */
+    NS_IMETHOD SetAlignment(nsLabelAlignment aAlignment) = 0;
+
+};
+
+#endif

mozilla/widget/public/nsIListBox.h

@@ -0,0 +1,183 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIListBox_h__
+#define nsIListBox_h__
+
+#include "nsIListWidget.h"
+#include "nsString.h"
+
+// {F8030014-C342-11d1-97F0-00609703C14E}
+#define NS_ILISTBOX_IID \
+{ 0xf8030014, 0xc342, 0x11d1, { 0x97, 0xf0, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
+
+
+/**
+ * Initialize list box data
+ */
+
+struct nsListBoxInitData : public nsWidgetInitData {
+  nsListBoxInitData()
+    : mMultiSelect(PR_FALSE)
+  {
+  }
+
+  PRBool mMultiSelect;
+};
+
+/**
+ * Single or multi selection list of items.
+ * Unlike a nsIWidget, The the list widget must automatically clear 
+ * itself to the background color when paint messages are generated.
+ * The listbox always has a vertical scrollbar. It never has a
+ * horizontal scrollbar.
+ */
+
+class nsIListBox : public nsISupports {
+
+public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_ILISTBOX_IID)
+
+    /**
+     * Set an item at the specific position
+     *
+     * @param   aItem     the item name. The item has to be null terminated
+     * @param   aPosition the position the item should be inserted at
+     *                    0 is at the top of the list
+     *                    -1 is at the end of the list
+     */
+    NS_IMETHOD AddItemAt(nsString &aItem, PRInt32 aPosition) = 0;
+
+    /**
+     * Finds the first occurrence of the specified item
+     *
+     * @param   aItem     the string to be filled
+     * @param   aStartPos the starting position (index)
+     * @return  PR_TRUE if successful, PR_FALSE otherwise
+     *
+     */
+    virtual PRInt32  FindItem(nsString &aItem, PRInt32 aStartPos) = 0;
+
+    /**
+     * Returns the number of items in the list
+     *
+     * @return  the number of items
+     *
+     */
+    virtual PRInt32  GetItemCount() = 0;
+
+    /**
+     * Remove the first occurrence of the specified item
+     *
+     * @param   aPosition the item position
+     *                    0 is at the top of the list
+     *                    -1 is at the end of the list
+     *
+     * @return  PR_TRUE if successful, PR_FALSE otherwise
+     *
+     */
+    virtual PRBool RemoveItemAt(PRInt32 aPosition) = 0;
+
+    /**
+     * Gets an item at a specific location
+     *
+     * @param   anItem    on return contains the string of the item at that position
+     * @param   aPosition the Position of the item
+     *
+     */
+     virtual PRBool GetItemAt(nsString& anItem, PRInt32 aPosition) = 0;
+
+    /**
+     * Gets the selected item for a single selection list
+     *
+     * @param   aItem  on return contains the string of the selected item
+     *
+     */
+     NS_IMETHOD GetSelectedItem(nsString &aItem) = 0;
+
+    /**
+     * Returns with the index of the selected item
+     *
+     * @return  PRInt32, index of selected item
+     *
+     */
+    virtual PRInt32 GetSelectedIndex()  = 0;
+
+    /**
+     * Select the item at the specified position
+     *
+     * @param   PRInt32, the item position
+     *                   0 is at the top of the list
+     *                   -1 is at the end of the list
+     *
+     */
+    NS_IMETHOD SelectItem(PRInt32 aPosition)  = 0;
+
+    /**
+     * Deselects all the items in the list
+     *
+     */
+    NS_IMETHOD Deselect()  = 0;
+
+
+    /**
+     * Set the listbox to be multi-select.
+     * @param   aMultiple PR_TRUE can have multiple selections. PR_FALSE single
+     *          selections only.
+     * @return  void
+     *
+     */
+
+    NS_IMETHOD  SetMultipleSelection(PRBool aMultipleSelections) = 0;
+
+    /**
+     * Return the number of selected items. For single selection list box this
+     * @return the number of selected items
+     * can be 1 or 0. 
+     *
+     */
+    virtual PRInt32  GetSelectedCount() = 0;
+
+    /**
+     * Retrieves the indices of the selected items.
+     * @param aIndices Array to hold the selected items. Use GetSelectedCount to
+     *        determine how large the array needs to be.
+     * @param aSize Size of the aIndices array
+     *
+     */
+    NS_IMETHOD  GetSelectedIndices(PRInt32 aIndices[], PRInt32 aSize) = 0;
+
+    /**
+     * Sets the indices of the selected items.
+     * @param aIndices Array to hold the selected items. Use GetSelectedCount to
+     *        determine how large the array needs to be.
+     * @param aSize Size of the aIndices array
+     *
+     */
+    NS_IMETHOD  SetSelectedIndices(PRInt32 aIndices[], PRInt32 aSize) = 0;
+
+};
+
+#endif // nsIListBox_h__
+
+
+

mozilla/widget/public/nsIListWidget.h

@@ -0,0 +1,130 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIListWidget_h__
+#define nsIListWidget_h__
+
+#include "nsIWidget.h"
+#include "nsString.h"
+
+// {F8030013-C342-11d1-97F0-00609703C14E}
+#define NS_ILISTWIDGET_IID \
+{ 0xf8030013, 0xc342, 0x11d1, { 0x97, 0xf0, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
+
+/**
+ * 
+ * Base class for nsIListBox and nsIComboBox
+ *
+ */
+
+class nsIListWidget : public nsISupports {
+
+public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_ILISTWIDGET_IID)
+
+    /**
+     * Set an item at the specific position
+     *
+     * @param   aItem     the item name. The item has to be null terminated
+     * @param   aPosition the position the item should be inserted at
+     *                    0 is at the top of the list
+     *                    -1 is at the end of the list
+     */
+    NS_IMETHOD AddItemAt(nsString &aItem, PRInt32 aPosition) = 0;
+
+    /**
+     * Finds the first occurrence of the specified item
+     *
+     * @param   aItem     the string to be filled
+     * @param   aStartPos the starting position (index)
+     * @return  PR_TRUE if successful, PR_FALSE otherwise
+     *
+     */
+    virtual PRInt32  FindItem(nsString &aItem, PRInt32 aStartPos) = 0;
+
+    /**
+     * Returns the number of items in the list
+     *
+     * @return  the number of items
+     *
+     */
+    virtual PRInt32  GetItemCount() = 0;
+
+    /**
+     * Remove the first occurrence of the specified item
+     *
+     * @param   aPosition the item position
+     *                    0 is at the top of the list
+     *                    -1 is at the end of the list
+     *
+     * @return  PR_TRUE if successful, PR_FALSE otherwise
+     *
+     */
+    virtual PRBool RemoveItemAt(PRInt32 aPosition) = 0;
+
+    /**
+     * Gets an item at a specific location
+     *
+     * @param   anItem    on return contains the string of the item at that position
+     * @param   aPosition the Position of the item
+     *
+     */
+     virtual PRBool GetItemAt(nsString& anItem, PRInt32 aPosition) = 0;
+
+    /**
+     * Gets the selected item for a single selection list
+     *
+     * @param   aItem  on return contains the string of the selected item
+     *
+     */
+     NS_IMETHOD GetSelectedItem(nsString &aItem) = 0;
+
+    /**
+     * Returns with the index of the selected item
+     *
+     * @return  PRInt32, index of selected item
+     *
+     */
+    virtual PRInt32 GetSelectedIndex()  = 0;
+
+    /**
+     * Select the item at the specified position
+     *
+     * @param   PRInt32, the item position
+     *                   0 is at the top of the list
+     *                   -1 is at the end of the list
+     *
+     */
+    NS_IMETHOD SelectItem(PRInt32 aPosition)  = 0;
+
+    /**
+     * Deselects all the items in the list
+     *
+     */
+    NS_IMETHOD Deselect()  = 0;
+
+};
+
+#endif // nsIListWidget_h__
+
+
+

mozilla/widget/public/nsILookAndFeel.h

@@ -0,0 +1,161 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef __nsILookAndFeel
+#define __nsILookAndFeel
+#include "nsISupports.h"
+#include "nsColor.h"
+#include "nsFont.h"
+
+#ifdef NS_DEBUG
+#include "nsSize.h"
+#endif
+
+
+// {21B51DE1-21A3-11d2-B6E0-00805F8A2676}
+#define NS_ILOOKANDFEEL_IID \
+{ 0x21b51de1, 0x21a3, 0x11d2, \
+    { 0xb6, 0xe0, 0x0, 0x80, 0x5f, 0x8a, 0x26, 0x76 } }
+
+class nsILookAndFeel: public nsISupports {
+public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_ILOOKANDFEEL_IID)
+
+  typedef enum {
+    eColor_WindowBackground,
+    eColor_WindowForeground,
+    eColor_WidgetBackground,
+    eColor_WidgetForeground,
+    eColor_WidgetSelectBackground,
+    eColor_WidgetSelectForeground,
+    eColor_Widget3DHighlight,
+    eColor_Widget3DShadow,
+    eColor_TextBackground,
+    eColor_TextForeground,
+    eColor_TextSelectBackground,
+    eColor_TextSelectForeground,
+
+    // New CSS 2 color definitions
+    eColor_activeborder,
+    eColor_activecaption,
+    eColor_appworkspace,
+    eColor_background,
+    eColor_buttonface,
+    eColor_buttonhighlight,
+    eColor_buttonshadow,
+    eColor_buttontext,
+    eColor_captiontext,
+    eColor_graytext,
+    eColor_highlight,
+    eColor_highlighttext,
+    eColor_inactiveborder,
+    eColor_inactivecaption,
+    eColor_inactivecaptiontext,
+    eColor_infobackground,
+    eColor_infotext,
+    eColor_menu,
+    eColor_menutext,
+    eColor_scrollbar,
+    eColor_threeddarkshadow,
+    eColor_threedface,
+    eColor_threedhighlight,
+    eColor_threedlightshadow,
+    eColor_threedshadow,
+    eColor_window,
+    eColor_windowframe,
+    eColor_windowtext
+
+  } nsColorID;
+
+  typedef enum {
+    eMetric_WindowTitleHeight,
+    eMetric_WindowBorderWidth,
+    eMetric_WindowBorderHeight,
+    eMetric_Widget3DBorder,
+    eMetric_TextFieldBorder,                              // Native border size
+    eMetric_TextFieldHeight,
+    eMetric_TextVerticalInsidePadding,                    // needed only because of GTK
+    eMetric_TextShouldUseVerticalInsidePadding,           // needed only because of GTK
+    eMetric_TextHorizontalInsideMinimumPadding,  
+    eMetric_TextShouldUseHorizontalInsideMinimumPadding,  // needed only because of GTK
+    eMetric_ButtonHorizontalInsidePaddingNavQuirks,  
+    eMetric_ButtonHorizontalInsidePaddingOffsetNavQuirks, 
+    eMetric_CheckboxSize,
+    eMetric_RadioboxSize,
+    
+    eMetric_ListShouldUseHorizontalInsideMinimumPadding,  // needed only because of GTK
+    eMetric_ListHorizontalInsideMinimumPadding,         
+
+    eMetric_ListShouldUseVerticalInsidePadding,           // needed only because of GTK
+    eMetric_ListVerticalInsidePadding,                    // needed only because of GTK
+
+    eMetric_CaretBlinkTime,                               // default, may be overriden by OS
+    eMetric_CaretWidthTwips
+  } nsMetricID;
+
+  typedef enum {
+    eMetricFloat_TextFieldVerticalInsidePadding,
+    eMetricFloat_TextFieldHorizontalInsidePadding,
+    eMetricFloat_TextAreaVerticalInsidePadding,
+    eMetricFloat_TextAreaHorizontalInsidePadding,
+    eMetricFloat_ListVerticalInsidePadding,
+    eMetricFloat_ListHorizontalInsidePadding,
+    eMetricFloat_ButtonVerticalInsidePadding,
+    eMetricFloat_ButtonHorizontalInsidePadding
+  } nsMetricFloatID;
+
+  
+  NS_IMETHOD GetColor(const nsColorID aID, nscolor &aColor) = 0;
+  NS_IMETHOD GetMetric(const nsMetricID aID, PRInt32 & aMetric) = 0;
+  NS_IMETHOD GetMetric(const nsMetricFloatID aID, float & aMetric) = 0;
+
+
+#ifdef NS_DEBUG
+  typedef enum {
+    eMetricSize_TextField = 0,
+    eMetricSize_TextArea  = 1,
+    eMetricSize_ListBox   = 2,
+    eMetricSize_ComboBox  = 3,
+    eMetricSize_Radio     = 4,
+    eMetricSize_CheckBox  = 5,
+    eMetricSize_Button    = 6
+  } nsMetricNavWidgetID;
+
+  typedef enum {
+    eMetricSize_Courier   = 0,
+    eMetricSize_SansSerif = 1
+  } nsMetricNavFontID;
+
+  // This method returns the actual (or nearest estimate) 
+  // of the Navigator size for a given form control for a given font
+  // and font size. This is used in NavQuirks mode to see how closely
+  // we match its size
+  NS_IMETHOD GetNavSize(const nsMetricNavWidgetID aWidgetID,
+                        const nsMetricNavFontID   aFontID, 
+                        const PRInt32             aFontSize, 
+                        nsSize &aSize) = 0;
+#endif
+};
+
+#define nsLAF nsILookAndFeel
+
+#endif /* __nsILookAndFeel */

mozilla/widget/public/nsIMenu.h

@@ -0,0 +1,190 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIMenu_h__
+#define nsIMenu_h__
+
+#include "nsISupports.h"
+#include "nsString.h"
+#include "nsIDOMNode.h"
+#include "nsIDOMElement.h"
+#include "nsIWebShell.h"
+
+class nsIMenuBar;
+class nsIMenu;
+class nsIMenuItem;
+class nsIMenuListener;
+
+// {35A3DEC1-4992-11d2-8DBA-00609703C14E}
+#define NS_IMENU_IID      \
+{ 0x35a3dec1, 0x4992, 0x11d2, \
+  { 0x8d, 0xba, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
+
+
+/**
+ * Menu widget
+ */
+class nsIMenu : public nsISupports {
+
+  public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMENU_IID)
+
+  /**
+    * Creates the Menu
+    *
+    */
+    NS_IMETHOD Create(nsISupports * aParent, const nsString &aLabel) = 0;
+
+   /**
+    * Get the Menu's Parent
+    *
+    */
+    NS_IMETHOD GetParent(nsISupports *&aParent) = 0;
+
+   /**
+    * Get the Menu label
+    *
+    */
+    NS_IMETHOD GetLabel(nsString &aText) = 0;
+
+   /**
+    * Set the Menu label
+    *
+    */
+    NS_IMETHOD SetLabel(const nsString &aText) = 0;
+
+	/**
+    * Get the Menu Access Key
+    *
+    */
+	NS_IMETHOD GetAccessKey(nsString &aText) = 0;
+   
+	/**
+    * Set the Menu Access Key
+    *
+    */
+	NS_IMETHOD SetAccessKey(const nsString &aText) = 0;
+
+	/**
+    * Set the Menu enabled state
+    *
+    */
+	NS_IMETHOD SetEnabled(PRBool aIsEnabled) = 0;
+
+	/**
+    * Get the Menu enabled state
+    *
+    */
+	NS_IMETHOD GetEnabled(PRBool* aIsEnabled) = 0;
+	
+	/**
+    * Query if this is the help menu. Mostly for MacOS voodoo.
+    *
+    */
+	NS_IMETHOD IsHelpMenu(PRBool* aIsHelpMenu) = 0;
+	
+	/**
+    * Adds a Menu Item
+    *
+    */
+    NS_IMETHOD AddItem(nsISupports* aItem) = 0;
+
+   /**
+    * Adds a separator
+    *
+    */
+    NS_IMETHOD AddSeparator() = 0;
+
+   /**
+    * Returns the number of menu items
+    * This does count separators as items
+    */
+    NS_IMETHOD GetItemCount(PRUint32 &aCount) = 0;
+
+   /**
+    * Returns a Menu or Menu Item at a specified Index
+    *
+    */
+    NS_IMETHOD GetItemAt(const PRUint32 aPos, nsISupports *& aMenuItem) = 0;
+
+   /**
+    * Inserts a Menu Item at a specified Index
+    *
+    */
+    NS_IMETHOD InsertItemAt(const PRUint32 aPos, nsISupports * aMenuItem) = 0;
+
+   /**
+    * Removes an Menu Item from a specified Index
+    *
+    */
+    NS_IMETHOD RemoveItem(const PRUint32 aPos) = 0;
+
+   /**
+    * Removes all the Menu Items
+    *
+    */
+    NS_IMETHOD RemoveAll() = 0;
+
+   /**
+    * Gets Native MenuHandle
+    *
+    */
+    NS_IMETHOD  GetNativeData(void** aData) = 0;
+
+   /**
+    * Sets Native MenuHandle
+    *
+    */
+    NS_IMETHOD  SetNativeData(void* aData) = 0;
+    
+   /**
+    * Adds menu listener for dynamic construction
+    *
+    */
+    NS_IMETHOD AddMenuListener(nsIMenuListener * aMenuListener) = 0;
+
+   /**
+    * Removes menu listener for dynamic construction
+    *
+    */
+    NS_IMETHOD RemoveMenuListener(nsIMenuListener * aMenuListener) = 0;
+
+   /**
+    * Set DOMNode
+    *
+    */
+    NS_IMETHOD SetDOMNode(nsIDOMNode * aMenuNode) = 0;
+
+	/**
+    * Set DOMElement
+    *
+    */
+    NS_IMETHOD SetDOMElement(nsIDOMElement * aMenuElement) = 0;
+
+	/**
+    * Set WebShell
+    *
+    */
+    NS_IMETHOD SetWebShell(nsIWebShell * aWebShell) = 0;
+};
+
+#endif

mozilla/widget/public/nsIMenuBar.h

@@ -0,0 +1,120 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIMenuBar_h__
+#define nsIMenuBar_h__
+
+#include "nsISupports.h"
+#include "nsString.h"
+#include "nsIMenu.h"
+#include "nsIWebShell.h"
+
+class nsIWidget;
+
+// {BC658C81-4BEB-11d2-8DBB-00609703C14E}
+#define NS_IMENUBAR_IID      \
+{ 0xbc658c81, 0x4beb, 0x11d2, \
+  { 0x8d, 0xbb, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
+
+/**
+ * MenuBar widget
+ */
+class nsIMenuBar : public nsISupports {
+
+  public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMENUBAR_IID)
+
+   /**
+    * Creates the MenuBar
+    *
+    */
+    NS_IMETHOD Create(nsIWidget * aParent) = 0;
+
+   /**
+    * Get the MenuBar's Parent
+    *
+    */
+    NS_IMETHOD GetParent(nsIWidget *&aParent) = 0;
+
+   /**
+    * Set the MenuBar's Parent
+    *
+    */
+    NS_IMETHOD SetParent(nsIWidget *aParent) = 0;
+
+   /**
+    * Adds the Menu 
+    *
+    */
+    NS_IMETHOD AddMenu(nsIMenu * aMenu) = 0;
+    
+   /**
+    * Returns the number of menus
+    *
+    */
+    NS_IMETHOD GetMenuCount(PRUint32 &aCount) = 0;
+
+   /**
+    * Returns a Menu Item at a specified Index
+    *
+    */
+    NS_IMETHOD GetMenuAt(const PRUint32 aCount, nsIMenu *& aMenu) = 0;
+
+   /**
+    * Inserts a Menu at a specified Index
+    *
+    */
+    NS_IMETHOD InsertMenuAt(const PRUint32 aCount, nsIMenu *& aMenu) = 0;
+
+   /**
+    * Removes an Menu from a specified Index
+    *
+    */
+    NS_IMETHOD RemoveMenu(const PRUint32 aCount) = 0;
+
+   /**
+    * Removes all the Menus
+    *
+    */
+    NS_IMETHOD RemoveAll() = 0;
+
+   /**
+    * Gets Native MenuHandle
+    *
+    */
+    NS_IMETHOD  GetNativeData(void*& aData) = 0;
+
+   /**
+    * Sets Native MenuHandle. Temporary hack for mac until 
+    * nsMenuBar does it's own construction
+    */
+    NS_IMETHOD  SetNativeData(void* aData) = 0;
+    
+   /**
+    * Draw the menubar
+    *
+    */
+    NS_IMETHOD  Paint() = 0;
+   
+};
+
+#endif

mozilla/widget/public/nsIMenuItem.h

@@ -0,0 +1,189 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIMenuItem_h__
+#define nsIMenuItem_h__
+
+#include "prtypes.h"
+#include "nsISupports.h"
+#include "nsString.h"
+
+#include "nsIWebShell.h"
+#include "nsIDOMElement.h"
+
+// {7F045771-4BEB-11d2-8DBB-00609703C14E}
+#define NS_IMENUITEM_IID      \
+{ 0x7f045771, 0x4beb, 0x11d2, \
+  { 0x8d, 0xbb, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
+
+class nsIMenu;
+class nsIPopUpMenu;
+class nsIWidget;
+class nsIMenuListener;
+
+enum {
+  knsMenuItemNoModifier      = 0,
+  knsMenuItemShiftModifier   = (1 << 0),
+  knsMenuItemAltModifier     = (1 << 1),
+  knsMenuItemControlModifier = (1 << 2),
+  knsMenuItemCommandModifier = (1 << 3)
+};
+
+/**
+ * MenuItem widget
+ */
+class nsIMenuItem : public nsISupports {
+
+  public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMENUITEM_IID)
+
+   /**
+    * Creates the MenuItem
+    *
+    */
+    NS_IMETHOD Create(nsISupports    * aParent, 
+                      const nsString & aLabel, 
+                      PRBool           isSeparator) = 0;
+    
+   /**
+    * Get the MenuItem label
+    *
+    */
+    NS_IMETHOD GetLabel(nsString &aText) = 0;
+
+   /**
+    * Get the MenuItem label
+
+    *
+    */
+    NS_IMETHOD SetLabel(nsString &aText) = 0;
+
+   /**
+    * Set the Menu shortcut char
+    *
+    */
+    NS_IMETHOD SetShortcutChar(const nsString &aText) = 0;
+  
+    /**
+    * Get the Menu shortcut char
+    *
+    */
+    NS_IMETHOD GetShortcutChar(nsString &aText) = 0;
+   /**
+    * Sets whether the item is enabled or disabled
+    *
+    */
+    NS_IMETHOD SetEnabled(PRBool aIsEnabled) = 0;
+
+   /**
+    * Gets whether the item is enabled or disabled
+    *
+    */
+    NS_IMETHOD GetEnabled(PRBool *aIsEnabled) = 0;
+
+   /**
+    * Sets whether the item is checked or not
+    *
+    */
+    NS_IMETHOD SetChecked(PRBool aIsEnabled) = 0;
+
+   /**
+    * Gets whether the item is checked or not
+    *
+    */
+    NS_IMETHOD GetChecked(PRBool *aIsEnabled) = 0;
+
+   /**
+    * Sets whether the item is a checkbox type
+    *
+    */
+    NS_IMETHOD SetCheckboxType(PRBool aIsCheckbox) = 0;
+
+   /**
+    * Gets whether the item is a checkbox type
+    *
+    */
+    NS_IMETHOD GetCheckboxType(PRBool *aIsCheckbox) = 0;
+    
+   /**
+    * Gets the MenuItem Command identifier
+    *
+    */
+    NS_IMETHOD GetCommand(PRUint32 & aCommand) = 0;
+
+   /**
+    * Gets the target for MenuItem
+    *
+    */
+    NS_IMETHOD GetTarget(nsIWidget *& aTarget) = 0;
+    
+   /**
+    * Gets Native Menu Handle
+    *
+    */
+    NS_IMETHOD GetNativeData(void*& aData) = 0;
+
+   /**
+    * Adds menu listener
+    *
+    */
+    NS_IMETHOD AddMenuListener(nsIMenuListener * aMenuListener) = 0;
+
+   /**
+    * Removes menu listener
+    *
+    */
+    NS_IMETHOD RemoveMenuListener(nsIMenuListener * aMenuListener) = 0;
+
+   /**
+    * Indicates whether it is a separator
+    *
+    */
+    NS_IMETHOD IsSeparator(PRBool & aIsSep) = 0;
+
+   /**
+    * Sets the JavaScript Command to be invoked when a "gui" event occurs on a source widget
+    * @param aStrCmd the JS command to be cached for later execution
+    * @return NS_OK 
+    */
+    NS_IMETHOD SetCommand(const nsString & aStrCmd) = 0;
+
+   /**
+    * Executes the "cached" JavaScript Command 
+    * @return NS_OK if the command was executed properly, otherwise an error code
+    */
+    NS_IMETHOD DoCommand() = 0;
+
+    NS_IMETHOD SetDOMNode(nsIDOMNode * aDOMNode) = 0;
+    NS_IMETHOD GetDOMNode(nsIDOMNode ** aDOMNode) = 0;
+    NS_IMETHOD SetDOMElement(nsIDOMElement * aDOMElement) = 0;
+    NS_IMETHOD GetDOMElement(nsIDOMElement ** aDOMElement) = 0;
+    NS_IMETHOD SetWebShell(nsIWebShell * aWebShell) = 0;
+    
+    /**
+    *
+    */
+    NS_IMETHOD SetModifiers(PRUint8 aModifiers) = 0;
+    NS_IMETHOD GetModifiers(PRUint8 * aModifiers) = 0;
+};
+
+#endif

mozilla/widget/public/nsIMenuListener.h

@@ -0,0 +1,85 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIMenuListener_h__
+#define nsIMenuListener_h__
+
+#include "nsGUIEvent.h"
+#include "nsISupports.h"
+
+// TODO: This needs to be generated!
+// {BC658C81-4BEB-11d2-8DBB-00609703C14E}
+#define NS_IMENULISTENER_IID      \
+{ 0xbc658c81, 0x4beb, 0x11d2, \
+  { 0x8d, 0xbb, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x9e } }
+  
+static NS_DEFINE_IID(kIMenuListenerIID, NS_IMENULISTENER_IID);
+
+/**
+ *
+ * Menu event listener
+ * This interface should only be implemented by the menu manager
+ * These are registered with nsWindows to recieve menu events
+ */
+
+class nsIMenuListener : public nsISupports {
+
+  public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMENULISTENER_IID)
+
+	 /**
+     * Processes a menu item selected event
+     * @param aMenuEvent See nsGUIEvent.h 
+     * @return whether the event was consumed or ignored. See nsEventStatus
+     */
+    virtual nsEventStatus MenuItemSelected(const nsMenuEvent & aMenuEvent) = 0;
+
+    /**
+     * Processes a menu selected event
+     * @param aMenuEvent See nsGUIEvent.h 
+     * @return whether the event was consumed or ignored. See nsEventStatus
+     */
+    virtual nsEventStatus MenuSelected(const nsMenuEvent & aMenuEvent) = 0;
+
+    /**
+     * Processes a menu deselect event
+     * @param aMenuEvent See nsGUIEvent.h 
+     * @return whether the event was consumed or ignored. See nsEventStatus
+     */
+    virtual nsEventStatus MenuDeselected(const nsMenuEvent & aMenuEvent) = 0;
+
+    virtual nsEventStatus MenuConstruct(
+
+      const nsMenuEvent & aMenuEvent,
+
+      nsIWidget         * aParentWindow, 
+
+      void              * menubarNode,
+
+	  void              * aWebShell) = 0;
+
+      
+
+    virtual nsEventStatus MenuDestruct(const nsMenuEvent & aMenuEvent) = 0;
+};
+
+#endif // nsIMenuListener_h__

mozilla/widget/public/nsIMouseListener.h

@@ -0,0 +1,75 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+
+#ifndef nsIMouseListener_h__
+#define nsIMouseListener_h__
+
+#include "nsGUIEvent.h"
+#include "nsISupports.h"
+
+/**
+ *
+ * Mouse up/down/move event listener
+ *
+ */
+
+// {c83f6b81-d7ce-11d2-8360-c4c894c4917c}
+#define NS_IMOUSELISTENER_IID \
+{ 0xc83f6b81, 0xd7ce, 0x11d2, { 0x83, 0x60, 0xc4, 0xc8, 0x94, 0xc4, 0x91, 0x7c } }
+
+class nsIMouseListener : public nsISupports {
+public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IMOUSELISTENER_IID)
+
+    /**
+     * Processes a mouse pressed event
+     * @param aMouseEvent See nsGUIEvent.h 
+     * @return whether the event was consumed or ignored. See nsEventStatus
+     */
+    virtual nsEventStatus MousePressed(const nsGUIEvent & aMouseEvent) = 0;
+
+    /**
+     * Processes a mouse release event
+     * @param aMouseEvent See nsGUIEvent.h 
+     * @return whether the event was consumed or ignored. See nsEventStatus
+     */
+    virtual nsEventStatus MouseReleased(const nsGUIEvent & aMouseEvent) = 0;
+
+    /**
+     * Processes a mouse clicked event
+     * @param aMouseEvent See nsGUIEvent.h 
+     * @return whether the event was consumed or ignored. See nsEventStatus
+     *
+     */
+    virtual nsEventStatus MouseClicked(const nsGUIEvent & aMouseEvent) = 0;
+
+    /**
+     * Processes a mouse moved event
+     * @param aMouseEvent See nsGUIEvent.h 
+     * @return whether the event was consumed or ignored. See nsEventStatus
+     */
+    virtual nsEventStatus MouseMoved(const nsGUIEvent & aMouseEvent) = 0;
+
+};
+
+#endif // nsIMouseListener_h__

mozilla/widget/public/nsIPopUpMenu.h

@@ -0,0 +1,138 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIPopUpMenu_h__
+#define nsIPopUpMenu_h__
+
+#include "nsISupports.h"
+#include "nsString.h"
+#include "nsIMenuItem.h"
+
+class nsIMenu;
+class nsIWidget;
+
+// {F6CD4F21-53AF-11d2-8DC4-00609703C14E}
+#define NS_IPOPUPMENU_IID      \
+{ 0xf6cd4f21, 0x53af, 0x11d2, \
+  { 0x8d, 0xc4, 0x0, 0x60, 0x97, 0x3, 0xc1, 0x4e } }
+
+/**
+ * PopUpMenu widget
+ */
+class nsIPopUpMenu : public nsISupports {
+
+  public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IPOPUPMENU_IID)
+
+   /**
+    * Creates the PopUpMenu
+    *
+    */
+    NS_IMETHOD Create(nsIWidget * aParent) = 0;
+    
+   /**
+    * Adds a PopUpMenu Item
+    *
+    */
+    NS_IMETHOD AddItem(const nsString &aText) = 0;
+    
+   /**
+    * Adds a PopUpMenu Item
+    *
+    */
+    NS_IMETHOD AddItem(nsIMenuItem * aMenuItem) = 0;
+    
+   /**
+    * Adds a Cascading PopUpMenu 
+    *
+    */
+    NS_IMETHOD AddMenu(nsIMenu * aMenu) = 0;
+    
+   /**
+    * Adds Separator
+    *
+    */
+    NS_IMETHOD AddSeparator() = 0;
+
+   /**
+    * Returns the number of menu items
+    *
+    */
+    NS_IMETHOD GetItemCount(PRUint32 &aCount) = 0;
+
+   /**
+    * Returns a PopUpMenu Item at a specified Index
+    *
+    */
+    NS_IMETHOD GetItemAt(const PRUint32 aCount, nsIMenuItem *& aMenuItem) = 0;
+
+   /**
+    * Inserts a PopUpMenu Item at a specified Index
+    *
+    */
+    NS_IMETHOD InsertItemAt(const PRUint32 aCount, nsIMenuItem *& aMenuItem) = 0;
+
+   /**
+    * Creates and inserts a PopUpMenu Item at a specified Index
+    *
+    */
+    NS_IMETHOD InsertItemAt(const PRUint32 aCount, const nsString & aMenuItemName) = 0;
+
+   /**
+    * Creates and inserts a Separator at a specified Index
+    *
+    */
+    NS_IMETHOD InsertSeparator(const PRUint32 aCount) = 0;
+
+   /**
+    * Removes an PopUpMenu Item from a specified Index
+    *
+    */
+    NS_IMETHOD RemoveItem(const PRUint32 aCount) = 0;
+
+   /**
+    * Removes all the PopUpMenu Items
+    *
+    */
+    NS_IMETHOD RemoveAll() = 0;
+
+   /**
+    * Shows menu and waits for action
+    *
+    */
+    NS_IMETHOD ShowMenu(PRInt32 aX, PRInt32 aY) = 0;
+
+   /**
+    * Gets Native MenuHandle
+    *
+    */
+    NS_IMETHOD  GetNativeData(void*& aData) = 0;
+
+   /**
+    * Gets parent widget
+    *
+    */
+    NS_IMETHOD  GetParent(nsIWidget *& aParent) = 0;
+
+};
+
+#endif

mozilla/widget/public/nsIRadioButton.h

@@ -0,0 +1,80 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsIRadioButton_h__
+#define nsIRadioButton_h__
+
+#include "nsIButton.h"
+
+#define NS_IRADIOBUTTON_IID   \
+{ 0x18032ad4, 0xb265, 0x11d2, \
+{ 0xaa, 0x2a, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0 } }       
+
+/**
+ * RadioButton widget. Can show itself in a checked or unchecked state. 
+ * The RadioButton widget automatically shows itself checked or unchecked when clicked on.
+ */
+
+class nsIRadioButton : public nsISupports {
+
+public:
+    NS_DEFINE_STATIC_IID_ACCESSOR(NS_IRADIOBUTTON_IID)
+
+   /**
+    * Set the button label
+    *
+    * @param aText  button label
+    * @result set to NS_OK if method successful
+    */
+  
+    NS_IMETHOD SetLabel(const nsString &aText) = 0;
+    
+   /**
+    * Get the button label
+    *
+    * @param aBuffer contains label upon return
+    * @result set to NS_OK if method successful
+    */
+ 
+    NS_IMETHOD GetLabel(nsString &aBuffer) = 0;
+
+    /**
+     * Set the check state.
+     * @param aState PR_TRUE show as checked. PR_FALSE show unchecked.
+     * @result set to NS_OK if method successful
+     */
+
+    NS_IMETHOD SetState(const PRBool aState) = 0;
+    
+    /**
+     * Get the check state.
+     * @param aState PR_TRUE if checked. PR_FALSE if unchecked.
+     * @result set to NS_OK if method successful
+     */
+
+    NS_IMETHOD GetState(PRBool& aState) = 0;
+
+};
+
+#endif  // nsIRadioButton_h__
+
+