This commit was manufactured by cvs2svn to create branch 'src'.

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

mozilla/xpinstall/Makefile.in

@@ -0,0 +1,39 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "License"); you 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 Communicator client code, 
+# released March 31, 1998. 
+#
+# 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.
+#
+# Contributors:
+#     Daniel Veditz <dveditz@netscape.com>
+#     Douglas Turner <dougt@netscape.com>
+
+
+DEPTH = ..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS = public
+
+include $(topsrcdir)/config/config.mk
+
+include $(topsrcdir)/config/rules.mk
+
+

mozilla/xpinstall/makefile.win

@@ -0,0 +1,30 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "License"); you 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 Communicator client code, 
+# released March 31, 1998. 
+#
+# 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.
+#
+# Contributors:
+#     Daniel Veditz <dveditz@netscape.com>
+#     Douglas Turner <dougt@netscape.com>
+
+
+DEPTH=..
+
+DIRS= public res src 
+
+include <$(DEPTH)\config\rules.mak>

mozilla/xpinstall/notifier/SoftwareUpdate-Source-1.rdf

@@ -0,0 +1,33 @@
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:NC="http://home.netscape.com/NC-rdf#">
+
+  <RDF:Bag ID="NC:SoftwareUpdateRoot">
+    <RDF:li>
+       <RDF:Bag ID="NC:NewSoftwareToday" NC:title="New Software">
+
+    <RDF:li>
+        <RDF:Description ID="AimUpdate344">
+         <NC:type resource="http://home.netscape.com/NC-rdf#SoftwarePackage" />
+         <NC:title>AOL AIM</NC:title>
+         <NC:description>An Instant Message Client</NC:description>
+         <NC:version>3.4.1.12</NC:version>
+         <NC:registryKey>/AOL/AIM/</NC:registryKey>
+         <NC:url>http://home.netscape.com/index.html</NC:url>
+       </RDF:Description>
+    </RDF:li>
+    
+    <RDF:li>
+       <RDF:Description ID="PGPPlugin345">
+         <NC:type resource="http://home.netscape.com/NC-rdf#SoftwarePackage" />
+         <NC:title>PGP Plugin For Mozilla</NC:title>
+         <NC:description>A high grade encryption plugin</NC:description>
+         <NC:version>1.1.2.0</NC:version>
+         <NC:registryKey>/PGP/ROCKS/</NC:registryKey>
+         <NC:url>http://home.netscape.com/index.html</NC:url>
+       </RDF:Description>
+    </RDF:li>
+
+       </RDF:Bag>
+     </RDF:li>
+  </RDF:Bag>
+</RDF:RDF>

mozilla/xpinstall/notifier/SoftwareUpdate.css

@@ -0,0 +1,57 @@
+window { 
+ display: block; 
+} 
+
+tree { 
+ display: table; 
+ background-color: #FFFFFF; 
+ border: none; 
+ border-spacing: 0px; 
+ width: 100%;
+}
+
+treecol {
+ display: table-column;
+ width: 200px;
+}
+
+treeitem { 
+ display: table-row; 
+} 
+
+treehead { 
+ display: table-header-group; 
+} 
+
+treebody { 
+ display: table-row-group; 
+} 
+
+treecell { 
+ display: table-cell; 
+ font-family: Verdana, Sans-Serif;
+ font-size: 8pt;
+} 
+
+treecell[selectedcell] {
+ background-color: yellow;
+ }
+ 
+
+treehead treeitem treecell { 
+ background-color: #c0c0c0; 
+ border: outset 1px;
+ border-color: white #707070 #707070 white;
+ padding-left: 4px;
+}
+
+treeitem[type="http://home.netscape.com/NC-rdf#SoftwarePackage"] > treecell > titledbutton {
+ list-style-image: url("resource:/res/rdf/SoftwareUpdatePackage.gif");
+}
+
+treeitem[type="http://home.netscape.com/NC-rdf#Folder"] > treecell > titledbutton {
+ list-style-image: url("resource:/res/rdf/bookmark-folder-closed.gif");
+
+treeitem[type="http://home.netscape.com/NC-rdf#Folder"][open="true"] > treecell > titledbutton {
+ list-style-image: url("resource:/res/rdf/bookmark-folder-open.gif");
+}

mozilla/xpinstall/notifier/SoftwareUpdate.js

@@ -0,0 +1,123 @@
+    // the rdf service
+    var RDF = Components.classes['component://netscape/rdf/rdf-service'].getService();
+    RDF = RDF.QueryInterface(Components.interfaces.nsIRDFService);
+
+    function getAttr(registry,service,attr_name) 
+    {
+        var attr = registry.GetTarget(service,
+                                      RDF.GetResource('http://home.netscape.com/NC-rdf#' + attr_name),
+                                      true);
+        if (attr)
+            attr = attr.QueryInterface(Components.interfaces.nsIRDFLiteral);
+  
+        if (attr)
+            attr = attr.Value;
+        
+        return attr;
+    }
+
+    function Init()
+    {
+        // this is the main rdf file.
+        
+        var mainRegistry = RDF.GetDataSource('resource://res/rdf/SoftwareUpdates.rdf');
+        
+        var mainContainer = Components.classes['component://netscape/rdf/container'].createInstance();
+        mainContainer = mainContainer.QueryInterface(Components.interfaces.nsIRDFContainer);
+
+        mainContainer.Init(mainRegistry, RDF.GetResource('NC:SoftwareUpdateDataSources'));
+
+        // Now enumerate all of the softwareupdate datasources.
+        var mainEnumerator = mainContainer.GetElements();
+        while (mainEnumerator.HasMoreElements()) 
+        {
+            var aDistributor = mainEnumerator.GetNext();
+            aDistributor = aDistributor.QueryInterface(Components.interfaces.nsIRDFResource);
+
+            var distributorContainer = Components.classes['component://netscape/rdf/container'].createInstance();
+            distributorContainer = distributorContainer.QueryInterface(Components.interfaces.nsIRDFContainer);
+            
+            var distributorRegistry = RDF.GetDataSource(aDistributor.Value);
+            var distributorResource = RDF.GetResource('NC:SoftwareUpdateRoot');
+
+            distributorContainer.Init(distributorRegistry, distributorResource);
+
+            // Now enumerate all of the distributorContainer's packages.
+            
+            var distributorEnumerator = distributorContainer.GetElements();
+            
+            while (distributorEnumerator.HasMoreElements()) 
+            {
+                 var aPackage = distributorEnumerator.GetNext();
+                 aPackage = aPackage.QueryInterface(Components.interfaces.nsIRDFResource);
+                 
+                 // remove any that we do not want.
+            
+                 if (getAttr(distributorRegistry, aPackage, 'title') == "AOL AIM")
+                 {
+                    //distributorContainer.RemoveElement(aPackage, true);
+                 }
+            }
+            var tree = document.getElementById('tree');
+
+            // Add it to the tree control's composite datasource.
+            tree.database.AddDataSource(distributorRegistry);
+
+        }
+        
+        // Install all of the stylesheets in the softwareupdate Registry into the
+        // panel.
+
+        // TODO
+
+        // XXX hack to force the tree to rebuild
+        var treebody = document.getElementById('NC:SoftwareUpdateRoot');
+        treebody.setAttribute('id', 'NC:SoftwareUpdateRoot');
+    }
+
+
+    function OpenURL(event, node)
+    {
+        if (node.getAttribute('type') == "http://home.netscape.com/NC-rdf#SoftwarePackage") 
+        {
+            url = node.getAttribute('url');
+     
+            /*window.open(url,'bookmarks');*/
+  
+            var toolkitCore = XPAppCoresManager.Find("ToolkitCore");
+            if (!toolkitCore) 
+            {
+                toolkitCore = new ToolkitCore();
+                if (toolkitCore) 
+                {
+                    toolkitCore.Init("ToolkitCore");
+                }
+            }
+        
+            if (toolkitCore) 
+            {
+                toolkitCore.ShowWindow(url,window);
+            }
+
+            dump("OpenURL(" + url + ")\n");
+        
+            return true;        
+        }
+        return false;
+    }
+
+
+    // To get around "window.onload" not working in viewer.
+    function Boot()
+    {
+        var tree = document.getElementById('tree');
+        if (tree == null) {
+            setTimeout(Boot, 0);
+        }
+        else {
+            Init();
+        }
+    }
+
+    setTimeout('Boot()', 0);
+

mozilla/xpinstall/notifier/SoftwareUpdate.xul

@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="resource:/res/rdf/sidebar.css" type="text/css"?>
+<?xml-stylesheet href="resource:/res/rdf/SoftwareUpdate.css" type="text/css"?>
+<window
+  xmlns:html="http://www.w3.org/TR/REC-html40"
+  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+
+  <html:script src="SoftwareUpdate.js"/>
+  
+  <tree id="tree"
+        flex="100%"
+        datasources="rdf:softwareupdates"
+        ondblclick="return OpenURL(event, event.target.parentNode);">
+
+    <treecol rdf:resource="http://home.netscape.com/NC-rdf#title" />
+    <treecol rdf:resource="http://home.netscape.com/NC-rdf#description" />
+    <treecol rdf:resource="http://home.netscape.com/NC-rdf#version" />
+
+    <treehead>
+      <treeitem>
+        <treecell>Title</treecell>
+        <treecell>Description</treecell>
+        <treecell>Version</treecell>
+      </treeitem>
+    </treehead>
+
+    <treebody id="NC:SoftwareUpdateRoot" rdf:containment="http://home.netscape.com/NC-rdf#child" />
+  </tree>
+</window>

mozilla/xpinstall/notifier/SoftwareUpdates.rdf

@@ -0,0 +1,7 @@
+<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+         xmlns:NC="http://home.netscape.com/softwareupdate-schema#">
+
+  <RDF:Bag ID="NC:SoftwareUpdateDataSources">
+    <RDF:li resource="resource:/res/rdf/SoftwareUpdate-Source-1.rdf" />
+  </RDF:Bag>
+</RDF:RDF>

mozilla/xpinstall/packager/windows/browser.jst

@@ -1,239 +0,0 @@
-function createShortcuts() 
-{
-  var subkey;
-  var valname;
-  var szStartMenuPrograms;
-  var szStartMenu;
-  var szFolderDesktop;
-  var szFolderQuickLaunch;
-  var szFolderSendTo;
-  var winreg;
-  var fWindows;
-  var fTemp;
-  var fCommunicator;
-  var fileExe;
-  var scExeDesc;
-  var scProfileDesc;
-  var scProfileDescParam;
-  var scFolderName;
-  var fFolderPath;
-  var fFolderPathStr;
-  var is_winnt;
-  var szCurrentVersion;
-
-  winreg               = getWinRegistry();
-  fWindows             = getFolder("Windows");
-  fCommunicator        = getFolder("Communicator");
-  fTemp                = fCommunicator + "\\mozilla.exe";
-  fileExe              = getFolder("file:///", fTemp);
-  scExeDesc            = "Mozilla Seamonkey";
-  scProfileDesc        = "Profile Manager";
-  scProfileDescParam   = "-ProfileManager";
-  scFolderName         = "Mozilla Seamonkey";
-  if(winreg != null) 
-  {
-    winreg.setRootKey(winreg.HKEY_LOCAL_MACHINE);
-    subkey              = "SOFTWARE\\Mozilla\\Mozilla Seamonkey\\$UserAgent$\\Main";
-    valname             = "Program Folder Path";
-    fFolderPathStr      = winreg.getValueString(subkey, valname);
-    if((fFolderPathStr == "") || (fFolderPathStr == null))
-    {
-      /* determine if the script is running under NT or not */
-      winreg.setRootKey(winreg.HKEY_LOCAL_MACHINE);
-      subkey              = "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion";
-      valname             = "CurrentVersion";
-      szCurrentVersion    = winreg.getValueString(subkey, valname);
-      logComment("szCurrentVersion: " + szCurrentVersion);
-      if((szCurrentVersion == "") || (szCurrentVersion == null))
-      {
-        is_winnt = false;
-      }
-      else
-      {
-        is_winnt = true;
-      }
-
-      if(is_winnt == false)
-      {
-        logComment("is_winnt is false: " + is_winnt);
-
-        winreg.setRootKey(winreg.HKEY_CURRENT_USER);
-        subkey              = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders";
-        valname             = "Programs";
-        szStartMenuPrograms = winreg.getValueString(subkey, valname);
-        valname             = "Start Menu";
-        szStartMenu         = winreg.getValueString(subkey, valname);
-        valname             = "Desktop";
-        szFolderDesktop     = winreg.getValueString(subkey, valname);
-      }
-      else
-      {
-        logComment("is_winnt is true: " + is_winnt);
-
-        winreg.setRootKey(winreg.HKEY_LOCAL_MACHINE);
-        subkey              = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders";
-        valname             = "Common Programs";
-        szStartMenuPrograms = winreg.getValueString(subkey, valname);
-        valname             = "Common Start Menu";
-        szStartMenu         = winreg.getValueString(subkey, valname);
-        valname             = "Common Desktop";
-        szFolderDesktop     = winreg.getValueString(subkey, valname);
-      }
-
-      winreg.setRootKey(winreg.HKEY_CURRENT_USER);
-      subkey              = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders";
-      valname             = "SendTo";
-      szFolderSendTo      = winreg.getValueString(subkey, valname);
-
-      subkey              = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\GrpConv\\MapGroups";
-      valname             = "Quick Launch";
-      szFolderQuickLaunch = winreg.getValueString(subkey, valname);
-
-      fTemp        = szStartMenuPrograms + "\\" + scFolderName;
-      fFolderPath  = getFolder("file:///", fTemp);
-
-      logComment("Folder StartMenuPrograms: " + szStartMenuPrograms);
-      logComment("Folder StartMenu: "         + szStartMenu);
-      logComment("Folder FolderDesktop: "     + szFolderDesktop);
-      logComment("Folder FolderSendTo: "      + szFolderSendTo);
-      logComment("Folder FolderQuickLaunch: " + szFolderQuickLaunch);
-    }
-    else
-    {
-      /* convert the path string to a path folder object */
-      fFolderPath = getFolder("file:///", fFolderPathStr);
-    }
-
-    logComment("fileExe: "                  + fileExe);
-    logComment("fFolderPath: "              + fFolderPath);
-    logComment("scExeDesc: "                + scExeDesc);
-    logComment("fCommunicator : "           + fCommunicator);
-
-    /* explicitly create the fFolderPath even though the windowsShortcut function creates the folder.
-     * This is so that the folder creation gets logged for uninstall to remove it. */
-    File.dirCreate(fFolderPath);
-
-    /* create the shortcuts */
-    File.windowsShortcut(fileExe, fFolderPath, scExeDesc,     fCommunicator,  "",                 fileExe, 0);
-    File.windowsShortcut(fileExe, fFolderPath, scProfileDesc, fCommunicator,  scProfileDescParam, fileExe, 0);
-
-    /* set the Program Folder Path in the Mozilla key in the Windows Registry */
-    winreg.setRootKey(winreg.HKEY_LOCAL_MACHINE);
-    subkey  = "SOFTWARE\\Mozilla";
-    winreg.createKey(subkey,"");
-
-    valname = "CurrentVersion";
-    subkey  = "SOFTWARE\\Mozilla\\Mozilla Seamonkey";
-    winreg.createKey(subkey,"");
-
-    valname = "CurrentVersion";
-    value   = "$UserAgent$";
-    err     = winreg.setValueString(subkey, valname, value);
-
-    subkey  = "SOFTWARE\\Mozilla\\Mozilla Seamonkey\\$UserAgent$";
-    winreg.createKey(subkey,"");
-
-    subkey  = "SOFTWARE\\Mozilla\\Mozilla Seamonkey\\$UserAgent$\\Main";
-    winreg.createKey(subkey,"");
-
-    valname = "Program Folder Path";
-    value   = fFolderPath;
-    err     = winreg.setValueString(subkey, valname, value);
-
-  }
-  else
-  {
-    logComment("winreg is null");
-  }
-}
-
-function updateWinReg()
-{
-  //Notes:
-  // can't use a double backslash before subkey - Windows already puts it in.
-  // subkeys have to exist before values can be put in.
-  var winreg = getWinRegistry();
-  var subkey;  //the name of the subkey you are poking around in
-  var valname; // the name of the value you want to look at
-  var value;   //the data in the value you want to look at.
-
-  if(winreg != null) 
-  {
-    winreg.setRootKey(winreg.HKEY_LOCAL_MACHINE);
-    subkey  = "SOFTWARE\\Mozilla";
-    winreg.createKey(subkey,"");
-
-    subkey  = "SOFTWARE\\Mozilla\\Mozilla Seamonkey";
-    winreg.createKey(subkey,"");
-
-    valname = "CurrentVersion";
-    value   = "$UserAgent$";
-    err     = winreg.setValueString(subkey, valname, value);
-
-    subkey  = "SOFTWARE\\Mozilla\\Mozilla Seamonkey\\$UserAgent$";
-    winreg.createKey(subkey,"");
-
-    subkey  = "SOFTWARE\\Mozilla\\Mozilla Seamonkey\\$UserAgent$\\Main";
-    winreg.createKey(subkey,"");
-
-    valname = "Install Directory";
-    value   = fCommunicator;
-    err     = winreg.setValueString(subkey, valname, value);
-
-    // set the App Paths key here
-    subkey  = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\mozilla.exe";
-    winreg.createKey(subkey,"");
-    valname = "";
-    value   = fCommunicator + "\\mozilla.exe";
-    err     = winreg.setValueString(subkey, valname, value);
-
-    valname = "Path";
-    value   = fCommunicator;
-    err     = winreg.setValueString(subkey, valname, value);
-  }
-}
-
-// main
-var srDest;
-var err;
-var fCommunicator;
-var fWindowsSystem;
-var fileComponentRegStr;
-var fileComponentReg;
-
-srDest = $SpaceRequired$:bin;
-err    = startInstall("Mozilla Seamonkey", "Browser", "$Version$"); 
-logComment("startInstall: " + err);
-
-fCommunicator   = getFolder("Communicator");
-fWindowsSystem  = getFolder("Win System");
-logComment("fCommunicator: " + fCommunicator);
-
-if(verifyDiskSpace(fCommunicator, srDest) == true)
-{
-  setPackageFolder(fCommunicator);
-  err = addDirectory("",
-                     "$Version$",
-                     "bin",              // dir name in jar to extract 
-                     fCommunicator,      // Where to put this file (Returned from GetFolder) 
-                     "",                 // subdir name to create relative to fCommunicator
-                     true);              // Force Flag 
-  logComment("addDirectory() of Program returned: " + err);
-
-  // check return value
-  if(!checkError(err))
-  {
-    fileComponentRegStr = fCommunicator + "\\component.reg";
-    fileComponentReg    = getFolder("file:///", fileComponentRegStr);
-    err                 = fileDelete(fileComponentReg);
-    logComment("fileDelete() returned: " + err);
-
-    updateWinReg();
-    createShortcuts();
-
-    err = finalizeInstall(); 
-    logComment("finalizeInstall() returned: " + err);
-  }
-}
-
-// end main

mozilla/xpinstall/packager/windows/config.it

@@ -1,494 +0,0 @@
-[General]
-; Run Mode values:
-;   Normal - Shows all dialogs.  Requires user input.
-;   Auto   - Shows some dialogs, but none requiring user input.  It will
-;            automatically install the product using default values.
-;   Silent - Show no dialogs at all.  It will install product using default
-;            values.
-Run Mode=Normal
-
-Product Name=Mozilla Seamonkey
-
-; Destination Path values:
-;   PROGRAMFILESDIR
-;   WINDISK
-;   WINDIR
-;   WINSYSDIR
-Path=[PROGRAMFILESDIR]\Mozilla\Seamonkey
-
-; Program Folder Path values:
-;   COMMON_STARTUP
-;   COMMON_PROGRAMS
-;   COMMON_STARTMENU
-;   COMMON_DESKTOP
-;
-;   PERSONAL_STARTUP
-;   PERSONAL_PROGRAMS
-;   PERSONAL_STARTMENU
-;   PERSONAL_DESKTOP
-;
-;   PERSONAL_APPDATA
-;   PERSONAL_CACHE
-;   PERSONAL_COOKIES
-;   PERSONAL_FAVORITES
-;   PERSONAL_FONTS
-;   PERSONAL_HISTORY
-;   PERSONAL_NETHOOD
-;   PERSONAL_PERSONAL
-;   PERSONAL_PRINTHOOD (supported only under Windows NT)
-;   PERSONAL_RECENT
-;   PERSONAL_SENDTO
-;   PERSONAL_TEMPLATES
-;
-;   PROGRAMFILESDIR
-;   COMMONFILESDIR
-;   MEDIAPATH
-;   CONFIGPATH (supported only under Windows95 and Windows98)
-;   DEVICEPATH
-Program Folder Name=Mozilla Seamonkey
-Program Folder Path=[COMMON_PROGRAMS]
-
-; Default Setup Type values:
-;   Setup Type 0 - first radio button (default)
-;   Setup Type 1 - second radio button
-;   Setup Type 2 - third radio button
-;   Setup Type 3 - fourth radio button (usually the Custom option)
-Default Setup Type=Setup Type 0
-
-; Default Font Size is 32
-; Default Font Color is WHITE (of BLACK and GREEN)
-; Default Font Shadow is TRUE
-Setup Title0=Mozilla Seamonkey Pr2 Setup
-Setup Title0 Font Size=
-Setup Title0 Font Color=
-Setup Title0 Font Shadow=TRUE
-Setup Title1=Build $Version$
-Setup Title1 Font Size=12
-Setup Title1 Font Color=BLACK
-Setup Title1 Font Shadow=FALSE
-Setup Title2=
-Setup Title2 Font Size=
-Setup Title2 Font Color=
-Setup Title2 Font Shadow=TRUE
-
-; HKey:              valid decryptable setup keys are [Mozilla Seamonkey CurrentVersion]
-;                    and [Mozilla Seamonkey CurrentVersion].
-; Decrypt HKey:      there are times when '[' and ']' are valid part of windows registry key names.
-; Contains Filename: tells setup that the path contains filename needed to be removed before
-;                    using it as a path.
-; Verify Existance:  FILE or PATH
-;
-[Locate Previous Product Path0]
-HRoot=HKEY_LOCAL_MACHINE
-HKey=[Netscape Seamonkey CurrentVersion]\Main
-Name=Install Directory
-Decrypt HKey=TRUE
-Contains Filename=FALSE
-Verify Existance=
-
-; This section checks for legacy files.
-; If the file(s), indicated by the Filename= key, is found to have a version of less than the value
-; indicated by the Version= key, then display the string in the Message= key.
-[Legacy Check0]
-Filename=[SETUP PATH]\mozilla.exe
-Version=6.0.0.0
-Message=Setup has detected an old version of Mozilla in the chosen destination directory that may pose compatibility issues.  It is highly recommended that a different destination directory be used.  Would you like to choose a different directory?
-
-[Dialog Welcome]
-Show Dialog=TRUE
-Title=Welcome
-Message0=Welcome to %s Setup.
-Message1=It is strongly recommended that you exit all Windows programs before running this Setup program.
-Message2=Click Cancel to quit Setup and then close any programs you have running.  Click Next to continue the Setup program.
-
-[Dialog License]
-Show Dialog=FALSE
-Title=Software License Agreement
-License File=license.txt
-Message0=Please read the following license agreement.  Use the scroll bar to view the rest of this agreement.
-Message1=Click Accept if you accept the terms of the preceeding license agreement.  If No is clicked, setup will quit.
-
-[Dialog Setup Type]
-Show Dialog=TRUE
-Title=Setup Type
-Message0=Click the type of setup you prefer, then click Next.
-Readme Filename=readme.txt
-Readme App=notepad.exe
-
-; at least one Setup Type needs to be set, and up to 4 can be
-; set (Setup Type0, Setup Type1, Setup Type2, Setup Type3).
-[Setup Type0]
-Description Short=B&ase
-Description Long=Program will be installed with the minimal options.
-
-; List of components to install/enable for this Setup Type.
-; All other components not listed here will be disabled if
-; this Setup Type is selected.
-C0=Component0
-C1=Component1
-
-[Setup Type1]
-Description Short=C&omplete
-Description Long=Program will be installed with the most common options.
-
-; List of components to install/enable for this Setup Type.
-; All other components not listed here will be disabled if
-; this Setup Type is selected.
-C0=Component0
-C1=Component1
-C2=Component2
-
-[Setup Type2]
-Description Short=C&ustom
-Description Long=You may choose the options you want to install.  Recommended for advanced users only.
-;Description Short=&Pro
-;Description Long=Program will be installed with all the options available.
-
-; List of components to install/enable for this Setup Type.
-; All other components not listed here will be disabled if
-; this Setup Type is selected.
-C0=Component0
-C1=Component1
-C2=Component2
-
-;[Setup Type3]
-;Description Short=C&ustom
-;Description Long=You may choose the options you want to install.  Recommended for advanced users.
-
-; List of components to install/enable for this Setup Type.
-; All other components not listed here will be disabled if
-; this Setup Type is selected.
-;C0=Component0
-;C1=Component1
-;C2=Component2
-;C3=Component3
-
-[Dialog Select Components]
-Show Dialog=TRUE
-Title=Select Components
-Message0=The browser is always installed.  Select or clear the additional components you want to install.
-
-[Dialog Windows Integration]
-Show Dialog=FALSE
-Title=Windows Integration
-Message0=Check the Mozilla Preference options you would like Setup to perform.
-Message1=These settings allow you to set default Internet preferences for browsing and searching.  They affect browsers installed on your machine, including Mozilla Communicator and Microsoft Internet Explorer.
-
-; Only a maximum of 4 "Windows Integration-Item"s are allowded.  Each Item
-; shows up as a checkbox in the Windows Integration dialog.
-[Windows Integration-Item0]
-CheckBoxState=FALSE
-Description=Make Mozilla Communicator my default Internet browser
-Archive=
-
-[Windows Integration-Item1]
-CheckBoxState=FALSE
-Description=Make Mozilla Netcenter my home page
-Archive=
-
-[Windows Integration-Item2]
-CheckBoxState=FALSE
-Description=Use Mozilla Netcenter to search the Web
-Archive=
-
-[Dialog Program Folder]
-Show Dialog=TRUE
-Title=Select Program Folder
-Message0=Setup will add program icons to the Program Folder listed below.  You may type a new folder name, or select one from the Existing Folder list.  Click Install to begin installation.
-
-[Dialog Site Selector]
-Show Dialog=FALSE
-Title=Site Selector
-Message0=Select the region you wish to download from, or leave it on Default for Setup to automatically determine the best place to download from relative to where you are.
-
-[Dialog Start Install]
-Show Dialog=FALSE
-Title=Start Install
-Message0=Setup has enough information to start copying the program files.  If you want to review or change settings, click Back.  If you are satisfied with the current settings, click Install to begin copying files.
-
-[Dialog Reboot]
-; Show Dialog values are:
-;   TRUE  - Always show
-;   FALSE - Don't show unless at least one component has its reboot show value set
-;           to TRUE.  This will not show even if some files were in use and a reboot
-;           is necessary.
-;   AUTO  - Don't show unless a component has its reboot show value set to
-;           TRUE or there was at least one file in use and a reboot is
-;           is required for the file to be replaced correctly.
-Show Dialog=AUTO
-
-; These SmartDownload sections contain information to configure SmartDownload.
-; The info is applied to all components to be downloaded.
-[SmartDownload-Netscape Install]
-;core_file=base.zip
-;core_dir=[SETUP PATH]
-no_ads=true
-silent=false
-execution=false
-confirm_install=false
-;extract_msg=Uncompressing Seamonkey.  Please wait...
-
-[SmartDownload-Proxy]
-
-[SmartDownload-Execution]
-exe=
-exe_param=
-
-[Check Instance0]
-Class Name=NetscapeWindowClass
-Window Name=
-Message=Setup has detected that an instance of Seamonkey is currently running.  Please quit Seamonkey before continuing Setup.
-
-[Check Instance1]
-Process Name=psm.exe
-Message=Setup has detected that an instance of Personal Security Manager is currently running.  Personal Security Manager will quit by itself when there are no other applications running that require it.  A reboot might be necessary.  Setup will then be able to continue.
-
-; These are the components to be offered to the user (shown in the Select
-; Components dialog) for installation.
-; There is no limit to the number of components to install.
-[Component0]
-Description Short=Mozilla Xpinstall Engine
-Description Long=Install Engine
-Archive=core.xpi
-$InstallSize$:core
-$InstallSizeSystem$
-$InstallSizeArchive$:core.xpi
-;Dependency0=
-Dependee0=Mozilla Seamonkey
-; Attributes can be the following values:
-;   SELECTED  - the component is selected to be installed by default.
-;   INVISIBLE - the component is not shown in the Select Components dialog.
-Attributes=SELECTED|INVISIBLE
-; url keys can be as many as needed.  url0 is attempted first.  if it fails,
-; the next url key is tried in sequential order.
-; The url should not contain the filename.  Setup will assemble the complete url
-; using the url keys and the Archive key.
-Domain0=$Domain$
-Server Path0=$ServerPath$
-
-[Component1]
-Description Short=Mozilla Seamonkey
-Description Long=Browser software for the internet
-Archive=browser.xpi
-$InstallSize$:browser
-$InstallSizeSystem$
-$InstallSizeArchive$:browser.xpi
-;Dependency0=
-; Attributes can be the following values:
-;   SELECTED  - the component is selected to be installed by default.
-;   INVISIBLE - the component is not shown in the Select Components dialog.
-Attributes=SELECTED|DISABLED
-; url keys can be as many as needed.  url0 is attempted first.  if it fails,
-; the next url key is tried in sequential order.
-; The url should not contain the filename.  Setup will assemble the complete url
-; using the url keys and the Archive key.
-Domain0=$Domain$
-Server Path0=$ServerPath$
-;url0=$URLPath$
-
-[Component2]
-Description Short=Mail & News
-Description Long=Seamonkey Mail && News
-Archive=mail.xpi
-$InstallSize$:mail
-$InstallSizeSystem$
-$InstallSizeArchive$:mail.xpi
-;Dependency0=
-; Attributes can be the following values:
-;   SELECTED  - the component is selected to be installed by default.
-;   INVISIBLE - the component is not shown in the Select Components dialog.
-Attributes=SELECTED
-Parameter=
-; url keys can be as many as needed.  url0 is attempted first.  if it fails,
-; the next url key is tried in sequential order.
-; The url should not contain the filename.  Setup will assemble the complete url
-; using the url keys and the Archive key.
-Domain0=$Domain$
-Server Path0=$ServerPath$
-;url0=$URLPath$
-
-[Core]
-Source=[XPI PATH]\core.xpi
-Destination=[WIZTEMP]\core.ns
-$InstallSize$:core
-Cleanup=TRUE
-Message=Preparing Install, please wait...
-
-[Redirect]
-Status=Enabled
-url0=$RedirIniUrl$
-Description=
-Message=
-
-; The Timing key needs to be one of the following values:
-;   pre download     - process before any files have been downloaded.
-;   post download    - process after all files have been downloaded.
-;   pre core         - process before the core file has been uncompressed.
-;   post core        - process after the core file has been uncompressed.
-;   pre smartupdate  - process before the smartupdate engine has been launched.
-;   post smartupdate - process after the smartupdate engine has been launched.
-;   pre launchapp    - process before the launching of executables.
-;   post launchapp   - process after the launching of executables.
-;   depend reboot    - process depending on if a reboot is necessary or not.
-;                      if reboot is necessary, installer can set it up so
-;                      the app runs once upon windows reboot.
-
-;Uncompress FileX sections
-;[Uncompress File0]
-;Timing=post download
-;Source=[XPI PATH]\core.xpi
-;Destination=[SETUP PATH]
-;Message=Configuring Seamonkey, please wait...
-
-;[Uncompress File1]
-;Timing=post download
-;Source=[XPI PATH]\extratest.xpi
-;Destination=[SETUP PATH]
-;Message=Configuring Extra test files, please wait...
-
-;Move FileX sections
-;[Move File0]
-;Timing=post download
-;Source=[SETUP PATH]\bin\*
-;Destination=[SETUP PATH]\program
-
-;[Move File1]
-;Timing=post download
-;Source=[SETUP PATH]\ftmain\*
-;Destination=[SETUP PATH]\program
-
-;Copy FileX sections
-[Copy File0]
-Timing=post launchapp
-Source=[JRE BIN PATH]\npjava*.dll
-Destination=[SETUP PATH]\Plugins
-Fail If Exists=FALSE
-
-;[Copy File1]
-;Timing=post launchapp
-;Source=[TEMP]\xtratest\bin\*.*
-;Destination=[SETUP PATH]
-;Fail If Exists=FALSE
-
-;[Copy File1]
-;Timing=post download
-;Source=[SETUP PATH]\bin\*.exe
-;Destination=[TEMP]
-;Fail If Exists=
-
-;Create DirectoryX sections
-[Create Directory0]
-Timing=post download
-Destination=[SETUP PATH]\Plugins
-
-;[Create Directory1]
-;Timing=post download
-;Destination=[TEMP]\Test\temp
-
-;Delete FileX sections
-[Delete File0]
-Timing=post download
-Destination=[COMMON_PROGRAMS]\Mozilla Seamonkey\Mozilla AppRunner.lnk
-
-;Remove DirectoryX sections
-;[Remove Directory0]
-;Timing=post launchapp
-;Destination=[TEMP]\xtratest
-;Remove subdirs=TRUE
-
-;RunAppX sections
-[RunApp0]
-Timing=depend reboot
-Wait=FALSE
-Target=[SETUP PATH]\mozilla.exe
-Parameters=-installer
-WorkingDir=[SETUP PATH]
-
-[Windows Registry0]
-Root Key=HKEY_LOCAL_MACHINE
-Key=Software\Mozilla\Mozilla Seamonkey\$UserAgent$\Main
-Name=Program Folder Path
-Name Value=[Default Folder]
-Type=REG_SZ
-Decrypt Key=FALSE
-Decrypt Name=FALSE
-Decrypt Name Value=TRUE
-Overwrite Key=TRUE
-Overwrite Name=TRUE
-Timing=pre smartupdate
-
-; Values for Show Folder:
-;   HIDE             Hides the window and activates another window.
-;   MAXIMIZE         Maximizes the specified window.
-;   MINIMIZE         Minimizes the specified window and activates the next
-;                    top-level window in the z-order.
-;   RESTORE          Activates and displays the window. If the window is
-;                    minimized or maximized, Windows restores it to its
-;                    original size and position. An application should specify
-;                    this flag when restoring a minimized window.
-;   SHOW             Activates the window and displays it in its current size
-;                    and position.
-;   SHOWMAXIMIZED    Activates the window and displays it as a maximized
-;                    window.
-;   SHOWMINIMIZED    Activates the window and displays it as a minimized
-;                    window.
-;   SHOWMINNOACTIVE  Displays the window as a minimized window. The active
-;                    window remains active.
-;   SHOWNA           Displays the window in its current state. The active
-;                    window remains active.
-;   SHOWNOACTIVATE   Displays a window in its most recent size and position.
-;                    The active window remains active.
-;   SHOWNORMAL       Activates and displays a window. If the window is
-;                    minimized or maximized, Windows restores it to its
-;                    original size and position. An application should specify
-;                    this flag when displaying the window for the first time.
-[Program Folder0]
-Timing=post smartupdate
-Show Folder=SHOW
-Program Folder=[Default Folder]
-
-;[Program Folder0-Shortcut0]
-;File=[SETUP PATH]\mozilla.exe
-;Arguments=
-;Working Dir=[SETUP PATH]
-;Description=Mozilla Seamonkey
-;Icon Path=[SETUP PATH]\mozilla.exe
-;Icon Id=0
-
-;[Program Folder0-Shortcut1]
-;File=[SETUP PATH]\mozilla.exe
-;Arguments=-ProfileManager
-;Working Dir=[SETUP PATH]
-;Description=Profile Manager
-;Icon Path=[SETUP PATH]\mozilla.exe
-;Icon Id=0
-
-;[Program Folder0-Shortcut2]
-;File=[SETUP PATH]\bin\Net2fone.exe
-;Arguments=
-;Working Dir=[SETUP PATH]
-;Description=Net2Fone
-;Icon Path=[SETUP PATH]\bin\Net2fone.exe
-;Icon Id=0
-
-;[Program Folder1]
-;Timing=post download
-;Show Folder=SHOW
-;Program Folder=[Default Folder]\lala land
-
-;[Program Folder1-Shortcut0]
-;File=c:\bin\getver.exe
-;Arguments=
-;Working Dir=[TEMP]
-;Description=Getver Test
-;Icon Path=[WINDISK]\4nt\4nt.exe
-;Icon Id=0
-
-;[Program Folder1-Shortcut1]
-;File=c:\perl\bin\perl.exe
-;Arguments=
-;Working Dir=[WINSYS]
-;Description=Perl
-;Icon Path=c:\perl\bin\perl.exe
-;Icon Id=0
-

mozilla/xpinstall/packager/windows/core.jst

@@ -1,41 +0,0 @@
-// main
-var srDest;
-var err;
-var communicatorFolder;
-var fWindowsSystem;
-var fileComponentRegStr;
-var fileComponentReg;
-
-srDest = $SpaceRequired$:bin;
-err    = startInstall("Mozilla XPCom", "XPCom", "$Version$"); 
-logComment("startInstall: " + err);
-
-communicatorFolder = getFolder("Communicator");
-fWindowsSystem     = getFolder("Win System");
-logComment("communicatorFolder: " + communicatorFolder);
-
-if(verifyDiskSpace(communicatorFolder, srDest) == true)
-{
-  setPackageFolder(communicatorFolder);
-  err = addDirectory("",
-                     "$Version$",
-                     "bin",              // dir name in jar to extract 
-                     communicatorFolder, // Where to put this file (Returned from GetFolder) 
-                     "",                 // subdir name to create relative to communicatorFolder
-                     true);              // Force Flag 
-  logComment("addDirectory() of Program returned: " + err);
-
-  // check return value
-  if(!checkError(err))
-  {
-    fileComponentRegStr = communicatorFolder + "\\component.reg";
-    fileComponentReg    = getFolder("file:///", fileComponentRegStr);
-    err                 = fileDelete(fileComponentReg);
-    logComment("fileDelete() returned: " + err);
-
-    err = finalizeInstall(); 
-    logComment("finalizeInstall() returned: " + err);
-  }
-}
-
-// end main

mozilla/xpinstall/packager/windows/editor.jst

@@ -1,18 +0,0 @@
-var err = StartInstall("Mozilla Editor", "Seamonkey", "$Version$"); 
-LogComment("StartInstall: " + err);
-
-var communicatorFolder = Install.GetFolder("Communicator");
-LogComment("communicatorFolder: " + communicatorFolder);
-
-err = AddDirectory("Program",
-                   "$Version$",
-                   "bin",              // fileName in jar, 
-                   communicatorFolder, // Where to put this file (Returned from GetFolder) 
-                   "",                 // fileName in jar, 
-                   true);              // Force Flag 
-
-LogComment("AddDirectory() returned: " + err);
-
-err = FinalizeInstall(); 
-LogComment("FinalizeInstall() returned: " + err);
-

mozilla/xpinstall/packager/windows/mail.jst

@@ -1,34 +0,0 @@
-// main
-var srDest;
-var err;
-var communicatorFolder;
-
-srDest = $SpaceRequired$:bin;
-err    = startInstall("Mozilla Mail", "Mail", "$Version$"); 
-logComment("startInstall: " + err);
-// check return value
-checkError(err);
-
-communicatorFolder = getFolder("Communicator");
-logComment("communicatorFolder: " + communicatorFolder);
-
-if(verifyDiskSpace(communicatorFolder, srDest) == true)
-{
-  setPackageFolder(communicatorFolder);
-  err = addDirectory("",
-                     "$Version$",
-                     "bin",              // dir name in jar to extract 
-                     communicatorFolder, // Where to put this file (Returned from GetFolder) 
-                     "",                 // subdir name to create relative to communicatorFolder
-                     true);              // Force Flag 
-  logComment("addDirectory() returned: " + err);
-
-  // check return value
-  if(!checkError(err))
-  {
-    err = finalizeInstall(); 
-    logComment("finalizeInstall() returned: " + err);
-  }
-}
-
-// end main

mozilla/xpinstall/packager/windows/makeall.pl

@@ -1,134 +0,0 @@
-#!c:\perl\bin\perl
-# 
-# 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 Communicator client code, released
-# March 31, 1998.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1998-1999 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s): 
-# Sean Su <ssu@netscape.com>
-# 
-
-#
-# This perl script builds the xpi, config.ini, and js files.
-#
-
-# Make sure there are at least four arguments
-if($#ARGV < 2)
-{
-  die "usage: $0 <default version> <staging path> <dist install path>
-
-       default version   : y2k compliant based date version.
-                           ie: 5.0.0.2000040413
-
-       staging path      : full path to where the components are staged at
-
-       dist install path : full path to where the dist install dir is at.
-                           ie: d:\\builds\\mozilla\\dist\\win32_o.obj\\install
-       \n";
-}
-
-$inDefaultVersion     = $ARGV[0];
-$inStagePath          = $ARGV[1];
-$inDistPath           = $ARGV[2];
-
-$inRedirIniUrl        = "ftp://not.needed.com/because/the/xpi/files/will/be/located/in/the/same/dir/as/the/installer";
-$inXpiUrl             = "ftp://not.needed.com/because/the/xpi/files/will/be/located/in/the/same/dir/as/the/installer";
-
-$seiFileNameGeneric   = "nsinstall.exe";
-$seiFileNameSpecific  = "mozilla-win32-installer.exe";
-$userAgent            = "5.0b2 (en)";
-
-# Check for existance of staging path
-if(!(-e "$inStagePath"))
-{
-  die "invalid path: $inStagePath\n";
-}
-
-# Make sure inDestPath exists
-if(!(-e "$inDistPath"))
-{
-  mkdir ("$inDestPath",0775);
-}
-
-# Make .js files
-MakeJsFile("core");
-MakeJsFile("browser");
-MakeJsFile("mail");
-
-# Make .xpi files
-MakeXpiFile("core");
-MakeXpiFile("browser");
-MakeXpiFile("mail");
-
-MakeConfigFile();
-
-if(-e "$inDistPath\\setup")
-{
-  unlink <$inDistPath\\setup\\*>;
-}
-else
-{
-  mkdir ("$inDistPath\\setup",0775);
-}
-
-# Copy the setup files to the dist setup directory.
-system("xcopy /f config.ini                 $inDistPath\\");
-system("xcopy /f config.ini                 $inDistPath\\setup\\");
-system("xcopy /f $inDistPath\\setup.exe     $inDistPath\\setup\\");
-system("xcopy /f $inDistPath\\setuprsc.dll  $inDistPath\\setup\\");
-
-# build the self-extracting .exe file.
-print "\nbuilding self-extracting installer ($seiFileNameSpecific)...\n";
-system("copy $inDistPath\\$seiFileNameGeneric $inDistPath\\$seiFileNameSpecific");
-system("$inDistPath\\nszip.exe $inDistPath\\$seiFileNameSpecific $inDistPath\\setup\\*.* $inDistPath\\xpi\\*.*");
-
-print " done!\n";
-
-# end of script
-exit(0);
-
-sub MakeConfigFile
-{
-  # Make config.ini file
-  if(system("perl makecfgini.pl config.it $inDefaultVersion \"$userAgent\" $inStagePath $inDistPath\\xpi $inRedirIniUrl $inXpiUrl") != 0)
-  {
-    exit(1);
-  }
-}
-
-sub MakeJsFile
-{
-  my($componentName) = @_;
-
-  # Make .js file
-  if(system("perl makejs.pl $componentName.jst $inDefaultVersion \"$userAgent\" $inStagePath\\$componentName") != 0)
-  {
-    exit(1);
-  }
-}
-
-sub MakeXpiFile
-{
-  my($componentName) = @_;
-
-  # Make .xpi file
-  if(system("perl makexpi.pl $componentName $inStagePath $inDistPath\\xpi") != 0)
-  {
-    exit(1);
-  }
-}
-

mozilla/xpinstall/packager/windows/makecfgini.pl

@@ -1,277 +0,0 @@
-#!c:\perl\bin\perl
-# 
-# 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 Communicator client code, released
-# March 31, 1998.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1998-1999 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s): 
-# Sean Su <ssu@netscape.com>
-# 
-
-#
-# This perl script parses the input file for special variables
-# in the format of $Variable$ and replace it with the appropriate
-# value(s).
-#
-# Input: .it file
-#             - which is a .ini template
-#
-#        version
-#             - version to display on the blue background
-#
-#        UserAgent
-#             - user agent to use in the windows registry.  should be the same as the one
-#               built into the browser (ie "6.0b2 (en)")
-#
-#        Path to staging area
-#             - path on where the seamonkey built bits are staged to
-#
-#        xpi path
-#             - path on where xpi files will be located at
-#
-#        redirect file url
-#             - url to where the redirect.ini file will be staged at.
-#               Either ftp:// or http:// can be used
-#               ie: ftp://ftp.netscape.com/pub/seamonkey
-#
-#        xpi url
-#             - url to where the .xpi files will be staged at.
-#               Either ftp:// or http:// can be used
-#               ie: ftp://ftp.netscape.com/pub/seamonkey/xpi
-#
-#   ie: perl makecfgini.pl config.it 5.0.0.1999120608 "5.0b1 (en)" k:\windows\32bit\5.0 d:\builds\mozilla\dist\win32_o.obj\install\xpi ftp://ftp.netscape.com/pub/seamonkey/windows/32bit/x86/1999-09-13-10-M10 ftp://ftp.netscape.com/pub/seamonkey/windows/32bit/x86/1999-09-13-10-M10/xpi
-#
-#
-
-# Make sure there are at least two arguments
-if($#ARGV < 6)
-{
-  die "usage: $0 <.it file> <version> <UserAgent> <staging path> <.xpi path> <redirect file url> <xpi url>
-
-       .it file      : input ini template file
-
-       version       : version to be shown in setup.  Typically the same version
-                       as show in mozilla.exe.
-
-       UserAgent     : user agent to use in the windows registry.  should be the same as the one
-                       built into the browser (ie \"6.0b2 (en)\")
-
-       staging path  : path to where the components are staged at
-
-       .xpi path     : path to where the .xpi files have been built to
-                       ie: d:\\builds\\mozilla\\dist\\win32_o.obj\\install\\xpi
-
-       redirect file : url to where the redirect.ini file will be staged at.
-       url             Either ftp:// or http:// can be used
-                       ie: ftp://ftp.netscape.com/pub/seamonkey
-       xpi url       : url to where the .xpi files will be staged at.
-                       Either ftp:// or http:// can be used
-                       ie: ftp://ftp.netscape.com/pub/seamonkey/xpi
-       \n";
-}
-
-$inItFile         = $ARGV[0];
-$inVersion        = $ARGV[1];
-$inUserAgent      = $ARGV[2];
-$inStagePath      = $ARGV[3];
-$inXpiPath        = $ARGV[4];
-$inRedirIniUrl    = $ARGV[5];
-$inUrl            = $ARGV[6];
-
-$inDomain;
-$inServerPath;
-
-($inDomain, $inServerPath) = ParseDomainAndPath($inUrl);
-
-# Get the name of the file replacing the .it extension with a .ini extension
-@inItFileSplit    = split(/\./,$inItFile);
-$outIniFile       = $inItFileSplit[0];
-$outIniFile      .= ".ini";
-
-# Open the input file
-open(fpInIt, $inItFile) || die "\ncould not open $ARGV[0]: $!\n";
-
-# Open the output file
-open(fpOutIni, ">$outIniFile") || die "\nCould not open $outIniFile: $!\n";
-
-print "\n Making $outIniFile...\n";
-
-# While loop to read each line from input file
-while($line = <fpInIt>)
-{
-  # For each line read, search and replace $InstallSize$ with the calculated size
-  if($line =~ /\$InstallSize\$/i)
-  {
-    $installSize          = 0;
-    $installSizeSystem    = 0;
-
-    # split read line by ":" deliminator
-    @colonSplit = split(/:/, $line);
-    if($#colonSplit >= 0)
-    {
-      $componentName    = $colonSplit[1];
-      chop($componentName);
-
-      $installSize      = OutputInstallSize("$inStagePath\\$componentName");
-
-      # special oji consideration here.  Since it's an installer that 
-      # seamonkey installer will be calling, the disk space allocation
-      # needs to be adjusted by an expansion factor of 3.62.
-      if($componentName =~ /oji/i)
-      {
-        $installSize = int($installSize * 3.62);
-      }
-    }
-
-    # Read the next line to calculate for the "Install Size System="
-    if($line = <fpInIt>)
-    {
-      if($line =~ /\$InstallSizeSystem\$/i)
-      {
-        $installSizeSystem = OutputInstallSizeSystem($line, "$inStagePath\\$componentName");
-      }
-    }
-
-    $installSize -= $installSizeSystem;
-    print fpOutIni "Install Size=$installSize\n";
-    print fpOutIni "Install Size System=$installSizeSystem\n";
-  }
-  elsif($line =~ /\$InstallSizeArchive\$/i)
-  {
-    $installSizeArchive = 0;
-
-    # split read line by ":" deliminator
-    @colonSplit = split(/:/, $line);
-    if($#colonSplit >= 0)
-    {
-      $componentName = $colonSplit[1];
-      chop($componentName);
-
-      $installSizeArchive = OutputInstallSizeArchive("$inXpiPath\\$componentName");
-    }
-
-    print fpOutIni "Install Size Archive=$installSizeArchive\n";
-  }
-  else
-  {
-    # For each line read, search and replace $Version$ with the version passed in
-    $line =~ s/\$Version\$/$inVersion/i;
-    $line =~ s/\$Domain\$/$inDomain/i;
-    $line =~ s/\$ServerPath\$/$inServerPath/i;
-    $line =~ s/\$RedirIniUrl\$/$inRedirIniUrl/i;
-    $line =~ s/\$UserAgent\$/$inUserAgent/i;
-    print fpOutIni $line;
-  }
-}
-
-print " done!\n";
-
-# end of script
-exit(0);
-
-sub ParseDomainAndPath()
-{
-  my($aUrl) = @_;
-  my($aDomain, $aServerPath);
-
-  @slashSplit = split(/\//, $aUrl);
-  if($#slashSplit >= 0)
-  {
-    for($i = 0; $i <= $#slashSplit; $i++)
-    {
-      if($i <= 2)
-      {
-        if($aDomain eq "")
-        {
-          $aDomain = "$slashSplit[$i]";
-        }
-        else
-        {
-          $aDomain = "$aDomain/$slashSplit[$i]";
-        }
-      }
-      else
-      {
-        if($aServerPath eq "")
-        {
-          $aServerPath = "/$slashSplit[$i]";
-        }
-        else
-        {
-          $aServerPath = "$aServerPath/$slashSplit[$i]";
-        }
-      }
-    }
-  }
-
-  return($aDomain, $aServerPath);
-}
-
-sub OutputInstallSize()
-{
-  my($inPath) = @_;
-  my($installSize);
-
-  print "   calculating size for $inPath\n";
-  $installSize    = `ds32.exe /D /L0 /A /S /C 32768 $inPath`;
-  $installSize   += 32768; # take into account install.js
-  $installSize    = int($installSize / 1024);
-  $installSize   += 1;
-  return($installSize);
-}
-
-sub OutputInstallSizeArchive()
-{
-  my($inPath) = @_;
-  my($installSizeArchive);
-  my($dev, $ino, $mode, $nlink, $uid, $gui, $rdev, $size, $atime, $mtime, $ctime, $blksize, $blocks);
-
-  print "   calculating size for $inPath\n";
-  ($dev, $ino, $mode, $nlink, $uid, $gui, $rdev, $size, $atime, $mtime, $ctime, $blksize, $blocks) = stat $inPath;
-  $installSizeArchive   += 32768; # take into account install.js
-  $installSizeArchive    = int($size / 1024);
-  $installSizeArchive   += 1;
-  return($installSizeArchive);
-}
-
-sub OutputInstallSizeSystem()
-{
-  my($inLine, $inPath) = @_;
-  my($installSizeSystem) = 0;
-
-  # split read line by ":" deliminator
-  @colonSplit = split(/:/, $inLine);
-  if($#colonSplit >= 0)
-  {
-    # split line by "," deliminator
-    @commaSplit = split(/\,/, $colonSplit[1]);
-    if($#commaSplit >= 0)
-    {
-      foreach(@commaSplit)
-      {
-        # calculate the size of component installed using ds32.exe in Kbytes
-        print "   calculating size for $inPath\\$_";
-        $installSizeSystem += `ds32.exe /D /L0 /A /S /C 32768 $inPath\\$_`;
-      }
-    }
-  }
-
-  $installSizeSystem  = int($installSizeSystem / 1024);
-  $installSizeSystem += 1;
-  return($installSizeSystem);
-}
-

mozilla/xpinstall/packager/windows/makejs.pl

@@ -1,122 +0,0 @@
-#!c:\perl\bin\perl
-# 
-# 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 Communicator client code, released
-# March 31, 1998.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1998-1999 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s): 
-# Sean Su <ssu@netscape.com>
-# 
-
-#
-# This perl script parses the input file for special variables
-# in the format of $Variable$ and replace it with the appropriate
-# value(s).
-#
-# Input: .jst file              - which is a .js template
-#        default version        - a julian date in the form of:
-#                                 major.minor.release.yydoy
-#                                 ie: 5.0.0.99256
-#        user agent             - user agent of product
-#        component staging path - path to where the components are staged at
-#
-#        ie: perl makejs.pl core.jst 5.0.0.99256
-#
-
-# Make sure there are at least two arguments
-if($#ARGV < 3)
-{
-  die "usage: $0 <.jst file> <default version> <UserAgent> <staging path>
-
-       .jst file              : .js template input file
-       default version        : default julian base version number to use in the
-                                form of: major.minor.release.yydoy
-                                ie: 5.0.0.99256
-       user agent             : user agent of product (5.0b1 [en])
-       component staging path : path to where this component is staged at
-                                ie: z:\\stage\\windows\\32bit\\en\\5.0\\core
-       \n";
-}
-
-$inJstFile        = $ARGV[0];
-$inVersion        = $ARGV[1];
-$inUserAgent      = $ARGV[2];
-$inStagePath      = $ARGV[3];
-
-# Get the name of the file replacing the .jst extension with a .js extension
-@inJstFileSplit   = split(/\./,$inJstFile);
-$outJsFile        = $inJstFileSplit[0];
-$outJsFile       .= ".js";
-$outTempFile      = $inJstFileSplit[0];
-$outTempFile     .= ".template";
-
-system("copy ..\\common\\share.t $outTempFile");
-system("cat $inJstFile >> $outTempFile");
-
-# Open the input .template file
-open(fpInTemplate, $outTempFile) || die "\ncould not open $outTempFile: $!\n";
-
-# Open the output .js file
-open(fpOutJs, ">$outJsFile") || die "\nCould not open $outJsFile: $!\n";
-
-# While loop to read each line from input file
-while($line = <fpInTemplate>)
-{
-  # For each line read, search and replace $Version$ with the version passed in
-  if($line =~ /\$Version\$/i)
-  {
-    $line =~ s/\$Version\$/$inVersion/i;
-  }
-  elsif($line =~ /\$UserAgent\$/i)
-  {
-    $line =~ s/\$UserAgent\$/$inUserAgent/i;
-  }
-  elsif($line =~ /\$SpaceRequired\$/i) # For each line read, search and replace $InstallSize$ with the calculated size
-  {
-    $spaceRequired = 0;
-
-    # split read line by ":" deliminator
-    @colonSplit = split(/:/, $line);
-    if($#colonSplit > 0)
-    {
-      @semiColonSplit = split(/;/, $colonSplit[1]);
-      $subDir         = $semiColonSplit[0];
-      $spaceRequired  = GetSpaceRequired("$inStagePath\\$subDir");
-      $line =~ s/\$SpaceRequired\$:$subDir/$spaceRequired/i;
-    }
-    else
-    {
-      $spaceRequired = GetSpaceRequired("$inStagePath");
-      $line =~ s/\$SpaceRequired\$/$spaceRequired/i;
-    }
-  }
-
-  print fpOutJs $line;
-}
-
-sub GetSpaceRequired()
-{
-  my($inPath) = @_;
-  my($spaceRequired);
-
-  print "   calulating size for $inPath\n";
-  $spaceRequired    = `ds32.exe /D /L0 /A /S /C 32768 $inPath`;
-  $spaceRequired    = int($spaceRequired / 1024);
-  $spaceRequired   += 1;
-  return($spaceRequired);
-}
-

mozilla/xpinstall/packager/windows/makexpi.pl

@@ -1,114 +0,0 @@
-#!c:\perl\bin\perl
-# 
-# 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 Communicator client code, released
-# March 31, 1998.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1998-1999 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s): 
-# Sean Su <ssu@netscape.com>
-# 
-
-#
-# This perl script creates .xpi files given component input name
-#
-# Input: component name
-#             - name of the component directory located in the staging path
-#        staging path
-#             - path to where the built files are staged at
-#        dest path
-#             - path to where the .xpi files are are to be created at.
-#               ** MUST BE AN ABSOLUTE PATH, NOT A RELATIVE PATH **
-#
-#   ie: perl makexpi.pl core z:\exposed\windows\32bit\en\5.0 d:\build\mozilla\dist\win32_o.obj\install\working
-#
-
-use File::Copy;
-use Cwd;
-
-# Make sure there are at least three arguments
-if($#ARGV < 2)
-{
-  die "usage: $0 <component name> <staging path> <dest path>
-
-       component name : name of component directory within staging path
-       staging path   : path to where the components are staged at
-       dest path      : path to where the .xpi files are to be created at
-       \n";
-}
-
-$inComponentName  = $ARGV[0];
-$inStagePath      = $ARGV[1];
-$inDestPath       = $ARGV[2];
-
-# check for existance of staging component path
-if(!(-e "$inStagePath\\$inComponentName"))
-{
-  die "invalid path: $inStagePath\\$inComponentName\n";
-}
-
-# check for existance of .js script
-if(!(-e "$inComponentName.js"))
-{
-  die "missing .js script: $inComponentName.js\n";
-}
-
-# delete component .xpi file
-if(-e "$inDestPath\\$inComponentName.xpi")
-{
-  unlink("$inDestPath\\$inComponentName.xpi");
-}
-if(-e "$inStagePath\\$incomponentName\\$inComponentName.xpi")
-{
-  unlink("$inDestPath\\$inComponentName.xpi");
-}
-
-# delete install.js
-if(-e "install.js")
-{
-  unlink("install.js");
-}
-
-# make sure inDestPath exists
-if(!(-e "$inDestPath"))
-{
-  system("mkdir $inDestPath");
-}
-
-print "\n Making $inComponentName.xpi...\n";
-
-$saveCwdir = cwd();
-
-# change directory to where the files are, else zip will store
-# unwanted path information.
-chdir("$inStagePath\\$inComponentName");
-system("zip -r $inDestPath\\$inComponentName.xpi *");
-chdir("$saveCwdir");
-
-copy("$inComponentName.js", "install.js");
-system("zip -g $inDestPath\\$inComponentName.xpi install.js");
-
-# delete install.js
-if(-e "install.js")
-{
-  unlink("install.js");
-}
-
-print " done!\n";
-
-# end of script
-exit(0);
-

mozilla/xpinstall/packager/windows/rdir.pl

@@ -1,111 +0,0 @@
-#!c:\perl\bin\perl
-# 
-# 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 Communicator client code, released
-# March 31, 1998.
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1998-1999 Netscape Communications Corporation. All
-# Rights Reserved.
-# 
-# Contributor(s): 
-# Sean Su <ssu@netscape.com>
-# 
-
-use Cwd;
-
-if($#ARGV < 0)
-{
-    print_usage();
-    exit(1);
-}
-
-print "removing directory:\n";
-for($i = 0; $i <= $#ARGV; $i++)
-{
-    print "  $ARGV[$i]";
-    remove_dir_structure($ARGV[$i]);
-    print "\n";
-}
-
-exit(0);
-# end
-
-sub remove_dir_structure
-{
-    my($curr_dir) = @_;
-    $save_cwd     = cwd();
-    $save_cwd     =~ s/\//\\/g;
-    if((-e "$curr_dir") && (-d "$curr_dir"))
-    {
-        remove_all_dir($curr_dir);
-        chdir($save_cwd);
-        remove_directory($curr_dir);
-        print " done!";
-    }
-    else
-    {
-        if(!(-e "$curr_dir"))
-        {
-            print "\n";
-            print "$curr_dir does not exist!";
-        }
-        elsif(!(-d "$curr_dir"))
-        {
-            print "\n";
-            print "$curr_dir is not a valid directory!";
-        }
-    }
-}
-
-sub remove_all_dir
-{
-    my($curr_dir) = @_;
-    my(@dirlist);
-    my($dir);
-
-    chdir("$curr_dir");
-    @dirlist = <*>;
-    foreach $dir (@dirlist)
-    {
-        if(-d "$dir")
-        {
-            print ".";
-            remove_all_dir($dir);
-        }
-    }
-    chdir("..");
-    remove_directory($curr_dir);
-}
-
-sub remove_directory
-{
-    my($directory) = @_;
-    my($save_cwd);
-
-    $save_cwd = cwd();
-    $save_cwd =~ s/\//\\/g;
-
-    if(-e "$directory")
-    {
-        chdir($directory);
-        unlink <*>; # remove files
-        chdir($save_cwd);
-        rmdir $directory;         # remove directory
-    }
-}
-
-sub print_usage
-{
-    print "usage: $0 <dir1> [dir2 dir3...]\n";
-}

mozilla/xpinstall/public/MANIFEST

@@ -0,0 +1,6 @@
+#
+# This is a list of local files which get copied to the mozilla:dist directory
+#
+
+nsISoftwareUpdate.h
+nsSoftwareUpdateIIDs.h

mozilla/xpinstall/public/Makefile.in

@@ -0,0 +1,47 @@
+#!gmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "License"); you 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 Communicator client code, 
+# released March 31, 1998. 
+#
+# 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.
+#
+# Contributors:
+#     Daniel Veditz <dveditz@netscape.com>
+#     Douglas Turner <dougt@netscape.com>
+
+DEPTH = ../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE = xpinstall
+
+XPIDLSRCS = nsIXPInstallProgress.idl
+
+EXPORTS =		             \
+        nsIDOMInstallTriggerGlobal.h \
+        nsIDOMInstallVersion.h       \
+        nsSoftwareUpdateIIDs.h       \
+        nsISoftwareUpdate.h          \
+        $(NULL)
+
+EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))
+
+include $(topsrcdir)/config/config.mk
+
+include $(topsrcdir)/config/rules.mk

mozilla/xpinstall/public/idl/Install.idl

@@ -0,0 +1,113 @@
+interface Install
+{
+/* IID: { 0x18c2f988, 0xb09f, 0x11d2, \
+  {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53}} */
+
+	const int BAD_PACKAGE_NAME          = -200;
+	const int UNEXPECTED_ERROR          = -201;
+	const int ACCESS_DENIED             = -202;
+	const int TOO_MANY_CERTIFICATES     = -203; /* Installer file must have 1 certificate */
+	const int NO_INSTALLER_CERTIFICATE  = -204; /* Installer file must have a certificate */
+	const int NO_CERTIFICATE            = -205; /* Extracted file is not signed */
+	const int NO_MATCHING_CERTIFICATE   = -206; /* Extracted file does not match installer certificate */
+	const int UNKNOWN_JAR_FILE          = -207; /* JAR file has not been opened */
+	const int INVALID_ARGUMENTS         = -208; /* Bad arguments to a function */
+	const int ILLEGAL_RELATIVE_PATH     = -209; /* Illegal relative path */
+	const int USER_CANCELLED            = -210; /* User cancelled */
+	const int INSTALL_NOT_STARTED       = -211;
+	const int SILENT_MODE_DENIED        = -212;
+	const int NO_SUCH_COMPONENT         = -213; /* no such component in the registry. */
+	const int FILE_DOES_NOT_EXIST       = -214; /* File cannot be deleted as it does not exist */
+	const int FILE_READ_ONLY            = -215; /* File cannot be deleted as it is read only. */
+	const int FILE_IS_DIRECTORY         = -216; /* File cannot be deleted as it is a directory */
+	const int NETWORK_FILE_IS_IN_USE    = -217; /* File on the network is in-use */
+	const int APPLE_SINGLE_ERR          = -218; /* error in AppleSingle unpacking */
+	const int INVALID_PATH_ERR          = -219; /* GetFolder() did not like the folderID */
+	const int PATCH_BAD_DIFF            = -220; /* error in GDIFF patch */
+	const int PATCH_BAD_CHECKSUM_TARGET = -221; /* source file doesn't checksum  */
+	const int PATCH_BAD_CHECKSUM_RESULT = -222; /* final patched file fails checksum  */
+	const int UNINSTALL_FAILED          = -223; /* error while uninstalling a package  */
+	const int GESTALT_UNKNOWN_ERR       = -5550;         
+	const int GESTALT_INVALID_ARGUMENT  = -5551;
+
+	const int SUCCESS					  = 0;
+	const int REBOOT_NEEDED               = 999;
+
+	/* install types */
+	const int LIMITED_INSTALL             = 0;
+	const int FULL_INSTALL                = 1;
+	const int NO_STATUS_DLG				  = 2;
+	const int NO_FINALIZE_DLG			  = 4;
+
+	// these should not be public...
+	/* message IDs*/
+	const int SU_INSTALL_FILE_UNEXPECTED_MSG_ID  = 0;
+	const int SU_DETAILS_REPLACE_FILE_MSG_ID  = 1;
+	const int SU_DETAILS_INSTALL_FILE_MSG_ID  = 2;
+    //////////////////////////
+	
+	readonly attribute wstring UserPackageName;
+	readonly attribute wstring RegPackageName;
+
+	void Install();
+
+	void AbortInstall();
+
+	long AddDirectory(	   in wstring regName, 
+						   in wstring version, 
+						   in wstring jarSource,         
+						   in InstallFolder folder, 
+						   in wstring subdir, 
+						   in boolean forceMode );
+
+
+	long AddSubcomponent(  in wstring regName, 
+						   in wstring version, 
+						   in wstring jarSource,         
+						   in InstallFolder folder, 
+						   in wstring targetName, 
+						   in boolean forceMode );
+
+	long DeleteComponent(  in wstring registryName);
+
+	long DeleteFile(       in InstallFolder folder,
+						   in wstring relativeFileName );
+	
+	long DiskSpaceAvailable( in InstallFolder folder );
+	
+	long Execute(in wstring jarSource, in wstring args);
+	
+	long FinalizeInstall();
+
+	long Gestalt (in wstring selector);
+
+	InstallFolder GetComponentFolder( in wstring regName, 
+						              in wstring subdirectory);
+
+	InstallFolder GetFolder(in wstring targetFolder, 
+				            in wstring subdirectory);
+
+	long GetLastError();
+
+	long GetWinProfile(in InstallFolder folder, in wstring file);
+	
+	long GetWinRegistry();
+
+	long Patch( in wstring regName, 
+				in wstring version, 
+				in wstring jarSource,
+				in InstallFolder folder, 
+				in wstring targetName );
+	
+	void ResetError();
+
+	void SetPackageFolder( in InstallFolder folder );
+	
+	long StartInstall( in wstring userPackageName,
+					   in wstring packageName, 
+					   in wstring version, 
+					   in long flags );
+
+	long Uninstall( in wstring packageName);
+
+};

mozilla/xpinstall/public/idl/InstallTrigger.idl

@@ -0,0 +1,24 @@
+interface InstallTriggerGlobal
+{
+/* IID: { 0x18c2f987, 0xb09f, 0x11d2, \
+  {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53}} */
+	
+	const int MAJOR_DIFF =  4;
+    const int MINOR_DIFF =  3;
+    const int REL_DIFF   =  2;
+    const int BLD_DIFF   =  1;
+    const int EQUAL      =  0;	
+
+	boolean UpdateEnabled ();
+
+	long StartSoftwareUpdate(in wstring URL);
+
+	long ConditionalSoftwareUpdate(	in wstring URL, 
+									in wstring regName,
+									in long diffLevel, 
+									in wstring version, 
+									in long mode);
+
+	long CompareVersion( in wstring regName, in wstring version );
+
+};

mozilla/xpinstall/public/idl/InstallVersion.idl

@@ -0,0 +1,34 @@
+interface InstallVersion
+{
+/* IID: { 0x18c2f986, 0xb09f, 0x11d2, \
+  {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53}} */
+	 
+	const int EQUAL				=  0;
+    const int BLD_DIFF			=  1;
+	const int BLD_DIFF_MINUS		= -1;
+    const int REL_DIFF			=  2;
+	const int REL_DIFF_MINUS		= -2;
+    const int MINOR_DIFF			=  3;
+	const int MINOR_DIFF_MINUS   = -3;
+    const int MAJOR_DIFF			=  4;
+	const int MAJOR_DIFF_MINUS   = -4;
+	
+	attribute int major;
+	attribute int minor;
+	attribute int release;
+	attribute int build;
+
+	void InstallVersion();
+
+	void init(in wstring versionString);	
+/*
+	void init(in int major, in int minor, in int release, in int build);	
+*/
+	wstring toString();
+
+/*	int compareTo(in wstring version);
+	int compareTo(in int major, in int minor, in int release, in int build);
+*/
+	int compareTo(in InstallVersion versionObject);
+
+};

mozilla/xpinstall/public/makefile.win

@@ -0,0 +1,36 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "License"); you 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 Communicator client code, 
+# released March 31, 1998. 
+#
+# 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.
+#
+# Contributors:
+#     Daniel Veditz <dveditz@netscape.com>
+#     Douglas Turner <dougt@netscape.com>
+
+MODULE=xpinstall 
+DEPTH=..\..
+
+EXPORTS=    nsIDOMInstallTriggerGlobal.h \
+			nsIDOMInstallVersion.h       \
+            nsSoftwareUpdateIIDs.h       \
+			nsISoftwareUpdate.h
+
+XPIDLSRCS = .\nsIXPInstallProgress.idl        
+
+include <$(DEPTH)\config\config.mak>
+include <$(DEPTH)\config\rules.mak>

mozilla/xpinstall/public/nsIDOMInstall.h

@@ -0,0 +1 @@
+#error

mozilla/xpinstall/public/nsIDOMInstallTriggerGlobal.h

@@ -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 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.
+ */
+/* AUTO-GENERATED. DO NOT EDIT!!! */
+
+#ifndef nsIDOMInstallTriggerGlobal_h__
+#define nsIDOMInstallTriggerGlobal_h__
+
+#include "nsISupports.h"
+#include "nsString.h"
+#include "nsIScriptContext.h"
+
+
+#define NS_IDOMINSTALLTRIGGERGLOBAL_IID \
+ { 0x18c2f987, 0xb09f, 0x11d2, \
+  {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53}} 
+
+class nsIDOMInstallTriggerGlobal : public nsISupports {
+public:
+  static const nsIID& IID() { static nsIID iid = NS_IDOMINSTALLTRIGGERGLOBAL_IID; return iid; }
+  enum {
+    MAJOR_DIFF = 4,
+    MINOR_DIFF = 3,
+    REL_DIFF = 2,
+    BLD_DIFF = 1,
+    EQUAL = 0
+  };
+
+  NS_IMETHOD    UpdateEnabled(PRBool* aReturn)=0;
+
+  NS_IMETHOD    StartSoftwareUpdate(const nsString& aURL, PRInt32* aReturn)=0;
+  NS_IMETHOD    StartSoftwareUpdate(const nsString& aURL, PRInt32 aFlags, PRInt32* aReturn)=0;
+
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn)=0;
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn)=0;
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn)=0;
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn)=0;
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn)=0;
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn)=0;
+
+  NS_IMETHOD    CompareVersion(const nsString& aRegName, PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn)=0;
+  NS_IMETHOD    CompareVersion(const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn)=0;
+  NS_IMETHOD    CompareVersion(const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn)=0;
+};
+
+
+#define NS_DECL_IDOMINSTALLTRIGGERGLOBAL   \
+  NS_IMETHOD    UpdateEnabled(PRBool* aReturn);  \
+  NS_IMETHOD    StartSoftwareUpdate(const nsString& aURL, PRInt32 aFlags, PRInt32* aReturn);  \
+  NS_IMETHOD    StartSoftwareUpdate(const nsString& aURL, PRInt32* aReturn);  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn);  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn);  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn);  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn);  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn);  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn);  \
+  NS_IMETHOD    CompareVersion(const nsString& aRegName, PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn);  \
+  NS_IMETHOD    CompareVersion(const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn);  \
+  NS_IMETHOD    CompareVersion(const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn);  \
+
+
+
+#define NS_FORWARD_IDOMINSTALLTRIGGERGLOBAL(_to)  \
+  NS_IMETHOD    UpdateEnabled(PRBool* aReturn) { return _to##UpdateEnabled(aReturn); }  \
+  NS_IMETHOD    StartSoftwareUpdate(const nsString& aURL, PRInt32 aFlags, PRInt32* aReturn) { return _to##StartSoftwareUpdate(aURL, aFlags, aReturn); }  \
+  NS_IMETHOD    StartSoftwareUpdate(const nsString& aURL, PRInt32* aReturn) { return _to##StartSoftwareUpdate(aURL, aReturn); }  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn) { return _to##ConditionalSoftwareUpdate(aURL, aRegName, aDiffLevel, aVersion, aMode, aReturn); }  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn) { return _to##ConditionalSoftwareUpdate(aURL, aRegName, aDiffLevel, aVersion, aMode, aReturn); }  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, nsIDOMInstallVersion* aRegName, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn) { return _to##ConditionalSoftwareUpdate(aURL, aDiffLevel, aVersion, aMode, aReturn); }  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn) { return _to##ConditionalSoftwareUpdate(aURL, aDiffLevel, aVersion, aMode, aReturn); }  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn) { return _to##ConditionalSoftwareUpdate(aURL, aDiffLevel, aVersion, aReturn); }  \
+  NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn) { return _to##ConditionalSoftwareUpdate(aURL, aDiffLevel, aVersion, aReturn); }  \
+  NS_IMETHOD    CompareVersion(const nsString& aRegName, PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn) { return _to##CompareVersion(aRegName, aMajor, aMinor, aRelease, aBuild, aReturn); }  \
+  NS_IMETHOD    CompareVersion(const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn) { return _to##CompareVersion(aRegName, aVersion, aReturn); }  \
+  NS_IMETHOD    CompareVersion(const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn) { return _to##CompareVersion(aRegName, aVersion, aReturn); }  \
+
+
+extern nsresult NS_InitInstallTriggerGlobalClass(nsIScriptContext *aContext, void **aPrototype);
+
+extern "C" NS_DOM nsresult NS_NewScriptInstallTriggerGlobal(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn);
+
+#endif // nsIDOMInstallTriggerGlobal_h__

mozilla/xpinstall/public/nsIDOMInstallVersion.h

@@ -0,0 +1,107 @@
+/* -*- 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.
+ */
+/* AUTO-GENERATED. DO NOT EDIT!!! */
+
+#ifndef nsIDOMInstallVersion_h__
+#define nsIDOMInstallVersion_h__
+
+#include "nsISupports.h"
+#include "nsString.h"
+#include "nsIScriptContext.h"
+
+class nsIDOMInstallVersion;
+
+#define NS_IDOMINSTALLVERSION_IID \
+ { 0x18c2f986, 0xb09f, 0x11d2, \
+  {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53}} 
+
+class nsIDOMInstallVersion : public nsISupports {
+public:
+  static const nsIID& IID() { static nsIID iid = NS_IDOMINSTALLVERSION_IID; return iid; }
+  enum {
+    EQUAL = 0,
+    BLD_DIFF = 1,
+    BLD_DIFF_MINUS = -1,
+    REL_DIFF = 2,
+    REL_DIFF_MINUS = -2,
+    MINOR_DIFF = 3,
+    MINOR_DIFF_MINUS = -3,
+    MAJOR_DIFF = 4,
+    MAJOR_DIFF_MINUS = -4
+  };
+
+  NS_IMETHOD    GetMajor(PRInt32* aMajor)=0;
+  NS_IMETHOD    SetMajor(PRInt32 aMajor)=0;
+
+  NS_IMETHOD    GetMinor(PRInt32* aMinor)=0;
+  NS_IMETHOD    SetMinor(PRInt32 aMinor)=0;
+
+  NS_IMETHOD    GetRelease(PRInt32* aRelease)=0;
+  NS_IMETHOD    SetRelease(PRInt32 aRelease)=0;
+
+  NS_IMETHOD    GetBuild(PRInt32* aBuild)=0;
+  NS_IMETHOD    SetBuild(PRInt32 aBuild)=0;
+
+  NS_IMETHOD    Init(const nsString& aVersionString)=0;
+
+  NS_IMETHOD    ToString(nsString& aReturn)=0;
+
+  NS_IMETHOD    CompareTo(nsIDOMInstallVersion* aVersionObject, PRInt32* aReturn)=0;
+  NS_IMETHOD    CompareTo(const nsString& aString, PRInt32* aReturn)=0;
+  NS_IMETHOD    CompareTo(PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn)=0;
+};
+
+
+#define NS_DECL_IDOMINSTALLVERSION   \
+  NS_IMETHOD    GetMajor(PRInt32* aMajor);  \
+  NS_IMETHOD    SetMajor(PRInt32 aMajor);  \
+  NS_IMETHOD    GetMinor(PRInt32* aMinor);  \
+  NS_IMETHOD    SetMinor(PRInt32 aMinor);  \
+  NS_IMETHOD    GetRelease(PRInt32* aRelease);  \
+  NS_IMETHOD    SetRelease(PRInt32 aRelease);  \
+  NS_IMETHOD    GetBuild(PRInt32* aBuild);  \
+  NS_IMETHOD    SetBuild(PRInt32 aBuild);  \
+  NS_IMETHOD    Init(const nsString& aVersionString);  \
+  NS_IMETHOD    ToString(nsString& aReturn);  \
+  NS_IMETHOD    CompareTo(nsIDOMInstallVersion* aVersionObject, PRInt32* aReturn);  \
+  NS_IMETHOD    CompareTo(const nsString& aString, PRInt32* aReturn);  \
+  NS_IMETHOD    CompareTo(PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn);  \
+
+
+
+#define NS_FORWARD_IDOMINSTALLVERSION(_to)  \
+  NS_IMETHOD    GetMajor(PRInt32* aMajor) { return _to##GetMajor(aMajor); } \
+  NS_IMETHOD    SetMajor(PRInt32 aMajor) { return _to##SetMajor(aMajor); } \
+  NS_IMETHOD    GetMinor(PRInt32* aMinor) { return _to##GetMinor(aMinor); } \
+  NS_IMETHOD    SetMinor(PRInt32 aMinor) { return _to##SetMinor(aMinor); } \
+  NS_IMETHOD    GetRelease(PRInt32* aRelease) { return _to##GetRelease(aRelease); } \
+  NS_IMETHOD    SetRelease(PRInt32 aRelease) { return _to##SetRelease(aRelease); } \
+  NS_IMETHOD    GetBuild(PRInt32* aBuild) { return _to##GetBuild(aBuild); } \
+  NS_IMETHOD    SetBuild(PRInt32 aBuild) { return _to##SetBuild(aBuild); } \
+  NS_IMETHOD    Init(const nsString& aVersionString) { return _to##Init(aVersionString); }  \
+  NS_IMETHOD    ToString(nsString& aReturn) { return _to##ToString(aReturn); }  \
+  NS_IMETHOD    CompareTo(nsIDOMInstallVersion* aVersionObject, PRInt32* aReturn) { return _to##CompareTo(aVersionObject, aReturn); }  \
+  NS_IMETHOD    CompareTo(const nsString& aString, PRInt32* aReturn) { return _to##CompareTo(aString, aReturn); }  \
+  NS_IMETHOD    CompareTo(PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn) { return _to##CompareTo(aMajor, aMinor, aRelease, aBuild, aReturn); }  \
+
+
+extern nsresult NS_InitInstallVersionClass(nsIScriptContext *aContext, void **aPrototype);
+
+extern "C" NS_DOM nsresult NS_NewScriptInstallVersion(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn);
+
+#endif // nsIDOMInstallVersion_h__

mozilla/xpinstall/public/nsISoftwareUpdate.h

@@ -0,0 +1,85 @@
+/* -*- 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.0 (the "License"); you 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 Communicator client code, 
+ * released March 31, 1998. 
+ *
+ * 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.
+ *
+ * Contributors:
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+#ifndef nsISoftwareUpdate_h__
+#define nsISoftwareUpdate_h__
+
+#include "nsISupports.h"
+#include "nsIFactory.h"
+#include "nsString.h"
+
+#include "nsIXPInstallProgress.h"
+
+#define NS_IXPINSTALLCOMPONENT_PROGID NS_IAPPSHELLCOMPONENT_PROGID "/xpinstall"
+#define NS_IXPINSTALLCOMPONENT_CLASSNAME "Mozilla XPInstall Component"
+
+
+#define NS_ISOFTWAREUPDATE_IID                   \
+{ 0x18c2f992, 									 \
+  0xb09f, 										 \
+  0x11d2,						                 \
+ {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53}\
+} 
+
+
+class nsISoftwareUpdate : public nsISupports  
+{
+    public:
+        	NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISOFTWAREUPDATE_IID)
+            
+            NS_IMETHOD InstallJar(const nsString& fromURL,
+                                  const nsString& localFile,
+                                  long  flags) = 0; 
+            
+            NS_IMETHOD RegisterNotifier(nsIXPInstallProgress *notifier) = 0;
+            
+            NS_IMETHOD InstallPending(void) = 0;
+
+            /* FIX: these should be in a private interface */
+            NS_IMETHOD InstallJarCallBack()                   = 0; 
+            NS_IMETHOD GetTopLevelNotifier(nsIXPInstallProgress **notifier) = 0;
+};
+
+
+class nsSoftwareUpdateFactory : public nsIFactory 
+{
+    public:
+        
+        nsSoftwareUpdateFactory();
+        virtual ~nsSoftwareUpdateFactory();
+        
+        NS_DECL_ISUPPORTS
+
+              NS_IMETHOD CreateInstance(nsISupports *aOuter,
+                                        REFNSIID aIID,
+                                        void **aResult);
+
+              NS_IMETHOD LockFactory(PRBool aLock);
+
+};
+
+
+#endif // nsISoftwareUpdate_h__
+

mozilla/xpinstall/public/nsIXPInstallProgress.idl

@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- Mode: IDL; 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.0 (the "NPL"); you may not use this file except in
@@ -16,10 +16,15 @@
  * Reserved.
  */
 
-#ifndef __NS_JSFILEOBJ_H__
-#define __NS_JSFILEOBJ_H__
+#include "nsISupports.idl"
 
-PRInt32 
-InitFileSpecObjectPrototype(JSContext *jscontext, JSObject *global, JSObject **fileSpecObjectPrototype);
-
-#endif
+[uuid(eea90d40-b059-11d2-915e-c12b696c9333)]
+interface nsIXPInstallProgress : nsISupports
+{
+        void BeforeJavascriptEvaluation();
+        void AfterJavascriptEvaluation();
+        void InstallStarted([const] in string UIPackageName);
+        void ItemScheduled([const] in string message );
+        void InstallFinalization([const] in string message, in long itemNum, in long totNum );
+        void InstallAborted();
+};

mozilla/xpinstall/public/nsIXPInstallProgressNotifier.h

@@ -0,0 +1,93 @@
+/* -*- 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.0 (the "License"); you 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 Communicator client code, 
+ * released March 31, 1998. 
+ *
+ * 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.
+ *
+ * Contributors:
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+
+#ifndef nsIXPInstallProgressNotifier_h__
+#define nsIXPInstallProgressNotifier_h__
+
+
+class nsIXPInstallProgressNotifier
+{
+     public:
+        
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+        // Function name	: BeforeJavascriptEvaluation
+        // Description	    : This will be called when prior to the install script being evaluate
+        // Return type		: void 
+        // Argument         : void
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+
+        virtual void BeforeJavascriptEvaluation(void) = 0;
+        
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+        // Function name	: AfterJavascriptEvaluation
+        // Description	    : This will be called after the install script has being evaluated
+        // Return type		: void 
+        // Argument         : void
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+         
+        virtual void AfterJavascriptEvaluation(void) = 0;
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+        // Function name	: InstallStarted
+        // Description	    : This will be called when StartInstall has been called
+        // Return type		: void
+        // Argument         : char* UIPackageName - User Package Name
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+
+        virtual void InstallStarted(const char* UIPackageName) = 0;
+        
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+        // Function name	: ItemScheduled
+        // Description	    : This will be called when items are being scheduled 
+        // Return type		: Any value returned other than zero, will be treated as an error and the script will be aborted
+        // Argument         : The message that should be displayed to the user
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+
+        virtual long ItemScheduled( const char* message ) = 0;
+        
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+        // Function name	: InstallFinalization
+        // Description	    : This will be called when the installation is in its Finalize stage 
+        // Return type		: void 
+        // Argument         : char* message - The message that should be displayed to the user
+        // Argument         : long itemNum  - This is the current item number
+        // Argument         : long totNum   - This is the total number of items
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+
+        virtual void InstallFinalization( const char* message, long itemNum, long totNum ) = 0;
+
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+        // Function name	: InstallAborted
+        // Description	    : This will be called when the install is aborted 
+        // Return type		: void
+        // Argument         : void
+        ///////////////////////////////////////////////////////////////////////////////////////////////////////
+
+        virtual void InstallAborted(void) = 0;
+
+};
+
+
+#endif

mozilla/xpinstall/public/nsSoftwareUpdateIIDs.h

@@ -0,0 +1,64 @@
+/* -*- 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.0 (the "License"); you 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 Communicator client code, 
+ * released March 31, 1998. 
+ *
+ * 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.
+ *
+ * Contributors:
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+#ifndef nsSoftwareUpdateIIDs_h___
+#define nsSoftwareUpdateIIDs_h___
+
+#define NS_SoftwareUpdate_CID                        \
+{ /* 18c2f989-b09f-11d2-bcde-00805f0e1353 */         \
+    0x18c2f989,                                      \
+    0xb09f,                                          \
+    0x11d2,                                          \
+    {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53} \
+}
+
+#define NS_SoftwareUpdateInstall_CID                 \
+{ /* 18c2f98b-b09f-11d2-bcde-00805f0e1353 */         \
+    0x18c2f98b,                                      \
+    0xb09f,                                          \
+    0x11d2,                                          \
+    {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53} \
+}
+
+#define NS_SoftwareUpdateInstallTrigger_CID          \
+{ /* 18c2f98d-b09f-11d2-bcde-00805f0e1353 */         \
+    0x18c2f98d,                                      \
+    0xb09f,                                          \
+    0x11d2,                                          \
+    {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53} \
+}
+
+#define NS_SoftwareUpdateInstallVersion_CID          \
+{ /* 18c2f98f-b09f-11d2-bcde-00805f0e1353 */         \
+    0x18c2f98f,                                      \
+    0xb09f,                                          \
+    0x11d2,                                          \
+    {0xbc, 0xde, 0x00, 0x80, 0x5f, 0x0e, 0x13, 0x53} \
+}
+
+
+
+#endif /* nsSoftwareUpdateIIDs_h___ */
+

mozilla/xpinstall/res/MANIFEST

@@ -0,0 +1,3 @@
+progress.xul
+progress.css
+progress.html

mozilla/xpinstall/res/Makefile.in

@@ -0,0 +1,34 @@
+#!gmake
+#
+# 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
+include $(topsrcdir)/config/config.mk
+include $(topsrcdir)/config/rules.mk
+
+EXPORT_RESOURCE_XPINSTALL = \
+	$(srcdir)/progress.xul \
+	$(srcdir)/progress.html \
+	$(srcdir)/progress.css \
+	$(NULL)
+
+install:: 
+	$(INSTALL) $(EXPORT_RESOURCE_XPINSTALL) $(DIST)/bin/res/xpinstall

mozilla/xpinstall/res/makefile.win

@@ -0,0 +1,31 @@
+#!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=..\..
+IGNORE_MANIFEST=1
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(DLL)
+	$(MAKE_INSTALL) progress.xul $(DIST)\bin\res\xpinstall
+    $(MAKE_INSTALL) progress.css $(DIST)\bin\res\xpinstall
+    $(MAKE_INSTALL) progress.html $(DIST)\bin\res\xpinstall
+
+clobber::
+	rm -f $(DIST)\res\xpinstall\progress.xul
+    rm -f $(DIST)\res\xpinstall\progress.css
+    rm -f $(DIST)\res\xpinstall\progress.html

mozilla/xpinstall/res/progress.css

@@ -0,0 +1,3 @@
+TD {
+    font: 10pt sans-serif;
+}

mozilla/xpinstall/res/progress.html

@@ -0,0 +1,16 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<body bgcolor="#C0C0C0"  style="overflow:visible; margin: 0px; color-background: rgb(192,192,192);">
+<center>
+<table BORDER COLS=5 WIDTH="99%" style="color-background:rgb(192,192,192);">
+<tr>
+<td WIDTH="3%"  NOWRAP style="border: 1px inset rgb(192,192,192);">&nbsp</td>
+<td WIDTH="3%"  NOWRAP style="border: 1px inset rgb(192,192,192);">&nbsp</td>
+<td WIDTH="3%"  NOWRAP style="border: 1px inset rgb(192,192,192);">&nbsp</td>
+<td WIDTH="10%" NOWRAP style="border: 1px inset rgb(192,192,192);">&nbsp</td>
+<td WIDTH="81%" NOWRAP style="border: 1px inset rgb(192,192,192);">&nbsp</td>
+</tr>
+</table>
+</center>
+</body>
+</html>

mozilla/xpinstall/res/progress.xul

@@ -0,0 +1,67 @@
+<?xml version="1.0"?> 
+<?xml-stylesheet href="../samples/xul.css" type="text/css"?> 
+<?xml-stylesheet href="progress.css" type="text/css"?> 
+
+<!DOCTYPE window
+[
+<!ENTITY downloadWindow.title "XPInstall Progress"> 
+<!ENTITY  status "Status:"> 
+<!ENTITY  cancelButtonTitle "Cancel">
+]
+> 
+
+<window xmlns:html="http://www.w3.org/TR/REC-html40"
+        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+        title="XPInstall Progress"
+        width="425"
+        height="225">
+
+    <data>
+        <broadcaster id="data.canceled" type="string" value="false"/>
+    </data>
+
+
+    <html:script>
+ 
+         function cancelInstall() 
+         {
+            var cancelData = document.getElementById("data.canceled");
+            cancelData.setAttribute( "value", "true");
+         }
+
+    </html:script>
+
+<html:center>
+  <html:table style="width:100%;">
+
+    <html:tr>
+      <html:td align="center">
+        <html:input id="dialog.uiPackageName" readonly="" style="background-color:lightgray;width:300px;"/>
+      </html:td>
+    </html:tr>
+
+    <html:tr>
+      <html:td nowrap="" style="border: 1px rgb(192,192,192);" align="center">
+        <html:input id="dialog.currentAction" readonly="" style="background-color:lightgray;width:450px;"/>
+      </html:td>
+    </html:tr>
+
+
+    <html:tr>
+      <html:td align="center" width="15%" nowrap="" style="border: 1px rgb(192,192,192);">
+        <progressmeter id="dialog.progress" mode="undetermined" style="width:300px;height:16px;">
+        </progressmeter>
+	  </html:td>
+    </html:tr>
+
+    <html:tr>
+      <html:td align="center" width="3%"  nowrap="" style="border: 1px rgb(192,192,192);">
+        <html:button onclick="cancelInstall()" height="12">
+          &cancelButtonTitle;
+        </html:button>
+      </html:td>
+    </html:tr>
+  </html:table>
+
+</html:center>
+</window>

mozilla/xpinstall/src/Makefile.in

@@ -1,83 +1,61 @@
+#!gmake
 #
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "License"); you 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.
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY 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 client code, 
 # released March 31, 1998. 
 #
 # 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.
+# Corporation.  Portions created by Netscape are 
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
 #
-# Contributor(s): 
+# Contributors:
 #     Daniel Veditz <dveditz@netscape.com>
 #     Douglas Turner <dougt@netscape.com>
-#
 
-DEPTH		= ../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
+DEPTH           = ../..
+topsrcdir       = @top_srcdir@
+VPATH           = @srcdir@
+srcdir          = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= xpinstall
 LIBRARY_NAME	= xpinstall
-SHORT_LIBNAME	= xpinstal
 IS_COMPONENT	= 1
+REQUIRES        = dom js netlib raptor xpcom
 
-EXTRA_DSO_LIBS	= jsdom
+CPPSRCS = \
+    nsSoftwareUpdate.cpp        \
+    nsInstall.cpp               \
+    nsInstallDelete.cpp         \
+    nsInstallExecute.cpp        \
+    nsInstallFile.cpp           \
+    nsInstallFolder.cpp         \
+    nsInstallPatch.cpp          \
+    nsInstallUninstall.cpp      \
+    nsInstallTrigger.cpp        \
+    nsInstallResources.cpp      \
+    nsJSInstall.cpp             \
+    nsJSInstallTriggerGlobal.cpp\
+    nsSoftwareUpdateRun.cpp     \
+    nsSoftwareUpdateStream.cpp  \
+    nsTopProgressNotifier.cpp   \
+    nsLoggingProgressNotifier   \
+    ScheduledTasks.cpp          \
+    nsInstallFileOpItem.cpp     \
+    $(NULL)
 
-REQUIRES	= dom js netlib raptor xpcom
-
-# XXX shouldn't need to export this
-EXPORTS		= nsXPITriggerInfo.h
-
-CPPSRCS		= \
-		nsInstall.cpp \
-		nsInstallTrigger.cpp \
-		nsInstallVersion.cpp \
-		nsInstallFolder.cpp \
-		nsJSInstall.cpp \
-		nsJSFile.cpp \
-		nsJSInstallTriggerGlobal.cpp \
-		nsJSInstallVersion.cpp \
-		nsSoftwareUpdate.cpp \
-		nsSoftwareUpdateRun.cpp \
-		nsInstallFile.cpp \
-		nsInstallDelete.cpp \
-		nsInstallExecute.cpp \
-		nsInstallPatch.cpp \
-		nsInstallUninstall.cpp \
-		nsInstallResources.cpp \
-		nsTopProgressNotifier.cpp \
-		nsLoggingProgressNotifier.cpp \
-		ScheduledTasks.cpp \
-		nsInstallProgressDialog.cpp \
-		nsXPITriggerInfo.cpp \
-		nsXPInstallManager.cpp \
-		nsInstallFileOpItem.cpp \
-		nsJSFileSpecObj.cpp \
-		$(NULL)
-
-LOCAL_INCLUDES	= -I$(srcdir)/../public
-
-EXTRA_DSO_LDOPTS = \
-		$(MOZ_REGISTRY_LIBS) \
-		-L$(DIST)/bin \
-		$(EXTRA_DSO_LIBS) \
-		$(MOZ_JS_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(ZLIB_LIBS) \
-		$(NULL)
+INCLUDES += -I$(srcdir)/../public
 
 include $(topsrcdir)/config/rules.mk
 

mozilla/xpinstall/src/PatchableAppleSingle.h

@@ -1,117 +1,233 @@
 /* -*- 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/
+
+ * The contents of this file are subject to the Netscape Public License
+
+ * Version 1.0 (the "License"); you 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.
+
+ * Software distributed under the License is distributed on an "AS IS" basis,
+
+ * WITHOUT WARRANTY OF ANY 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 client code, 
+
  * released March 31, 1998. 
+
  *
+
  * 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.
+
+ * Corporation.  Portions created by Netscape are 
+
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+
+ * Reserved.
+
  *
- * Contributor(s): 
+
+ * Contributors:
+
  *     Douglas Turner <dougt@netscape.com>
+
  */
+
  
+
 #ifndef SU_PAS_H
+
 #define SU_PAS_H
 
 
+
+
+
 #include <Errors.h>
+
 #include <Types.h>
+
 #include <Files.h>
+
 #include <Script.h>
+
 #include <Resources.h>
 
+
+
 typedef struct PASHeader /* header portion of Patchable AppleSingle */
+
 {
+
        UInt32 magicNum; 	/* internal file type tag = 0x00244200*/
+
        UInt32 versionNum; 	/* format version: 1 = 0x00010000 */
+
        UInt8 filler[16]; 	/* filler */
+
        UInt16 numEntries; 	/* number of entries which follow */
+
 } PASHeader ; 
 
 
+
+
+
 typedef struct PASEntry 	/* one Patchable AppleSingle entry descriptor */
+
 {
+
         UInt32 entryID; 	/* entry type: see list, 0 invalid 		*/
+
         UInt32 entryOffset; /* offset, in bytes, from beginning 	*/
+
                             /* of file to this entry's data 		*/
+
         UInt32 entryLength; /* length of data in octets 			*/
+
         
+
 } PASEntry; 
 
 
+
+
+
 typedef struct PASMiscInfo
+
 {
+
 	short	fileHasResFork;
+
 	short	fileResAttrs;
+
 	OSType 	fileType;
+
 	OSType	fileCreator;
+
 	UInt32	fileFlags;
 
+
+
 } PASMiscInfo; 
 
 
+
+
+
 typedef struct PASResFork
+
 {
+
 	short	NumberOfTypes;
+
 	
+
 } PASResFork; 
 
 
+
+
+
 typedef struct PASResource
+
 {
+
 	short			attr;
+
 	short			attrID;
+
 	OSType			attrType;
+
 	Str255			attrName;
+
 	unsigned long	length;
+
 		
+
 } PASResource; 
 
 
 
+
+
+
+
 #if PRAGMA_ALIGN_SUPPORTED
+
 #pragma options align=reset
+
 #endif
 
 
+
+
+
 #define kCreator	'MOSS'
+
 #define kType		'PASf'
+
 #define PAS_BUFFER_SIZE (1024*512)
 
+
+
 #define PAS_MAGIC_NUM	(0x00244200)
+
 #define PAS_VERSION		(0x00010000)
 
+
+
 enum
+
 {
+
 	ePas_Data	=	1,
+
 	ePas_Misc,
+
 	ePas_Resource
+
 };
 
+
+
 #ifdef __cplusplus
+
 extern "C" {
+
 #endif
 
+
+
 /* Prototypes */
+
 OSErr PAS_EncodeFile(FSSpec *inSpec, FSSpec *outSpec);
+
 OSErr PAS_DecodeFile(FSSpec *inSpec, FSSpec *outSpec);
 
 
 
+
+
+
+
 #ifdef __cplusplus
+
 }
+
 #endif
 
-#endif /* SU_PAS_H */
+
+
+#endif /* SU_PAS_H */

mozilla/xpinstall/src/ScheduledTasks.cpp

@@ -1,113 +1,160 @@
 /* -*- 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/
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "License"); you 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.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY 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 client code, 
  * released March 31, 1998. 
  *
  * 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.
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  *
- * Contributor(s): 
+ * Contributors:
  *     Daniel Veditz <dveditz@netscape.com>
  *     Douglas Turner <dougt@netscape.com>
  */
 
 #include "nscore.h"
+#include "NSReg.h"
 #include "nsFileSpec.h"
 #include "nsFileStream.h"
 #include "nsInstall.h" // for error codes
 #include "prmem.h"
 #include "ScheduledTasks.h"
 
-
-
-static nsresult 
-GetPersistentStringFromSpec(const nsFileSpec& inSpec, char **string)
-{
-    if (!string) return NS_ERROR_NULL_POINTER;
-
-    nsCOMPtr<nsIFileSpec> spec;
-#ifdef XP_MAC
-    nsFileSpec interim = inSpec.GetFSSpec(); /* XXX get rid of mError in nsFileSpec */
-    nsresult rv = NS_NewFileSpecWithSpec(interim, getter_AddRefs(spec));
-#else
-    nsresult rv = NS_NewFileSpecWithSpec(inSpec, getter_AddRefs(spec));
-#endif
-    if (NS_SUCCEEDED(rv)) {
-        rv = spec->GetPersistentDescriptorString(string);
-    } 
-    else {
-        *string = nsnull;
-    }
-    return rv;
-}
-
-
-
-
-
 #ifdef _WINDOWS
 #include <sys/stat.h>
 #include <windows.h>
 
-PRInt32 ReplaceExistingWindowsFile(const nsFileSpec& currentSpec, const nsFileSpec& finalSpec)
+BOOL WIN32_IsMoveFileExBroken()
 {
-    // this routine is now for DOS-based windows only. WinNT should 
-    // be taken care of by the XP code
-    //
-    // NOTE for WINNT:
-    //
-    // the MOVEFILE_DELAY_UNTIL_REBOOT option doesn't work on
-    // NT 3.51 SP4 or on NT 4.0 until SP2. On the broken versions
-    // of NT 4.0 Microsoft warns using it can lead to an irreparably 
-    // corrupt  windows' registry "after an unknown number of calls".
-    // Time to reinstall windows when that happens.
-    //
-    // I don't want to risk it, I also don't want two separate code
-    // paths to test, so we do it the lame way on all NT systems
-    // until such time as there are few enough old revs around to
-    // make it worth switching back to MoveFileEx().
+    /* the NT option MOVEFILE_DELAY_UNTIL_REBOOT is broken on 
+     * Windows NT 3.51 Service Pack 4 and NT 4.0 before Service Pack 2
+     */
+    BOOL broken = FALSE;
+    OSVERSIONINFO osinfo;
 
-    PRInt32 err = -1;
+    // they *all* appear broken--better to have one way that works.
+    return TRUE;
+
+    osinfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+    if (GetVersionEx(&osinfo) && osinfo.dwPlatformId == VER_PLATFORM_WIN32_NT)
+    {
+        if ( osinfo.dwMajorVersion == 3 && osinfo.dwMinorVersion == 51 )
+        {
+            if ( 0 == stricmp(osinfo.szCSDVersion,"Service Pack 4"))
+            {
+                broken = TRUE;
+            }
+        }
+        else if ( osinfo.dwMajorVersion == 4 )
+        {
+            if (osinfo.szCSDVersion[0] == '\0' || 
+                (0 == stricmp(osinfo.szCSDVersion,"Service Pack 1")))
+            {
+                broken = TRUE;
+            }
+        }
+    }
+
+    return broken;
+}
+
+
+PRInt32 DoWindowsReplaceExistingFileStuff(const char* currentName, const char* finalName)
+{
+    PRInt32 err = 0;
+
+    char* final   = strdup(finalName);
+    char* current = strdup(currentName);
+
+    /* couldn't delete, probably in use. Schedule for later */
+     DWORD	dwVersion, dwWindowsMajorVersion;
 
     /* Get OS version info */
-    DWORD dwVersion = GetVersion();
+    dwVersion = GetVersion();
+    dwWindowsMajorVersion =  (DWORD)(LOBYTE(LOWORD(dwVersion)));
 
     /* Get build numbers for Windows NT or Win32s */
 
-    if (dwVersion > 0x80000000)
+    if (dwVersion < 0x80000000)                // Windows NT
     {
-        // Windows 95 or Win16
+    	/* On Windows NT */
+        if ( WIN32_IsMoveFileExBroken() )
+        {
+            /* the MOVEFILE_DELAY_UNTIL_REBOOT option doesn't work on
+             * NT 3.51 SP4 or on NT 4.0 until SP2
+             */
+            struct stat statbuf;
+            PRBool nameFound = PR_FALSE;
+            char tmpname[_MAX_PATH];
+            
+            strncpy( tmpname, finalName, _MAX_PATH );
+            int len = strlen(tmpname);
+            while (!nameFound && len < _MAX_PATH ) 
+            {
+                    tmpname[len-1] = '~';
+                    tmpname[len] = '\0';
+                    if ( stat(tmpname, &statbuf) != 0 )
+                        nameFound = TRUE;
+                    else
+                        len++;
+            }
 
-        // Place an entry in the WININIT.INI file in the Windows directory
-        // to delete finalName and rename currentName to be finalName at reboot
+            if ( nameFound ) 
+            {
+                if ( MoveFile( finalName, tmpname ) ) 
+                {
+                    if ( MoveFile( currentName, finalName ) ) 
+                    {
+                        DeleteFileNowOrSchedule(nsFileSpec(tmpname));
+                    }
+                    else 
+                    {
+                        /* 2nd move failed, put old file back */
+                        MoveFile( tmpname, finalName );
+                    }
+                }
+                else
+                {
+                    /* non-executable in use; schedule for later */
+                    return -1;  // let the start registry stuff do our work!
+                }
+            }
+        }
+        else if ( MoveFileEx(currentName, finalName, MOVEFILE_DELAY_UNTIL_REBOOT) )
+        {
+		    err = 0;
+        }
+    }
+	else // Windows 95 or Win16
+	{
+        /*
+ 		 * Place an entry in the WININIT.INI file in the Windows directory
+		 * to delete finalName and rename currentName to be finalName at reboot
+ 		 */
 
-        int     strlen;
-        char    Src[_MAX_PATH];   // 8.3 name
-        char    Dest[_MAX_PATH];  // 8.3 name
+        int strlen;
+ 		char	Src[_MAX_PATH];   // 8.3 name
+ 		char	Dest[_MAX_PATH];  // 8.3 name
 
-        char* final   = strdup(finalSpec.GetNativePathCString());
-        char* current = strdup(currentSpec.GetNativePathCString());
-
-        strlen = GetShortPathName( (LPCTSTR)current, (LPTSTR)Src, (DWORD)sizeof(Src) );
+        strlen = GetShortPathName( (LPCTSTR)currentName, (LPTSTR)Src, (DWORD)sizeof(Src) );
         if ( strlen > 0 ) 
         {
             free(current);
             current   = strdup(Src);
         }
 
-        strlen = GetShortPathName( (LPCTSTR) final, (LPTSTR) Dest, (DWORD) sizeof(Dest));
+		strlen = GetShortPathName( (LPCTSTR) finalName, (LPTSTR) Dest, (DWORD) sizeof(Dest));
         if ( strlen > 0 ) 
         {
             free(final);
@@ -122,12 +169,12 @@ PRInt32 ReplaceExistingWindowsFile(const nsFileSpec& currentSpec, const nsFileSp
         AnsiToOem( current, current );
 
         if ( WritePrivateProfileString( "Rename", final, current, "WININIT.INI" ) )
-            err = 0;
-
-        free(final);
-        free(current);
+		    err = 0;
     }
     
+    free(final);
+    free(current);
+
     return err;
 }
 #endif
@@ -135,196 +182,83 @@ PRInt32 ReplaceExistingWindowsFile(const nsFileSpec& currentSpec, const nsFileSp
 
 
 
-PRInt32 DeleteFileNowOrSchedule(const nsFileSpec& filename)
+
+
+REGERR DeleteFileNowOrSchedule(nsFileSpec& filename)
 {
 
-    PRInt32 result = nsInstall::SUCCESS;
-
-    filename.Delete(PR_FALSE);
+    REGERR result = 0;
+    
+    filename.Delete(false);
+    
     if (filename.Exists())
     {
-        // could not delete, schedule it for later
+        RKEY newkey;
+        HREG reg;
+        if ( REGERR_OK == NR_RegOpen("", &reg) ) 
+        {
+            if (REGERR_OK == NR_RegAddKey( reg, ROOTKEY_PRIVATE, REG_DELETE_LIST_KEY, &newkey) )
+            {
+                // FIX should be using nsPersistentFileDescriptor!!!
+
+                result = NR_RegSetEntry( reg, newkey, (char*)(const char*)filename.GetNativePathCString(), REGTYPE_ENTRY_FILE, nsnull, 0);
+                if (result == REGERR_OK)
+                    result = nsInstall::REBOOT_NEEDED;
+            }
+
+            NR_RegClose(reg);
+        }
+    }
+
+    return result;
+}
+/* tmp file is the bad one that we want to replace with target. */
+
+REGERR ReplaceFileNowOrSchedule(nsFileSpec& replacementFile, nsFileSpec& doomedFile )
+{
+    REGERR result = 0;
+    
+    if(replacementFile == doomedFile)
+    {
+        /* do not have to do anything */
+        return result;
+    }
+
+    doomedFile.Delete(false);
+
+    if (! doomedFile.Exists() )
+    {
+        // Now that we have move the existing file, we can move the mExtracedFile into place.
+        nsFileSpec parentofFinalFile;
+
+        doomedFile.GetParent(parentofFinalFile);
+        result = replacementFile.Move(parentofFinalFile);
+        if ( NS_SUCCEEDED(result) )
+        {
+            char* leafName = doomedFile.GetLeafName();
+            replacementFile.Rename(leafName);
+            nsCRT::free(leafName);
+        }
+    }
+    else
+    {
+#ifdef _WINDOWS
+        if (DoWindowsReplaceExistingFileStuff(replacementFile.GetNativePathCString(), doomedFile.GetNativePathCString()) == 0)
+            return 0;
+#endif
 
         RKEY newkey;
         HREG reg;
-        REGERR  err;
-        result = nsInstall::UNEXPECTED_ERROR;
-
-        err = NR_RegOpen("", &reg) ;
-        if ( err == REGERR_OK )
-        {
-            err = NR_RegAddKey(reg,ROOTKEY_PRIVATE,REG_DELETE_LIST_KEY,&newkey);
-            if ( err == REGERR_OK )
-            {
-                char    valname[20];
-                char*   fnamestr = nsnull;
-
-                err = NR_RegGetUniqueName( reg, valname, sizeof(valname) );
-                if ( err == REGERR_OK )
-                {
-                    nsresult rv;
-                    rv = GetPersistentStringFromSpec( filename, &fnamestr );
-                    if ( NS_SUCCEEDED(rv) && fnamestr )
-                    {
-
-                        err = NR_RegSetEntry( reg, newkey, valname, 
-                                              REGTYPE_ENTRY_BYTES, 
-                                              (void*)fnamestr, 
-                                              strlen(fnamestr)+1);
-
-                        if ( err == REGERR_OK )
-                            result = nsInstall::REBOOT_NEEDED;
-                    }
-                }
-            }
-
-            NR_RegClose(reg);
-        }
-    }
-
-    return result;
-}
-
-
-
-
-PRInt32 ReplaceFileNow(nsFileSpec& replacementFile, nsFileSpec& doomedFile )
-{
-    // replacement file must exist, doomed file doesn't have to
-    if ( !replacementFile.Exists() )
-        return nsInstall::DOES_NOT_EXIST;
-
-    // don't have to do anything if the files are the same
-    if ( replacementFile == doomedFile )
-        return nsInstall::SUCCESS;
-
-
-    PRInt32 result = nsInstall::ACCESS_DENIED;
-
-    // first try to rename the doomed file out of the way (if it exists)
-    char*   leafname;
-    nsFileSpec tmpFile( doomedFile );
-    if ( tmpFile.Exists() )
-    {
-        tmpFile.MakeUnique();
-        leafname = tmpFile.GetLeafName();
-        tmpFile = doomedFile;
-        tmpFile.Rename( leafname );
-        nsCRT::free( leafname );
-    }
-
-
-    // if doomedFile is gone move new file into place
-    nsresult rv;
-    if ( !doomedFile.Exists() )
-    {
-        nsFileSpec parentofFinalFile;
-        nsFileSpec parentofReplacementFile;
-
-        doomedFile.GetParent(parentofFinalFile);
-        replacementFile.GetParent(parentofReplacementFile);
-
-        // XXX looks dangerous, the replacement file name may NOT be unique in the
-        // target directory if we have to move it! Either we should never move the
-        // files like this (i.e. error if not in the same dir) or we need to take
-        // a little more care in the move.
-        if(parentofReplacementFile != parentofFinalFile)
-        {
-            NS_WARN_IF_FALSE( 0, "File unpacked into a non-dest dir" );
-            rv = replacementFile.MoveToDir(parentofFinalFile);
-        }
-        else
-        	rv = NS_OK;
-        	
-        leafname = doomedFile.GetLeafName();
-        if ( NS_SUCCEEDED(rv) )
-            rv = replacementFile.Rename( leafname );
-
-        if ( NS_SUCCEEDED(rv) ) 
-        {
-            // we replaced the old file OK, now we have to
-            // get rid of it permanently
-            result = DeleteFileNowOrSchedule( tmpFile );
-        }
-        else
-        {
-            // couldn't rename file, try to put old file back
-            tmpFile.Rename( leafname );
-        }
-        nsCRT::free( leafname );
-    }
-
-    return result;
-}
-
-
-
-
-
-PRInt32 ReplaceFileNowOrSchedule(nsFileSpec& replacementFile, nsFileSpec& doomedFile )
-{
-    PRInt32 result = ReplaceFileNow( replacementFile, doomedFile );
-
-    if ( result == nsInstall::ACCESS_DENIED )
-    {
-        // if we couldn't replace the file schedule it for later
-#ifdef _WINDOWS
-        if ( ReplaceExistingWindowsFile(replacementFile, doomedFile) == 0 )
-            return nsInstall::REBOOT_NEEDED;
-#endif
-
-        RKEY    listkey;
-        RKEY    filekey;
-        HREG    reg;
-        REGERR  err;
 
         if ( REGERR_OK == NR_RegOpen("", &reg) ) 
         {
-            err = NR_RegAddKey( reg, ROOTKEY_PRIVATE, REG_REPLACE_LIST_KEY, &listkey );
-            if ( err == REGERR_OK ) 
+            result = NR_RegAddKey( reg, ROOTKEY_PRIVATE, REG_REPLACE_LIST_KEY, &newkey);
+            if ( result == REGERR_OK ) 
             {
-                char     valname[20];
-                char*    fsrc = nsnull;
-                char*    fdest = nsnull;
-                REGERR   err2;
-                nsresult rv, rv2;
-
-                err = NR_RegGetUniqueName( reg, valname, sizeof(valname) );
-                if ( err == REGERR_OK )
-                {
-                    err = NR_RegAddKey( reg, listkey, valname, &filekey );
-                    if ( REGERR_OK == err )
-                    {
-                        rv = GetPersistentStringFromSpec(replacementFile, &fsrc);
-                        rv2 = GetPersistentStringFromSpec(doomedFile, &fdest);
-                        if ( NS_SUCCEEDED(rv) && NS_SUCCEEDED(rv2) )
-                        {
-
-                            err = NR_RegSetEntry( reg, filekey, 
-                                                  REG_REPLACE_SRCFILE,
-                                                  REGTYPE_ENTRY_BYTES, 
-                                                  (void*)fsrc, 
-                                                  strlen(fsrc));
-
-                            err2 = NR_RegSetEntry(reg, filekey,
-                                                  REG_REPLACE_DESTFILE,
-                                                  REGTYPE_ENTRY_BYTES,
-                                                  (void*)fdest,
-                                                  strlen(fdest));
-
-                            if ( err == REGERR_OK && err2 == REGERR_OK )
-                                result = nsInstall::REBOOT_NEEDED;
-                            else
-                                NR_RegDeleteKey( reg, listkey, valname );
-                        }
-
-                        if (NS_SUCCEEDED(rv))
-                            nsCRT::free(fsrc);
-
-                        if (NS_SUCCEEDED(rv2))
-                            nsCRT::free(fdest);
-                    }
-                }
+                char* replacementFileName = (char*)(const char*)replacementFile.GetNativePathCString();
+                result = NR_RegSetEntry( reg, newkey, (char*)(const char*)doomedFile.GetNativePathCString(), REGTYPE_ENTRY_FILE, replacementFileName, strlen(replacementFileName));
+                if (result == REGERR_OK)
+                    result = nsInstall::REBOOT_NEEDED;
             }
 
             NR_RegClose(reg);
@@ -334,148 +268,113 @@ PRInt32 ReplaceFileNowOrSchedule(nsFileSpec& replacementFile, nsFileSpec& doomed
     return result;
 }
 
+void DeleteScheduledFiles(void);
+void ReplaceScheduledFiles(void);
 
-
-
-//-----------------------------------------------------------------------------
-//
-//          STARTUP: DO SCHEDULED ACTIONS
-//
-//-----------------------------------------------------------------------------
-
-void DeleteScheduledFiles(HREG);
-void ReplaceScheduledFiles(HREG);
-
-void PerformScheduledTasks(HREG reg)
+extern "C" void PerformScheduledTasks(void *data)
 {
-    DeleteScheduledFiles( reg );
-    ReplaceScheduledFiles( reg );
+    DeleteScheduledFiles();
+    ReplaceScheduledFiles();
 }
 
 
-
-void DeleteScheduledFiles( HREG reg )
+void DeleteScheduledFiles(void)
 {
-    REGERR  err;
-    RKEY    key;
-    REGENUM state = 0;
+    HREG reg;
 
-    /* perform scheduled file deletions  */
-    if (REGERR_OK == NR_RegGetKey(reg,ROOTKEY_PRIVATE,REG_DELETE_LIST_KEY,&key))
+    if (REGERR_OK == NR_RegOpen("", &reg))
     {
-        // the delete key exists, so we loop through its children
-        // and try to delete all the listed files
+        RKEY    key;
+	    REGENUM state;
 
-        char    namebuf[MAXREGNAMELEN];
-        char    valbuf[MAXREGPATHLEN];
-
-        nsFileSpec              doomedFile;
-        nsCOMPtr<nsIFileSpec>   spec;
-
-        nsresult rv = NS_NewFileSpec(getter_AddRefs(spec));
-        if (NS_SUCCEEDED(rv))
+        /* perform scheduled file deletions and replacements (PC only) */
+        if (REGERR_OK ==  NR_RegGetKey(reg, ROOTKEY_PRIVATE, REG_DELETE_LIST_KEY,&key))
         {
-            while (REGERR_OK == NR_RegEnumEntries( reg, key, &state, namebuf,
-                                                   sizeof(namebuf), 0 ) )
+            char buf[MAXREGNAMELEN];
+
+            while (REGERR_OK == NR_RegEnumEntries(reg, key, &state, buf, sizeof(buf), NULL ))
             {
-                uint32 bufsize = sizeof(valbuf); // gets changed, must reset
-                err = NR_RegGetEntry( reg, key, namebuf, valbuf, &bufsize );
-                if ( err == REGERR_OK )
+                nsFileSpec doomedFile(buf);
+
+                doomedFile.Delete(PR_FALSE);
+                
+                if (! doomedFile.Exists()) 
                 {
-                    // no need to check return value of 
-                    // SetPersistentDescriptorString, it's always NS_OK
-                    spec->SetPersistentDescriptorString(valbuf);
-                    rv = spec->GetFileSpec(&doomedFile);
-                    if (NS_SUCCEEDED(rv)) 
-                    {
-                        doomedFile.Delete(PR_FALSE);
-                        if ( !doomedFile.Exists() )
-                        {
-                            // deletion successful, don't have to retry
-                            NR_RegDeleteEntry( reg, key, namebuf );
-                        }
-                    }
+                    NR_RegDeleteEntry( reg, key, buf );
                 }
             }
 
             /* delete list node if empty */
-            state = 0;
-            err = NR_RegEnumEntries(reg, key, &state, namebuf, sizeof(namebuf), 0);
-            if ( err == REGERR_NOMORE )
+			if (REGERR_NOMORE == NR_RegEnumEntries( reg, key, &state, buf, sizeof(buf), NULL ))
             {
                 NR_RegDeleteKey(reg, ROOTKEY_PRIVATE, REG_DELETE_LIST_KEY);
             }
         }
+        
+        NR_RegClose(reg);
     }
 }
 
-
-
-void ReplaceScheduledFiles( HREG reg )
+void ReplaceScheduledFiles(void)
 {
-    RKEY    key;
-
-    /* replace files if any listed */
-    if (REGERR_OK == NR_RegGetKey(reg,ROOTKEY_PRIVATE,REG_REPLACE_LIST_KEY,&key))
+    HREG reg;
+     
+    if (REGERR_OK == NR_RegOpen("", &reg))
     {
-        char keyname[MAXREGNAMELEN];
-        char doomedFile[MAXREGPATHLEN];
-        char srcFile[MAXREGPATHLEN];
+        RKEY    key;
+	    REGENUM state;
 
-        nsFileSpec              doomedSpec;
-        nsFileSpec              srcSpec;
-        nsCOMPtr<nsIFileSpec>   src;
-        nsCOMPtr<nsIFileSpec>   dest;
-        nsresult                rv1, rv2;
-
-        rv1 = NS_NewFileSpec(getter_AddRefs(src));
-        rv2 = NS_NewFileSpec(getter_AddRefs(dest));
-        if (NS_SUCCEEDED(rv1) && NS_SUCCEEDED(rv2))
+        /* replace files if any listed */
+        if (REGERR_OK ==  NR_RegGetKey(reg, ROOTKEY_PRIVATE, REG_REPLACE_LIST_KEY, &key))
         {
-            uint32 bufsize;
-            REGENUM state = 0;
-            while (REGERR_OK == NR_RegEnumSubkeys( reg, key, &state, 
-                                   keyname, sizeof(keyname), REGENUM_CHILDREN))
+            char tmpfile[MAXREGNAMELEN];
+            char target[MAXREGNAMELEN];
+
+            state = 0;
+            while (REGERR_OK == NR_RegEnumEntries(reg, key, &state, tmpfile, sizeof(tmpfile), NULL ))
             {
-                bufsize = sizeof(srcFile);
-                REGERR err1 = NR_RegGetEntry( reg, (RKEY)state,
-                                    REG_REPLACE_SRCFILE, srcFile, &bufsize);
 
-                bufsize = sizeof(doomedFile);
-                REGERR err2 = NR_RegGetEntry( reg, (RKEY)state,
-                                    REG_REPLACE_DESTFILE, doomedFile, &bufsize);
+                nsFileSpec replaceFile(tmpfile);
 
-                if ( err1 == REGERR_OK && err2 == REGERR_OK )
+                if (! replaceFile.Exists() )
                 {
-                    src->SetPersistentDescriptorString(srcFile);
-                    rv1 = src->GetFileSpec(&srcSpec);
-
-                    dest->SetPersistentDescriptorString(doomedFile);
-                    rv2 = dest->GetFileSpec(&doomedSpec);
-
-                    if (NS_SUCCEEDED(rv1) && NS_SUCCEEDED(rv2))
+                    NR_RegDeleteEntry( reg, key, tmpfile );
+                }
+                else if ( REGERR_OK != NR_RegGetEntryString( reg, key, tmpfile, target, sizeof(target) ) )
+                {
+                    /* can't read target filename, corruption? */
+                    NR_RegDeleteEntry( reg, key, tmpfile );
+                }
+                else 
+                {
+                    nsFileSpec targetFile(target);
+                
+                    targetFile.Delete(PR_FALSE);
+                
+                    if (!targetFile.Exists())
                     {
-                        // finally now try to do the replace
-                        PRInt32 result = ReplaceFileNow( srcSpec, doomedSpec );
-
-                        if ( result == nsInstall::DOES_NOT_EXIST ||
-                             result == nsInstall::SUCCESS )
+                        nsFileSpec parentofTarget;
+                        targetFile.GetParent(parentofTarget);                                           
+                    
+                        nsresult result = replaceFile.Move(parentofTarget);
+                        if ( NS_SUCCEEDED(result) )
                         {
-                            // This one is done
-                            NR_RegDeleteKey( reg, key, keyname );
+                            char* leafName = targetFile.GetLeafName();
+                            replaceFile.Rename(leafName);
+                            nsCRT::free(leafName);
+                            
+                            NR_RegDeleteEntry( reg, key, tmpfile );
                         }
                     }
                 }
             }
-
-
             /* delete list node if empty */
-            state = 0;
-            if (REGERR_NOMORE == NR_RegEnumSubkeys( reg, key, &state, keyname,
-                                          sizeof(keyname), REGENUM_CHILDREN ))
+            if (REGERR_NOMORE == NR_RegEnumEntries(reg, key, &state, tmpfile, sizeof(tmpfile), NULL )) 
             {
                 NR_RegDeleteKey(reg, ROOTKEY_PRIVATE, REG_REPLACE_LIST_KEY);
             }
         }
+        
+        NR_RegClose(reg);
     }
 }

mozilla/xpinstall/src/ScheduledTasks.h

@@ -1,44 +1,42 @@
 /* -*- 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/
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "License"); you 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.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY 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 client code, 
  * released March 31, 1998. 
  *
  * 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.
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  *
- * Contributor(s): 
+ * Contributors:
  *     Daniel Veditz <dveditz@netscape.com>
  *     Douglas Turner <dougt@netscape.com>
  */
 
+
 #ifndef __SCHEDULEDTASKS_H__
 #define __SCHEDULEDTASKS_H__
 
 
 #include "NSReg.h"
-//#include "mozreg.h"
 #include "nsFileSpec.h"
 
-PR_BEGIN_EXTERN_C
 
-PRInt32 DeleteFileNowOrSchedule(const nsFileSpec& filename);
-PRInt32 ReplaceFileNowOrSchedule(nsFileSpec& tmpfile, nsFileSpec& target );
+REGERR DeleteFileNowOrSchedule(nsFileSpec& filename);
+REGERR ReplaceFileNowOrSchedule(nsFileSpec& tmpfile, nsFileSpec& target );
 
 
-void PerformScheduledTasks(HREG reg);
+extern "C" void PerformScheduledTasks(void *data);
 
-PR_END_EXTERN_C
 
-#endif
+#endif

mozilla/xpinstall/src/gdiff.h

@@ -1,23 +1,19 @@
 /* -*- 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/
+ * 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 License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
+ * Software distributed under the 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 Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
+ * 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.
- *
- * Contributor(s): 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  */
 /*--------------------------------------------------------------
  * GDIFF.H

mozilla/xpinstall/src/makefile.win

@@ -1,36 +1,33 @@
-
 #!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/
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "License"); you 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.
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY 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 client code, 
 # released March 31, 1998. 
 #
 # 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.
+# Corporation.  Portions created by Netscape are 
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
 #
-# Contributor(s): 
+# Contributors:
 #     Daniel Veditz <dveditz@netscape.com>
 #     Douglas Turner <dougt@netscape.com>
 
 
 DEPTH=..\..
-
-include <$(DEPTH)/config/config.mak>
+IGNORE_MANIFEST=1
 
 MAKE_OBJ_TYPE = DLL
-MODULE=xpinstal
-XPIDL_MODULE=xpinstall
+MODULE=xpinstall
 
 DLL=.\$(OBJDIR)\$(MODULE).dll
 
@@ -41,16 +38,33 @@ LCFLAGS =          \
         $(DEFINES) \
         $(NULL)
 
+LINCS=                          \
+        -I$(PUBLIC)\xpinstall   \
+        -I$(PUBLIC)\jar         \
+        -I$(PUBLIC)\libreg      \
+        -I$(PUBLIC)\netlib      \
+        -I$(PUBLIC)\xpcom       \
+        -I$(PUBLIC)\pref        \
+        -I$(PUBLIC)\rdf         \
+        -I$(PUBLIC)\js          \
+        -I$(PUBLIC)\dom         \
+        -I$(PUBLIC)\raptor      \
+        -I$(PUBLIC)\nspr2       \
+		-I$(PUBLIC)\zlib        \
+        -I$(PUBLIC)\xpfe\components \
+        $(NULL)
 
 LLIBS =                                \
-        $(DIST)\lib\xpcom.lib          \
+        $(DIST)\lib\jar50.lib          \
+        $(DIST)\lib\libreg32.lib       \
+        $(DIST)\lib\netlib.lib         \
+        $(DIST)\lib\xpcom.lib        \
         $(DIST)\lib\js3250.lib         \
         $(DIST)\lib\jsdombase_s.lib    \
         $(DIST)\lib\jsdomevents_s.lib  \
 		$(DIST)\lib\zlib.lib           \
-        $(DIST)\lib\strres.lib         \
+		$(DIST)\lib\plc3.lib           \
         $(LIBNSPR)                     \
-        $(DIST)\lib\mozreg.lib         \
         $(NULL)
 
 
@@ -60,11 +74,11 @@ OBJS =                                          \
        .\$(OBJDIR)\nsInstallVersion.obj         \
        .\$(OBJDIR)\nsInstallFolder.obj          \
        .\$(OBJDIR)\nsJSInstall.obj              \
-       .\$(OBJDIR)\nsJSFile.obj                 \
        .\$(OBJDIR)\nsJSInstallTriggerGlobal.obj \
        .\$(OBJDIR)\nsJSInstallVersion.obj       \
        .\$(OBJDIR)\nsSoftwareUpdate.obj         \
        .\$(OBJDIR)\nsSoftwareUpdateRun.obj      \
+       .\$(OBJDIR)\nsSoftwareUpdateStream.obj   \
        .\$(OBJDIR)\nsInstallFile.obj            \
        .\$(OBJDIR)\nsInstallDelete.obj          \
        .\$(OBJDIR)\nsInstallExecute.obj         \
@@ -82,16 +96,7 @@ OBJS =                                          \
        .\$(OBJDIR)\nsJSWinProfile.obj           \
        .\$(OBJDIR)\nsWinProfileItem.obj         \
        .\$(OBJDIR)\nsInstallProgressDialog.obj  \
-       .\$(OBJDIR)\nsXPITriggerInfo.obj         \
-       .\$(OBJDIR)\nsXPInstallManager.obj       \
        .\$(OBJDIR)\nsInstallFileOpItem.obj      \
-       .\$(OBJDIR)\nsWinShortcut.obj            \
-	   .\$(OBJDIR)\nsJSFileSpecObj.obj          \
-#     .\$(OBJDIR)\nsUpdateNotification.obj     \
-       $(NULL)
-
-WIN_LIBS=                                       \
-       ole32.lib                                \
        $(NULL)
 
 include <$(DEPTH)\config\rules.mak>
@@ -101,6 +106,6 @@ install:: $(DLL)
     $(MAKE_INSTALL) .\$(OBJDIR)\$(MODULE).dll $(DIST)\bin\components
 
 clobber::
-        $(RM) $(DIST)\lib\$(MODULE).lib
-        $(RM) $(DIST)\bin\components\$(MODULE).dll
+        rm -f $(DIST)\lib\$(MODULE).lib
+        rm -f $(DIST)\bin\components\$(MODULE).dll
 

mozilla/xpinstall/src/nsAppleSingleDecoder.cpp

@@ -1,744 +0,0 @@
-/* -*- 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 Communicator client code, released March
- * 31, 1998. 
- *
- * 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.  
- * 
- * Contributors:
- *     Samir Gehani <sgehani@netscape.com>
- */
-
-
-#ifndef _NS_APPLESINGLEDECODER_H_
-	#include "nsAppleSingleDecoder.h"
-#endif
-
-#include "MoreFilesExtras.h"
-#include "MoreDesktopMgr.h"
-#include "IterateDirectory.h"
-#include "nsISupportsUtils.h"
-
-/*----------------------------------------------------------------------*
- *   Constructors/Destructor
- *----------------------------------------------------------------------*/
-MOZ_DECL_CTOR_COUNTER(nsAppleSingleDecoder);
-
-nsAppleSingleDecoder::nsAppleSingleDecoder(FSSpec *inSpec, FSSpec *outSpec)
-: mInSpec(NULL), 
-  mOutSpec(NULL),
-  mInRefNum(0),
-  mRenameReqd(false)
-{
-    MOZ_COUNT_CTOR(nsAppleSingleDecoder);
-
-    if (inSpec && outSpec)
-	{
-		/* merely point to FSSpecs, not own 'em */
-		mInSpec = inSpec;
-		mOutSpec = outSpec;
-	}
-}
-
-nsAppleSingleDecoder::nsAppleSingleDecoder()
-: mInSpec(NULL), 
-  mOutSpec(NULL),
-  mInRefNum(0),
-  mRenameReqd(false)
-{
-    MOZ_COUNT_CTOR(nsAppleSingleDecoder);
-}
-
-nsAppleSingleDecoder::~nsAppleSingleDecoder()
-{
-	/* not freeing FSSpecs since we don't own 'em */
-    MOZ_COUNT_DTOR(nsAppleSingleDecoder);
-}
-
-
-/*----------------------------------------------------------------------*
- *   Public methods
- *----------------------------------------------------------------------*/
-OSErr
-nsAppleSingleDecoder::Decode()
-{
-	OSErr		err = noErr;
- 	ASHeader 	header;
- 	long		bytesRead = sizeof(header);
- 	
- 	// param check
- 	if (!mInSpec || !mOutSpec)
- 		return paramErr;
- 		
- 	// check for existence	
- 	FSSpec tmp;
-	err = FSMakeFSSpec(mInSpec->vRefNum, mInSpec->parID, mInSpec->name, &tmp);
-	if (err == fnfErr)
-		return err;
-		
-	MAC_ERR_CHECK(FSpOpenDF( mInSpec, fsRdPerm, &mInRefNum ));
-	MAC_ERR_CHECK(FSRead( mInRefNum, &bytesRead, &header ));
-	
-	if ( (bytesRead != sizeof(header)) ||
-		 (header.magicNum != 0x00051600) ||
-		 (header.versionNum != 0x00020000) ||
-		 (header.numEntries == 0) ) // empty file?
-		 return -1;
-	
-	// create the outSpec which we'll rename correctly later
-	err = FSMakeFSSpec( mInSpec->vRefNum, mInSpec->parID, "\pdecode", mOutSpec );
-	if (err!=noErr && err!=fnfErr)
-		return err;
-	MAC_ERR_CHECK(FSMakeUnique( mOutSpec ));
-	MAC_ERR_CHECK(FSpCreate( mOutSpec, 'MOZZ', '????', 0 ));
-	
-	
-	/* Loop through the entries, processing each.
-	** Set the time/date stamps last, because otherwise they'll 
-	** be destroyed	when we write.
-	*/	
-	{
-		Boolean hasDateEntry = false;
-		ASEntry dateEntry;
-		long offset;
-		ASEntry entry;
-		
-		for ( int i=0; i < header.numEntries; i++ )
-		{	
-			offset = sizeof( ASHeader ) + sizeof( ASEntry ) * i;
-			MAC_ERR_CHECK(SetFPos( mInRefNum, fsFromStart, offset ));
-			
-			bytesRead = sizeof(entry);
-			MAC_ERR_CHECK(FSRead( mInRefNum, &bytesRead, &entry ));
-			if (bytesRead != sizeof(entry))
-				return -1;
-				
- 			if ( entry.entryID == AS_FILEDATES )
- 			{
- 				hasDateEntry = true;
- 				dateEntry = entry;
- 			}
- 			else
-	 			MAC_ERR_CHECK(ProcessASEntry( entry ));
-		}
-		if ( hasDateEntry )
-			MAC_ERR_CHECK(ProcessASEntry( dateEntry ));
-	}
-	
-	// close the inSpec
-	FSClose( mInRefNum );
-	
-	// rename if need be
-	if (mRenameReqd)
-	{
-		FSSpec old;		// delete old version of target file
-		
-		FSMakeFSSpec(mInSpec->vRefNum, mInSpec->parID, mInSpec->name, &old);
-		MAC_ERR_CHECK(FSpDelete(&old));
-		MAC_ERR_CHECK(FSpRename(mOutSpec, mInSpec->name));
-		
-		// reflect change in outSpec
-		nsAppleSingleDecoder::PLstrncpy( mOutSpec->name, mInSpec->name, mInSpec->name[0] );
-		mOutSpec->name[0] = mInSpec->name[0];
-		mRenameReqd = false; // XXX redundant reinit?
-	}
-	
- 	return err;
-}
-
-OSErr
-nsAppleSingleDecoder::Decode(FSSpec *inSpec, FSSpec *outSpec)
-{
-	OSErr 	err = noErr;
-	
-	// param check
-	if (inSpec && outSpec)
-	{
-		mInSpec = inSpec;		// reinit
-		mOutSpec = outSpec;
-		mRenameReqd = false; 
-	}
-	else
-		return paramErr;
-		
-	err = Decode();
-	
-	return err;
-}
-
-pascal void
-DecodeDirIterateFilter(const CInfoPBRec * const cpbPtr, Boolean *quitFlag, void *yourDataPtr)
-{	
-	OSErr					err = noErr;
-	FSSpec 					currFSp, outFSp;
-	nsAppleSingleDecoder* 	thisObj = NULL;
-	Boolean					isDir = false;
-	long					dummy;
-	
-	// param check
-	if (!yourDataPtr || !cpbPtr || !quitFlag)
-		return;
-		
-	*quitFlag = false;
-	
-	// extract 'this' -- an nsAppleSingleDecoder instance
-	thisObj = (nsAppleSingleDecoder*) yourDataPtr;
-	
-	// make an FSSpec from the CInfoPBRec*
-	err = FSMakeFSSpec(cpbPtr->hFileInfo.ioVRefNum, cpbPtr->hFileInfo.ioFlParID, 
-						cpbPtr->hFileInfo.ioNamePtr, &currFSp);
-	if (err == noErr)
-	{
-		FSpGetDirectoryID(&currFSp, &dummy, &isDir);
-		
-		// if current FSSpec is file
-		if (!isDir)
-		{
-			// if file is in AppleSingle format
-			if (nsAppleSingleDecoder::IsAppleSingleFile(&currFSp))
-			{
-				// decode file
-				thisObj->Decode(&currFSp, &outFSp);
-			}
-		}
-		else
-		{
-			// else if current FSSpec is folder ignore
-			// XXX never reached?
-			return;
-		}
-	}
-}
-
-OSErr 
-nsAppleSingleDecoder::DecodeFolder(FSSpec *aFolder)
-{
-	OSErr	err = noErr;
-	long	dummy;
-	Boolean	isDir = false;
-	
-	// check that FSSpec is folder
-	if (aFolder)
-	{
-		FSpGetDirectoryID(aFolder, &dummy, &isDir);
-		if (!isDir)
-			return dirNFErr;
-	}
-	
-	// recursively enumerate contents of folder (maxLevels=0 means recurse all)
-	FSpIterateDirectory(aFolder, 0, DecodeDirIterateFilter, (void*)this);
-			
-	return err;
-}
-
-Boolean
-nsAppleSingleDecoder::IsAppleSingleFile(FSSpec *inSpec)
-{
-	OSErr	err;
-	Boolean bAppleSingle = false;
-	short	inRefNum;
-	UInt32	magic;
-	long 	bytesRead = sizeof(magic);
-	
-	// param checks
-	if (!inSpec)
-		return false;
-		
-	// check for existence
-	FSSpec tmp;
-	err = FSMakeFSSpec(inSpec->vRefNum, inSpec->parID, inSpec->name, &tmp);
-	if (err!=noErr)
-		return false;
-	
-	// open and read the magic number len bytes	
-	err = FSpOpenDF( inSpec, fsRdPerm, &inRefNum );
-	if (err!=noErr)
-		return false;
-		
-	err = FSRead( inRefNum, &bytesRead, &magic );
-	if (err!=noErr)
-		return false;
-		
-	FSClose(inRefNum);
-	if (bytesRead != sizeof(magic))
-		return false;
-
-	// check if bytes read match magic number	
-	bAppleSingle = (magic == 0x00051600);
-	return bAppleSingle;
-}
-
-
-/*----------------------------------------------------------------------*
- *   Private methods
- *----------------------------------------------------------------------*/
-OSErr
-nsAppleSingleDecoder::ProcessASEntry(ASEntry inEntry)
-{
-	switch (inEntry.entryID)
-	{
-		case AS_DATA:
-			return ProcessDataFork( inEntry );
-			break;
-		case AS_RESOURCE:
-			return ProcessResourceFork( inEntry );
-			break;
-		case AS_REALNAME:
-			ProcessRealName( inEntry );
-			break;
-			// return 0;	// Ignore these errors in ASD   <--- XXX remove
-		case AS_COMMENT:
-//			return ProcessComment( inEntry );
-			break;
-		case AS_ICONBW:
-//			return ProcessIconBW( inEntry );
-			break;
-		case AS_ICONCOLOR:
-//			return ProcessIconColor( inEntry );
-			break;
-		case AS_FILEDATES:
-			return ProcessFileDates( inEntry );
-			break;
-		case AS_FINDERINFO:
-			return ProcessFinderInfo( inEntry );
-			break;
-		case AS_MACINFO:
-			return ProcessMacInfo( inEntry );
-			break;
-		case AS_PRODOSINFO:
-		case AS_MSDOSINFO:
-		case AS_AFPNAME:
-		case AS_AFPINFO:
-		case AS_AFPDIRID:
-		default:
-			return 0;
-	}
-	return 0;
-}
-
-OSErr
-nsAppleSingleDecoder::ProcessDataFork(ASEntry inEntry)
-{
-	OSErr	err = noErr;
-	SInt16	refNum;
-	
-	/* Setup the files */
-	err = FSpOpenDF (mOutSpec, fsWrPerm,  &refNum);
-
-	if ( err == noErr )
-		err = EntryToMacFile( inEntry, refNum );
-	
-	FSClose( refNum );
-	return err;
-}
-
-OSErr
-nsAppleSingleDecoder::ProcessResourceFork(ASEntry inEntry)
-{
-	OSErr	err = noErr;
-	SInt16	refNum;
-		
-	err = FSpOpenRF(mOutSpec, fsWrPerm,  &refNum);
-
-	if ( err == noErr )
-		err = EntryToMacFile( inEntry, refNum );
-	
-	FSClose( refNum );
-	return err;
-}
-
-OSErr
-nsAppleSingleDecoder::ProcessRealName(ASEntry inEntry)
-{
-	OSErr	err = noErr;
-	Str255	newName;
-	long	bytesRead;
-	
-	if ( inEntry.entryLength > 32 )	/* Max file name length for the Mac */
-		return -1;
-
-	MAC_ERR_CHECK(SetFPos(mInRefNum, fsFromStart, inEntry.entryOffset));
-	
-	bytesRead = inEntry.entryLength;
-	MAC_ERR_CHECK(FSRead(mInRefNum, &bytesRead, &newName[1]));
-	if (bytesRead != inEntry.entryLength)
-		return -1;
-		
-	newName[0] = inEntry.entryLength;
-	err = FSpRename(mOutSpec, newName);
-	if (err == dupFNErr)
-	{
-		// if we are trying to rename temp decode file to src name, rename later
-		if (nsAppleSingleDecoder::PLstrcmp(newName, mInSpec->name))
-		{
-			mRenameReqd = true;
-			return noErr;
-		}
-		
-		FSSpec old;		// delete old version of target file
-		
-		FSMakeFSSpec(mOutSpec->vRefNum, mOutSpec->parID, newName, &old);
-		MAC_ERR_CHECK(FSpDelete(&old));
-		MAC_ERR_CHECK(FSpRename(mOutSpec, newName));
-	}
-	nsAppleSingleDecoder::PLstrncpy( mOutSpec->name, newName, inEntry.entryLength );
-	mOutSpec->name[0] = inEntry.entryLength;
-
-	return err;
-}
-
-OSErr
-nsAppleSingleDecoder::ProcessFileDates(ASEntry inEntry)
-{
-	OSErr		err = noErr;
-	ASFileDates dates;
-	long		bytesRead;
-	
-	if ( inEntry.entryLength != sizeof(dates) )	/* Max file name length for the Mac */
-		return -1;
-	
-	MAC_ERR_CHECK(SetFPos(mInRefNum, fsFromStart, inEntry.entryOffset));
-	
-	bytesRead = inEntry.entryLength;
-	MAC_ERR_CHECK(FSRead(mInRefNum, &bytesRead, &dates));
-	if (bytesRead != inEntry.entryLength)
-		return -1;
-		
-	Str31 name;
-	nsAppleSingleDecoder::PLstrncpy(name, mOutSpec->name, mOutSpec->name[0]);
-	name[0] = mOutSpec->name[0];
-	CInfoPBRec pb;
-	pb.hFileInfo.ioNamePtr = &name[0];
-	pb.hFileInfo.ioVRefNum = mOutSpec->vRefNum;
-	pb.hFileInfo.ioDirID = mOutSpec->parID;
-	pb.hFileInfo.ioFDirIndex = 0;	/* use ioNamePtr and ioDirID */
-	err = PBGetCatInfoSync(&pb);
-	if ( err != noErr )
-		return -1;
-#define YR_2000_SECONDS 3029529600
-	pb.hFileInfo.ioFlCrDat = dates.create + YR_2000_SECONDS;
-	pb.hFileInfo.ioFlMdDat = dates.modify + YR_2000_SECONDS;
-	pb.hFileInfo.ioFlBkDat = dates.backup + YR_2000_SECONDS;
-	/* Not sure if mac has the last access time */
-	
-	nsAppleSingleDecoder::PLstrncpy(name, mOutSpec->name, mOutSpec->name[0]);
-	name[0] = mOutSpec->name[0];
-	pb.hFileInfo.ioNamePtr = name;
-	pb.hFileInfo.ioVRefNum = mOutSpec->vRefNum;
-	pb.hFileInfo.ioDirID = mOutSpec->parID;
-	pb.hFileInfo.ioFDirIndex = 0;	/* use ioNamePtr and ioDirID */
-	err = PBSetCatInfo(&pb, false);
-	
-	return err;
-}
-
-OSErr
-nsAppleSingleDecoder::ProcessFinderInfo(ASEntry inEntry)
-{
-	OSErr			err = noErr;
-	ASFinderInfo 	info;
-	long			bytesRead;
-	
-	if (inEntry.entryLength != sizeof( ASFinderInfo ))
-		return -1;
-
-	MAC_ERR_CHECK(SetFPos(mInRefNum, fsFromStart, inEntry.entryOffset));
-
-	bytesRead = sizeof(info);
-	MAC_ERR_CHECK(FSRead(mInRefNum, &bytesRead, &info));
-	if (bytesRead != inEntry.entryLength)
-		return -1;
-		
-	err = FSpSetFInfo(mOutSpec, &info.ioFlFndrInfo);
-	if (err!=noErr && err!=fnfErr)
-		return err;
-
-	Str31 name;
-	nsAppleSingleDecoder::PLstrncpy(name, mOutSpec->name, mOutSpec->name[0]);
-	name[0] = mOutSpec->name[0];
-	CInfoPBRec pb;
-	pb.hFileInfo.ioNamePtr = name;
-	pb.hFileInfo.ioVRefNum = mOutSpec->vRefNum;
-	pb.hFileInfo.ioDirID = mOutSpec->parID;
-	pb.hFileInfo.ioFDirIndex = 0;	/* use ioNamePtr and ioDirID */
-	MAC_ERR_CHECK(PBGetCatInfoSync(&pb));
-	
-	pb.hFileInfo.ioNamePtr = name;
-	pb.hFileInfo.ioVRefNum = mOutSpec->vRefNum;
-	pb.hFileInfo.ioDirID = mOutSpec->parID;
-	pb.hFileInfo.ioFDirIndex = 0;	/* use ioNamePtr and ioDirID */
-	pb.hFileInfo.ioFlXFndrInfo = info.ioFlXFndrInfo;
-	err = PBSetCatInfo(&pb, false);
-    
-    
-
-    if (info.ioFlFndrInfo.fdType == 'APPL')
-    {
-        // need to register in desktop database or bad things will happen
-
-        DTSetAPPL(  NULL, 
-                    mOutSpec->vRefNum,
-                    info.ioFlFndrInfo.fdCreator,
-                    mOutSpec->parID,
-                    mOutSpec->name );
-
-    }
-
-
-	return err;
-}
-
-OSErr
-nsAppleSingleDecoder::ProcessMacInfo(ASEntry inEntry)
-{
-	OSErr		err = noErr;
-	ASMacInfo 	info;
-	long 		bytesRead;
-	
-	if (inEntry.entryLength != sizeof( ASMacInfo ))
-		return -1;
-
-	MAC_ERR_CHECK(SetFPos(mInRefNum, fsFromStart, inEntry.entryOffset));
-
-	bytesRead = sizeof(info);
-	MAC_ERR_CHECK(FSRead(mInRefNum, &bytesRead, &info));
-	if (bytesRead != inEntry.entryLength)
-		return -1;
-	
-	Str31 name;
-	nsAppleSingleDecoder::PLstrncpy(name, mOutSpec->name, mOutSpec->name[0]);
-	name[0] = mOutSpec->name[0];
-	CInfoPBRec pb;
-	pb.hFileInfo.ioNamePtr = name;
-	pb.hFileInfo.ioVRefNum = mOutSpec->vRefNum;
-	pb.hFileInfo.ioDirID = mOutSpec->parID;
-	pb.hFileInfo.ioFDirIndex = 0;	/* use ioNamePtr and ioDirID */
-	MAC_ERR_CHECK(PBGetCatInfoSync(&pb));
-	
-	pb.hFileInfo.ioNamePtr = name;
-	pb.hFileInfo.ioVRefNum = mOutSpec->vRefNum;
-	pb.hFileInfo.ioDirID = mOutSpec->parID;
-	pb.hFileInfo.ioFlAttrib = info.ioFlAttrib;
-	err = PBSetCatInfo(&pb, false);
-	
-	return err;
-}
-
-OSErr
-nsAppleSingleDecoder::EntryToMacFile(ASEntry inEntry, UInt16 inTargetSpecRefNum)
-{
-#define BUFFER_SIZE 8192
-
-	OSErr	err = noErr;
-	char 	buffer[BUFFER_SIZE];
-	long 	totalRead = 0, bytesRead, bytesToWrite;
-
-	MAC_ERR_CHECK(SetFPos( mInRefNum, fsFromStart, inEntry.entryOffset ));
-
-	while ( totalRead < inEntry.entryLength )
-	{
-// Should we yield in here?
-		bytesRead = BUFFER_SIZE;
-		err = FSRead( mInRefNum, &bytesRead, buffer );
-		if (err!=noErr && err!=eofErr)
-			return err;
-			
-		if ( bytesRead <= 0 )
-			return -1;
-		bytesToWrite = totalRead + bytesRead > inEntry.entryLength ? 
-									inEntry.entryLength - totalRead :
-									bytesRead;
-
-		totalRead += bytesRead;
-		MAC_ERR_CHECK(FSWrite(inTargetSpecRefNum, &bytesToWrite, buffer));
-	}	
-	
-	return err;
-}
-
-OSErr DTSetAPPL(Str255 volName,
-                short vRefNum,
-                OSType creator,
-                long applParID,
-                Str255 applName)
-{
-    OSErr err;
-    DTPBRec *pb = NULL;
-    short dtRefNum;
-    short realVRefNum;
-    Boolean newDTDatabase;
-    /* get the real vRefnum */
-    err = DetermineVRefNum(volName, vRefNum, &realVRefNum);
-    if (err == noErr)
-    {
-        err = DTOpen(volName, vRefNum, &dtRefNum, &newDTDatabase);
-        if (err == noErr && !newDTDatabase)
-        {
-            pb = (DTPBRec*) NewPtrClear( sizeof(DTPBRec) );
-            
-            if (pb==NULL) return -1;
-
-            pb->ioNamePtr      =   applName;
-            pb->ioDTRefNum     =   dtRefNum;
-            pb->ioDirID        =   applParID;
-            pb->ioFileCreator  =   creator;
-
-            err = PBDTAddAPPLSync(pb);
-            
-            if (pb) DisposePtr((Ptr)pb);
-        }        
-    }
-    return err;
-}
-
-OSErr
-nsAppleSingleDecoder::FSMakeUnique(FSSpec *ioSpec)
-{
-	OSErr			err = noErr;
-	Boolean 		bUnique = false;
-	FSSpec			tmp;
-	long				uniqueID = 0;
-	Str255			name;
-	short			i, j;
-	unsigned char	puniqueID[16];
-	char			*cuniqueIDPtr;
-
-	// grab suggested name from in-out FSSpec
-	nsAppleSingleDecoder::PLstrncpy(name, ioSpec->name, ioSpec->name[0]);
-	name[0] = ioSpec->name[0];
-	
-	for (i=0; i<65536; i++)		// prevent infinite loop
-	{	
-		if (!bUnique)
-		{
-			err = FSMakeFSSpec( ioSpec->vRefNum, ioSpec->parID, name, &tmp );
-			if (err == fnfErr)
-			{
-				bUnique = true;
-				break;
-			}
-			else if (err == noErr)	// file already exists
-			{
-				// grab suggested name from in-out FSSpec
-				nsAppleSingleDecoder::PLstrncpy(name, ioSpec->name, ioSpec->name[0]);
-				name[0] = ioSpec->name[0];
-				
-				// attempt to create a new unique file name
-				nsAppleSingleDecoder::PLstrncat( name, "\p-", 1 );
-				
-				// tack on digit(s)
-				cuniqueIDPtr = nsAppleSingleDecoder::ltoa(uniqueID++);
-				puniqueID[0] = strlen(cuniqueIDPtr);
-				for (j=0; j<strlen(cuniqueIDPtr); j++)
-				{
-					puniqueID[j+1] = cuniqueIDPtr[j];
-				}
-				
-				nsAppleSingleDecoder::PLstrncat( name, puniqueID, puniqueID[0] );
-				DisposePtr((Ptr)cuniqueIDPtr);
-			}
-			else
-				return err;
-		}
-	}
-	
-	// put back unique name into in-out FSSpec
-	nsAppleSingleDecoder::PLstrncpy(ioSpec->name, name, name[0]);
-	ioSpec->name[0] = name[0];
-	
-	return noErr;
-}		
-
-/*----------------------------------------------------------------------*
- *   Utilities
- *----------------------------------------------------------------------*/
-char *
-nsAppleSingleDecoder::ltoa(long n)
-{
-	char *s;
-	int i, j, sign, tmp;
-	
-	/* check sign and convert to positive to stringify numbers */
-	if ( (sign = n) < 0)
-		n = -n;
-	i = 0;
-	s = (char*) malloc(sizeof(char));
-	
-	/* grow string as needed to add numbers from powers of 10 down till none left */
-	do
-	{
-		s = (char*) realloc(s, (i+1)*sizeof(char));
-		s[i++] = n % 10 + '0';  /* '0' or 30 is where ASCII numbers start from */
-		s[i] = '\0';
-	}
-	while( (n /= 10) > 0);	
-	
-	/* tack on minus sign if we found earlier that this was negative */
-	if (sign < 0)
-	{
-		s = (char*) realloc(s, (i+1)*sizeof(char));
-		s[i++] = '-';
-	}
-	s[i] = '\0';
-	
-	/* pop numbers (and sign) off of string to push back into right direction */
-	for (i = 0, j = strlen(s) - 1; i < j; i++, j--)
-	{
-		tmp = s[i];
-		s[i] = s[j];
-		s[j] = tmp;
-	}
-	
-	return s;
-}
-
-StringPtr 	
-nsAppleSingleDecoder::PLstrncpy(StringPtr dst, ConstStr255Param src, short max)
-{
-	int srcLen = src[0];
-	if (srcLen > max)
-		srcLen = max;
-	dst[0] = srcLen;	
-	memcpy(&dst[1], &src[1], srcLen);
-	return dst;	
-}
-
-StringPtr 	
-nsAppleSingleDecoder::PLstrncat(StringPtr dst, ConstStr255Param src, short max)
-{
-	int srcLen = src[0], dstLen = dst[0];
-	if (srcLen > max)
-		srcLen = max;
-	dst[0] += srcLen;
-	memcpy(&dst[dstLen+1], &src[1], srcLen);
-	return dst;
-}
-
-Boolean
-nsAppleSingleDecoder::PLstrcmp(StringPtr str1, StringPtr str2)
-{
-	Boolean	bEqual = true;
-	
-	// check for same length
-	if (str1[0] == str2[0])
-	{
-		// verify mem blocks match
-		if (0 != memcmp(&str1[1], &str2[1], str1[0]))
-			bEqual = false;
-	}
-	else
-		bEqual = false;
-		
-	return bEqual;
-}

mozilla/xpinstall/src/nsAppleSingleDecoder.h

@@ -1,222 +0,0 @@
-/* -*- 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 Communicator client code, released March
- * 31, 1998. 
- *
- * 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.  
- * 
- * Contributors:
- *     Samir Gehani <sgehani@netscape.com>
- */
-
-
-/*----------------------------------------------------------------------*
- *   Implements a simple AppleSingle decoder, as described in RFC1740 
- *	 http://andrew2.andrew.cmu.edu/rfc/rfc1740.html
- *----------------------------------------------------------------------*/
-
-#ifndef macintosh
-#error Sorry! This is Mac only functionality!
-#endif
-
-#pragma options align=mac68k
-
-#ifndef _NS_APPLESINGLEDECODER_H_
-#define _NS_APPLESINGLEDECODER_H_
-
-#include <stdlib.h>
-#include <string.h>
-#include <Files.h>
-#include <Errors.h>
-
-
-/*----------------------------------------------------------------------*
- *   Struct definitions from RFC1740
- *----------------------------------------------------------------------*/
-typedef struct ASHeader /* header portion of AppleSingle */ 
-{
-    /* AppleSingle = 0x00051600; AppleDouble = 0x00051607 */
-       UInt32 magicNum; 	/* internal file type tag */ 
-       UInt32 versionNum; 	/* format version: 2 = 0x00020000 */ 
-       UInt8 filler[16]; 	/* filler, currently all bits 0 */ 
-       UInt16 numEntries; 	/* number of entries which follow */
-} ASHeader ; /* ASHeader */ 
-
-typedef struct ASEntry /* one AppleSingle entry descriptor */ 
-{
-	UInt32 entryID; 	/* entry type: see list, 0 invalid */
-	UInt32 entryOffset; /* offset, in octets, from beginning */
-	                    /* of file to this entry's data */
-	UInt32 entryLength; /* length of data in octets */
-} ASEntry; /* ASEntry */
-
-typedef struct ASFinderInfo
-{
-	FInfo ioFlFndrInfo; 	/* PBGetFileInfo() or PBGetCatInfo() */
-	FXInfo ioFlXFndrInfo; 	/* PBGetCatInfo() (HFS only) */
-} ASFinderInfo; /* ASFinderInfo */
-
-typedef struct ASMacInfo        /* entry ID 10, Macintosh file information */
-{
-       UInt8 filler[3]; 	/* filler, currently all bits 0 */ 
-       UInt8 ioFlAttrib; 	/* PBGetFileInfo() or PBGetCatInfo() */
-} ASMacInfo;
-
-typedef struct ASFileDates      /* entry ID 8, file dates info */
-{
-	SInt32 create; /* file creation date/time */
-	SInt32 modify; /* last modification date/time */
-	SInt32 backup; /* last backup date/time */
-	SInt32 access; /* last access date/time */
-} ASFileDates; /* ASFileDates */
-
-/* entryID list */
-#define AS_DATA         1 /* data fork */
-#define AS_RESOURCE     2 /* resource fork */
-#define AS_REALNAME     3 /* File's name on home file system */
-#define AS_COMMENT      4 /* standard Mac comment */
-#define AS_ICONBW       5 /* Mac black & white icon */
-#define AS_ICONCOLOR    6 /* Mac color icon */
-   		/*              7       /* not used */
-#define AS_FILEDATES    8 /* file dates; create, modify, etc */
-#define AS_FINDERINFO   9 /* Mac Finder info & extended info */
-#define AS_MACINFO      10 /* Mac file info, attributes, etc */
-#define AS_PRODOSINFO   11 /* Pro-DOS file info, attrib., etc */
-#define AS_MSDOSINFO    12 /* MS-DOS file info, attributes, etc */
-#define AS_AFPNAME      13 /* Short name on AFP server */
-#define AS_AFPINFO      14 /* AFP file info, attrib., etc */
-
-#define AS_AFPDIRID     15 /* AFP directory ID */
-
-
-/*----------------------------------------------------------------------*
- *   Macros
- *----------------------------------------------------------------------*/
-#define MAC_ERR_CHECK(_funcCall) 	\
-	err = _funcCall; 				\
-	if (err!=noErr) 				\
-			return err;
-	
-	
-
-class nsAppleSingleDecoder 
-{
-
-public:
-	nsAppleSingleDecoder(FSSpec *inSpec, FSSpec *outSpec);
-	nsAppleSingleDecoder();
-	~nsAppleSingleDecoder();
-		
-	/** 
-	 * Decode
-	 *
-	 * Takes an "in" FSSpec for the source file in AppleSingle
-	 * format to decode and write out to an "out" FSSpec.
-	 * This form is used when the Decode(void) method has already
-	 * been invoked once and this object is reused to decode 
-	 * another AppleSingled file: useful in iteration to avoid
-	 * nsAppleSingleDecoder object instantiation per file.
-	 *
-	 * @param  inSpec 	the AppleSingled file to decode
-	 * @param  outSpec 	the destination file in which the decoded
-	 *					data was written out (empty when passed in
-	 *					and filled on return)
-	 * @return err		a standard MacOS OSErr where noErr means OK
-	 */
-	OSErr Decode(FSSpec *inSpec, FSSpec *outSpec);
-		
-	/**
-	 * Decode
-	 *
-	 * Decodes the AppleSingled file passed in to the constructor
-	 * and writes out the decoded data to the outSpec passed to the 
-	 * constructor.
-	 *
-	 * @return err		a standard MacOS OSErr where noErr = OK
-	 */
-	OSErr Decode();
-	
-    /**
-     * DecodeFolder
-     *
-     * Traverses arbitrarily nested subdirs decoding any files
-     * in AppleSingle format and leaving other files alone.
-     *
-     * @param   aFolder  the folder whose contents to decode
-     * @return  err	     a standard MacOS err (dirNFErr if invalid dir, noErr = OK)
-     */
-    OSErr DecodeFolder(FSSpec *aFolder);
-     
-	/**
-	 * IsAppleSingleFile
-	 *
-	 * Checks the file header to see whether this is an AppleSingle
-	 * version 2 file by matching the magicNum field in the header.
-	 *
-	 * @param  inSpec			the file to check
-	 * @return bAppleSingle		a Boolean where true indicates this is
-	 *							in fact an AppleSingle file
-	 */
-	static Boolean IsAppleSingleFile(FSSpec *inSpec);
-	
-	/**
-	 * String utilities to ensure building standalone
-	 * since Mozilla doesn't use PLStringFuncs.
-	 */
-	static StringPtr PLstrncpy(StringPtr dst, ConstStr255Param src, short max);
-	static StringPtr PLstrncat(StringPtr dst, ConstStr255Param src, short max);
-	static Boolean   PLstrcmp(StringPtr str1, StringPtr str2);
-	
-	/**
- 	 * ltoa -- long to ascii
- 	 *
- 	 * Converts a long to a C string. We allocate 
- 	 * a string of the appropriate size and the caller
- 	 * should assume ownership of the returned pointer.
- 	 */
-	static char *ltoa(long n);
-	
-private:
-	FSSpec	*mInSpec;
-	FSSpec	*mOutSpec;
-	short	mInRefNum;	// cache since it's used through the life of one Decode cycle
-	Boolean	mRenameReqd;
-	
-	OSErr	ProcessASEntry(ASEntry inEntry);	
-	OSErr	ProcessDataFork(ASEntry inEntry);
-	OSErr	ProcessResourceFork(ASEntry inEntry);
-	OSErr	ProcessRealName(ASEntry inEntry);
-	OSErr	ProcessFileDates(ASEntry inEntry);
-	OSErr	ProcessFinderInfo(ASEntry inEntry);
-	OSErr	ProcessMacInfo(ASEntry inEntry);
-	OSErr	EntryToMacFile(ASEntry inEntry, UInt16 inTargetSpecRefNum);
-	
-	OSErr	FSMakeUnique(FSSpec *ioSpec);
-};
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-OSErr DTSetAPPL(Str255 volName,short vRefNum,OSType creator,long applParID,Str255 applName);
-pascal void
-DecodeDirIterateFilter(const CInfoPBRec * const cpbPtr, Boolean *quitFlag, void *yourDataPtr);
-
-#ifdef __cplusplus
-}
-#endif
-
-#pragma options align=reset
-
-#endif /* _NS_APPLESINGLEDECODER_H_ */

mozilla/xpinstall/src/nsInstall.h

@@ -1,24 +1,24 @@
 /* -*- 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/
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "License"); you 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.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY 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 client code, 
  * released March 31, 1998. 
  *
  * 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.
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  *
- * Contributor(s): 
+ * Contributors:
  *     Daniel Veditz <dveditz@netscape.com>
  *     Douglas Turner <dougt@netscape.com>
  */
@@ -36,70 +36,51 @@
 
 #include "nsString.h"
 #include "nsFileSpec.h"
-#include "nsVoidArray.h"
+#include "nsVector.h"
 #include "nsHashtable.h"
-#include "nsCOMPtr.h"
 
 #include "nsSoftwareUpdate.h"
 
 #include "nsInstallObject.h"
 #include "nsInstallVersion.h"
-#include "nsInstallFolder.h"
 
-#include "nsIXPINotifier.h"
+#include "nsIXPInstallProgress.h"
 
-#include "nsIStringBundle.h"
-#include "nsILocale.h"
-#include "nsIEventQueueService.h"
-#include "nsIServiceManager.h"
-#include "nsIComponentManager.h"
-#include "nsIPersistentProperties.h"
-#include "nsIEnumerator.h"
-#include "nsIZipReader.h"
 
 class nsInstallInfo
 {
   public:
     
-    nsInstallInfo( nsIFileSpec*     aFile, 
-                   const PRUnichar* aURL, 
-                   const PRUnichar* aArgs, 
-                   long             aFlags, 
-                   nsIXPINotifier*  aNotifier);
+    nsInstallInfo(const nsString& fromURL, const nsString& localFile, long flags);
 
+    nsInstallInfo(nsVector* fromURL, nsVector* localFiles, long flags);
+    
     virtual ~nsInstallInfo();
 
-    nsresult GetLocalFile(nsFileSpec& aSpec);
-
-    void GetURL(nsString& aURL) { aURL = mURL; }
-
-    void GetArguments(nsString& aArgs) { aArgs = mArgs; }
+    nsString& GetFromURL(PRUint32 index = 0);
     
-    long GetFlags() { return mFlags; }
+    nsString& GetLocalFile(PRUint32 index = 0);
 
-    nsIXPINotifier* GetNotifier() { return mNotifier; };
+    void GetArguments(nsString& args, PRUint32 index = 0);
+    
+    long GetFlags();
+    
+    PRBool    IsMultipleTrigger();
+
+    static void DeleteVector(nsVector* vector);    
     
   private:
     
+    
+    PRBool    mMultipleTrigger;
     nsresult  mError;
 
     long       mFlags;
-    nsString   mURL;
-    nsString   mArgs;
-
-    nsCOMPtr<nsIFileSpec>       mFile;
-    nsCOMPtr<nsIXPINotifier>    mNotifier;
+    nsVector  *mFromURLs;
+    nsVector  *mLocalFiles;
 };
 
-#ifdef XP_PC
-#define FILESEP '\\'
-#elif defined XP_MAC
-#define FILESEP ':'
-#elif defined XP_BEOS
-#define FILESEP '/'
-#else
-#define FILESEP '/'
-#endif
+
 
 class nsInstall
 {
@@ -114,19 +95,19 @@ class nsInstall
             UNEXPECTED_ERROR            = -201,
             ACCESS_DENIED               = -202,
             TOO_MANY_CERTIFICATES       = -203,
-            NO_INSTALL_SCRIPT           = -204,
+            NO_INSTALLER_CERTIFICATE    = -204,
             NO_CERTIFICATE              = -205,
             NO_MATCHING_CERTIFICATE     = -206,
-            CANT_READ_ARCHIVE           = -207,
+            UNKNOWN_JAR_FILE            = -207,
             INVALID_ARGUMENTS           = -208,
             ILLEGAL_RELATIVE_PATH       = -209,
             USER_CANCELLED              = -210,
             INSTALL_NOT_STARTED         = -211,
             SILENT_MODE_DENIED          = -212,
             NO_SUCH_COMPONENT           = -213,
-            DOES_NOT_EXIST              = -214,
-            READ_ONLY                   = -215,
-            IS_DIRECTORY                = -216,
+            FILE_DOES_NOT_EXIST         = -214,
+            FILE_READ_ONLY              = -215,
+            FILE_IS_DIRECTORY           = -216,
             NETWORK_FILE_IS_IN_USE      = -217,
             APPLE_SINGLE_ERR            = -218,
             INVALID_PATH_ERR            = -219,
@@ -134,23 +115,6 @@ class nsInstall
             PATCH_BAD_CHECKSUM_TARGET   = -221,
             PATCH_BAD_CHECKSUM_RESULT   = -222,
             UNINSTALL_FAILED            = -223,
-            PACKAGE_FOLDER_NOT_SET      = -224,
-            EXTRACTION_FAILED           = -225,
-            FILENAME_ALREADY_USED       = -226,
-            ABORT_INSTALL               = -227,
-            DOWNLOAD_ERROR              = -228,
-            SCRIPT_ERROR                = -229,
-
-            ALREADY_EXISTS              = -230,
-            IS_FILE                     = -231,
-            SOURCE_DOES_NOT_EXIST       = -232,
-            SOURCE_IS_DIRECTORY         = -233,
-            SOURCE_IS_FILE              = -234,
-            INSUFFICIENT_DISK_SPACE     = -235,
-            FILENAME_TOO_LONG           = -236,
-            
-            OUT_OF_MEMORY               = -299,
-
             GESTALT_UNKNOWN_ERR         = -5550,
             GESTALT_INVALID_ARGUMENT    = -5551,
             
@@ -168,7 +132,7 @@ class nsInstall
         };
 
 
-        nsInstall(nsIZipReader * theJARFile);
+        nsInstall();
         virtual ~nsInstall();
         
         PRInt32    SetScriptObject(void* aScriptObject);
@@ -182,124 +146,99 @@ class nsInstall
         PRInt32    GetUserPackageName(nsString& aUserPackageName);
         PRInt32    GetRegPackageName(nsString& aRegPackageName);
 
-        PRInt32    AbortInstall(PRInt32 aErrorNumber);
+        PRInt32    AbortInstall();
         
-        PRInt32    AddDirectory(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, nsInstallFolder* aFolder, const nsString& aSubdir, PRInt32 aMode, PRInt32* aReturn);
-        PRInt32    AddDirectory(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, nsInstallFolder* aFolder, const nsString& aSubdir, PRInt32* aReturn);
-        PRInt32    AddDirectory(const nsString& aRegName, const nsString& aJarSource, nsInstallFolder* aFolder, const nsString& aSubdir, PRInt32* aReturn);
+        PRInt32    AddDirectory(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, const nsString& aFolder, const nsString& aSubdir, PRBool aForceMode, PRInt32* aReturn);
+        PRInt32    AddDirectory(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, const nsString& aFolder, const nsString& aSubdir, PRInt32* aReturn);
+        PRInt32    AddDirectory(const nsString& aRegName, const nsString& aJarSource, const nsString& aFolder, const nsString& aSubdir, PRInt32* aReturn);
         PRInt32    AddDirectory(const nsString& aJarSource, PRInt32* aReturn);
         
-        PRInt32    AddSubcomponent(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, nsInstallFolder *aFolder, const nsString& aTargetName, PRInt32 aMode, PRInt32* aReturn);
-        PRInt32    AddSubcomponent(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, nsInstallFolder *aFolder, const nsString& aTargetName, PRInt32* aReturn);
-        PRInt32    AddSubcomponent(const nsString& aRegName, const nsString& aJarSource, nsInstallFolder *aFolder, const nsString& aTargetName, PRInt32* aReturn);
+        PRInt32    AddSubcomponent(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, const nsString& aFolder, const nsString& aTargetName, PRBool aForceMode, PRInt32* aReturn);
+        PRInt32    AddSubcomponent(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, const nsString& aFolder, const nsString& aTargetName, PRInt32* aReturn);
+        PRInt32    AddSubcomponent(const nsString& aRegName, const nsString& aJarSource, const nsString& aFolder, const nsString& aTargetName, PRInt32* aReturn);
         PRInt32    AddSubcomponent(const nsString& aJarSource, PRInt32* aReturn);
         
         PRInt32    DeleteComponent(const nsString& aRegistryName, PRInt32* aReturn);
-        PRInt32    DeleteFile(nsInstallFolder* aFolder, const nsString& aRelativeFileName, PRInt32* aReturn);
-        PRInt32    DiskSpaceAvailable(const nsString& aFolder, PRInt64* aReturn);
+        PRInt32    DeleteFile(const nsString& aFolder, const nsString& aRelativeFileName, PRInt32* aReturn);
+        PRInt32    DiskSpaceAvailable(const nsString& aFolder, PRInt32* aReturn);
         PRInt32    Execute(const nsString& aJarSource, const nsString& aArgs, PRInt32* aReturn);
         PRInt32    Execute(const nsString& aJarSource, PRInt32* aReturn);
         PRInt32    FinalizeInstall(PRInt32* aReturn);
         PRInt32    Gestalt(const nsString& aSelector, PRInt32* aReturn);
-        
-        PRInt32    GetComponentFolder(const nsString& aComponentName, const nsString& aSubdirectory, nsInstallFolder** aFolder);
-        PRInt32    GetComponentFolder(const nsString& aComponentName, nsInstallFolder** aFolder);
-        
-        PRInt32    GetFolder(nsInstallFolder& aTargetFolder, const nsString& aSubdirectory, nsInstallFolder** aFolder);
-        PRInt32    GetFolder(const nsString& aTargetFolder, const nsString& aSubdirectory, nsInstallFolder** aFolder);
-        PRInt32    GetFolder(const nsString& aTargetFolder, nsInstallFolder** aFolder);
-        
+        PRInt32    GetComponentFolder(const nsString& aComponentName, const nsString& aSubdirectory, nsString** aFolder);
+        PRInt32    GetComponentFolder(const nsString& aComponentName, nsString** aFolder);
+        PRInt32    GetFolder(const nsString& aTargetFolder, const nsString& aSubdirectory, nsString** aFolder);
+        PRInt32    GetFolder(const nsString& aTargetFolder, nsString** aFolder);
         PRInt32    GetLastError(PRInt32* aReturn);
         PRInt32    GetWinProfile(const nsString& aFolder, const nsString& aFile, JSContext* jscontext, JSClass* WinProfileClass, jsval* aReturn);
         PRInt32    GetWinRegistry(JSContext* jscontext, JSClass* WinRegClass, jsval* aReturn);
-        PRInt32	   LoadResources(JSContext* cx, const nsString& aBaseName, jsval* aReturn);
-        PRInt32    Patch(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, nsInstallFolder* aFolder, const nsString& aTargetName, PRInt32* aReturn);
-        PRInt32    Patch(const nsString& aRegName, const nsString& aJarSource, nsInstallFolder* aFolder, const nsString& aTargetName, PRInt32* aReturn);
+        PRInt32    Patch(const nsString& aRegName, const nsString& aVersion, const nsString& aJarSource, const nsString& aFolder, const nsString& aTargetName, PRInt32* aReturn);
+        PRInt32    Patch(const nsString& aRegName, const nsString& aJarSource, const nsString& aFolder, const nsString& aTargetName, PRInt32* aReturn);
         PRInt32    ResetError();
-        PRInt32    SetPackageFolder(nsInstallFolder& aFolder);
+        PRInt32    SetPackageFolder(const nsString& aFolder);
         PRInt32    StartInstall(const nsString& aUserPackageName, const nsString& aPackageName, const nsString& aVersion, PRInt32* aReturn);
         PRInt32    Uninstall(const nsString& aPackageName, PRInt32* aReturn);
         
-        PRInt32    FileOpDirCreate(nsInstallFolder& aTarget, PRInt32* aReturn);
-        PRInt32    FileOpDirGetParent(nsInstallFolder& aTarget, nsFileSpec* aReturn);
-        PRInt32    FileOpDirRemove(nsInstallFolder& aTarget, PRInt32 aFlags, PRInt32* aReturn);
-        PRInt32    FileOpDirRename(nsInstallFolder& aSrc, nsString& aTarget, PRInt32* aReturn);
-        PRInt32    FileOpFileCopy(nsInstallFolder& aSrc, nsInstallFolder& aTarget, PRInt32* aReturn);
-        PRInt32    FileOpFileDelete(nsInstallFolder& aTarget, PRInt32 aFlags, PRInt32* aReturn);
-        PRInt32    FileOpFileExists(nsInstallFolder& aTarget, PRBool* aReturn);
-        PRInt32    FileOpFileExecute(nsInstallFolder& aTarget, nsString& aParams, PRInt32* aReturn);
-        PRInt32    FileOpFileGetNativeVersion(nsInstallFolder& aTarget, nsString* aReturn);
-        PRInt32    FileOpFileGetDiskSpaceAvailable(nsInstallFolder& aTarget, PRInt64* aReturn);
-        PRInt32    FileOpFileGetModDate(nsInstallFolder& aTarget, nsFileSpec::TimeStamp* aReturn);
-        PRInt32    FileOpFileGetSize(nsInstallFolder& aTarget, PRUint32* aReturn);
-        PRInt32    FileOpFileIsDirectory(nsInstallFolder& aTarget, PRBool* aReturn);
-        PRInt32    FileOpFileIsFile(nsInstallFolder& aTarget, PRBool* aReturn);
-        PRInt32    FileOpFileModDateChanged(nsInstallFolder& aTarget, nsFileSpec::TimeStamp& aOldStamp, PRBool* aReturn);
-        PRInt32    FileOpFileMove(nsInstallFolder& aSrc, nsInstallFolder& aTarget, PRInt32* aReturn);
-        PRInt32    FileOpFileRename(nsInstallFolder& aSrc, nsString& aTarget, PRInt32* aReturn);
-        PRInt32    FileOpFileWindowsShortcut(nsFileSpec& aTarget, nsFileSpec& aShortcutPath, nsString& aDescription, nsFileSpec& aWorkingPath, nsString& aParams, nsFileSpec& aIcon, PRInt32 aIconId, PRInt32* aReturn);
-        PRInt32    FileOpFileMacAlias(nsString& aSourcePath, nsString& aAliasPath, PRInt32* aReturn);
-        PRInt32    FileOpFileUnixLink(nsInstallFolder& aTarget, PRInt32 aFlags, PRInt32* aReturn);
-
-        void       LogComment(nsString& aComment);
+        PRInt32    FileOpDirCreate(nsFileSpec& aTarget, PRInt32* aReturn);
+        PRInt32    FileOpDirGetParent(nsFileSpec& aTarget, nsFileSpec* aReturn);
+        PRInt32    FileOpDirRemove(nsFileSpec& aTarget, PRInt32 aFlags, PRInt32* aReturn);
+        PRInt32    FileOpDirRename(nsFileSpec& aSrc, nsFileSpec& aTarget, PRInt32* aReturn);
+        PRInt32    FileOpFileCopy(nsFileSpec& aSrc, nsFileSpec& aTarget, PRInt32* aReturn);
+        PRInt32    FileOpFileDelete(nsFileSpec& aTarget, PRInt32 aFlags, PRInt32* aReturn);
+        PRInt32    FileOpFileExists(nsFileSpec& aTarget, PRBool* aReturn);
+        PRInt32    FileOpFileExecute(nsFileSpec& aTarget, nsString& aParams, PRInt32* aReturn);
+        PRInt32    FileOpFileGetNativeVersion(nsFileSpec& aTarget, nsString* aReturn);
+        PRInt32    FileOpFileGetDiskSpaceAvailable(nsFileSpec& aTarget, PRUint32* aReturn);
+        PRInt32    FileOpFileGetModDate(nsFileSpec& aTarget, nsFileSpec::TimeStamp* aReturn);
+        PRInt32    FileOpFileGetSize(nsFileSpec& aTarget, PRUint32* aReturn);
+        PRInt32    FileOpFileIsDirectory(nsFileSpec& aTarget, PRBool* aReturn);
+        PRInt32    FileOpFileIsFile(nsFileSpec& aTarget, PRBool* aReturn);
+        PRInt32    FileOpFileModDateChanged(nsFileSpec& aTarget, nsFileSpec::TimeStamp& aOldStamp, PRBool* aReturn);
+        PRInt32    FileOpFileMove(nsFileSpec& aSrc, nsFileSpec& aTarget, PRInt32* aReturn);
+        PRInt32    FileOpFileRename(nsFileSpec& aSrc, nsFileSpec& aTarget, PRInt32* aReturn);
+        PRInt32    FileOpFileWinShortcutCreate(nsFileSpec& aTarget, PRInt32 aFlags, PRInt32* aReturn);
+        PRInt32    FileOpFileMacAliasCreate(nsFileSpec& aTarget, PRInt32 aFlags, PRInt32* aReturn);
+        PRInt32    FileOpFileUnixLinkCreate(nsFileSpec& aTarget, PRInt32 aFlags, PRInt32* aReturn);
 
         PRInt32    ExtractFileFromJar(const nsString& aJarfile, nsFileSpec* aSuggestedName, nsFileSpec** aRealName);
-        char*      GetResourcedString(const nsString& aResName);
         void       AddPatch(nsHashKey *aKey, nsFileSpec* fileName);
-        void       GetPatch(nsHashKey *aKey, nsFileSpec** fileName);
+        void       GetPatch(nsHashKey *aKey, nsFileSpec* fileName);
         
         void       GetJarFileLocation(nsString& aFile);
-        void       SetJarFileLocation(const nsFileSpec& aFile);
+        void       SetJarFileLocation(const nsString& aFile);
 
         void       GetInstallArguments(nsString& args);
         void       SetInstallArguments(const nsString& args);
 
-        void       GetInstallURL(nsString& url);
-        void       SetInstallURL(const nsString& url);
-
-        PRBool     GetStatusSent() { return mStatusSent; }
-        PRBool     InInstallTransaction(void) { return mInstalledFiles != nsnull; }
-        
-        PRInt32    Alert(nsString& string);
-        PRInt32    Confirm(nsString& string, PRBool* aReturn);
-        void       InternalAbort(PRInt32 errcode);
-
-        PRInt32    SaveError(PRInt32 errcode);
 
     private:
         JSObject*           mScriptObject;
         
         JSObject*           mWinRegObject;
         JSObject*           mWinProfileObject;
-
         
-        nsFileSpec          mJarFileLocation;
-        nsIZipReader*       mJarFileData;
+        nsString            mJarFileLocation;
+        void*               mJarFileData;
         
         nsString            mInstallArguments;
-        nsString            mInstallURL;
-        nsInstallFolder*    mPackageFolder;
 
         PRBool              mUserCancelled;
-        PRBool              mStatusSent;
         
         PRBool              mUninstallPackage;
         PRBool              mRegisterPackage;
-        PRBool              mStartInstallCompleted;
 
         nsString            mRegistryPackageName;   /* Name of the package we are installing */
         nsString            mUIName;                /* User-readable package name */
+
         nsInstallVersion*   mVersionInfo;           /* Component version info */
         
-        nsVoidArray*        mInstalledFiles;        
+        nsVector*           mInstalledFiles;        
         nsHashtable*        mPatchList;
         
-        nsIXPINotifier      *mNotifier;
-
-        nsCOMPtr<nsIStringBundle>   mStringBundle;
-
-        PRInt32             mLastError;
+        nsIXPInstallProgress *mNotifier;
         
+        PRInt32             mLastError;
+
         void        ParseFlags(int flags);
         PRInt32     SanityCheck(void);
         void        GetTime(nsString &aString);
@@ -310,14 +249,17 @@ class nsInstall
         
         void        CurrentUserNode(nsString& userRegNode);
         PRBool      BadRegName(const nsString& regName);
+        PRInt32     SaveError(PRInt32 errcode);
 
         void        CleanUp();
 
-        PRInt32     ExtractDirEntries(const nsString& directory, nsVoidArray *paths);
+        PRInt32     OpenJARFile(void);
+        void        CloseJARFile(void);
+        PRInt32     ExtractDirEntries(const nsString& directory, nsVector *paths);
 
         PRInt32     ScheduleForInstall(nsInstallObject* ob);
+        
 
-        static void DeleteVector(nsVoidArray* vector);    
 };
 
 #endif

mozilla/xpinstall/src/nsInstallDelete.cpp

@@ -1,24 +1,24 @@
 /* -*- 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/
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "License"); you 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.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY 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 client code, 
  * released March 31, 1998. 
  *
  * 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.
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  *
- * Contributor(s): 
+ * Contributors:
  *     Daniel Veditz <dveditz@netscape.com>
  *     Douglas Turner <dougt@netscape.com>
  */
@@ -36,18 +36,14 @@
 #include "nsInstall.h"
 #include "nsIDOMInstallVersion.h"
 
-MOZ_DECL_CTOR_COUNTER(nsInstallDelete);
-
 nsInstallDelete::nsInstallDelete( nsInstall* inInstall,
-                                  nsInstallFolder* folderSpec,
+                                  const nsString& folderSpec,
                                   const nsString& inPartialPath,
                                   PRInt32 *error)
 
 : nsInstallObject(inInstall)
 {
-    MOZ_COUNT_CTOR(nsInstallDelete);
-
-    if ((folderSpec == nsnull) || (inInstall == nsnull)) 
+    if ((folderSpec == "null") || (inInstall == NULL)) 
     {
         *error = nsInstall::INVALID_ARGUMENTS;
         return;
@@ -57,20 +53,8 @@ nsInstallDelete::nsInstallDelete( nsInstall* inInstall,
     mFinalFile      = nsnull;
     mRegistryName   = "";
     
-    nsFileSpec* tmp = folderSpec->GetFileSpec();
-    if (!tmp)
-    {
-        *error = nsInstall::INVALID_ARGUMENTS;
-        return;
-    }
 
-    mFinalFile = new nsFileSpec(*tmp);
-    if (mFinalFile == nsnull)
-    {
-        *error = nsInstall::OUT_OF_MEMORY;
-        return;
-    }
-    
+    mFinalFile = new nsFileSpec(folderSpec);
     *mFinalFile += inPartialPath;
 
     *error = ProcessInstallDelete();
@@ -82,8 +66,6 @@ nsInstallDelete::nsInstallDelete( nsInstall* inInstall,
 
 : nsInstallObject(inInstall)
 {
-    MOZ_COUNT_CTOR(nsInstallDelete);
-
     if (inInstall == NULL) 
     {
         *error = nsInstall::INVALID_ARGUMENTS;
@@ -102,8 +84,6 @@ nsInstallDelete::~nsInstallDelete()
 {
     if (mFinalFile == nsnull)
         delete mFinalFile;
-
-    MOZ_COUNT_DTOR(nsInstallDelete);
 }
 
 
@@ -123,11 +103,8 @@ PRInt32 nsInstallDelete::Complete()
     if (mDeleteStatus == DELETE_COMPONENT) 
     {
         char* temp = mRegistryName.ToNewCString();
-        if (temp)
-        {
-            err = VR_Remove(temp);
-            Recycle(temp);
-        }
+        err = VR_Remove(temp);
+        delete [] temp;
     }
 
     if ((mDeleteStatus == DELETE_FILE) || (err == REGERR_OK)) 
@@ -150,36 +127,15 @@ void nsInstallDelete::Abort()
 char* nsInstallDelete::toString()
 {
     char* buffer = new char[1024];
-    char* rsrcVal = nsnull;
     
-    if (buffer == nsnull || !mInstall)
-        return nsnull;
-
     if (mDeleteStatus == DELETE_COMPONENT)
     {
-        char* temp = mRegistryName.ToNewCString();
-        rsrcVal = mInstall->GetResourcedString("DeleteComponent");
-
-        if (rsrcVal)
-        {
-            sprintf( buffer, rsrcVal, temp);
-            nsCRT::free(rsrcVal);
-        }
-        if (temp)
-            Recycle(temp);
+        sprintf( buffer, nsInstallResources::GetDeleteComponentString(), nsAutoCString(mRegistryName));
     }
     else
     {
         if (mFinalFile)
-        {
-            rsrcVal = mInstall->GetResourcedString("DeleteComponent");
-
-            if (rsrcVal)
-            {
-                sprintf( buffer, rsrcVal, mFinalFile->GetCString());
-                nsCRT::free(rsrcVal);
-            }
-        }
+            sprintf( buffer, nsInstallResources::GetDeleteFileString(), mFinalFile->GetCString());
     }
 
     return buffer;
@@ -209,9 +165,6 @@ PRInt32 nsInstallDelete::ProcessInstallDelete()
     {
         /* Check if the component is in the registry */
         tempCString = mRegistryName.ToNewCString();
-        
-        if (tempCString == nsnull)
-                return nsInstall::OUT_OF_MEMORY;
 
         err = VR_InRegistry( tempCString );
                 
@@ -225,9 +178,6 @@ PRInt32 nsInstallDelete::ProcessInstallDelete()
 
             tempRegistryString = (char*)PR_Calloc(MAXREGPATHLEN, sizeof(char));
             
-            if (tempRegistryString == nsnull)
-                return nsInstall::OUT_OF_MEMORY;
-
             err = VR_GetPath( tempCString , MAXREGPATHLEN, tempRegistryString);
             
             if (err == REGERR_OK)
@@ -236,10 +186,6 @@ PRInt32 nsInstallDelete::ProcessInstallDelete()
                     delete mFinalFile;
 
                 mFinalFile = new nsFileSpec(tempRegistryString);
-                
-                if (mFinalFile == nsnull)
-                    return nsInstall::OUT_OF_MEMORY;
-                
             }
 
             PR_FREEIF(tempRegistryString);
@@ -247,7 +193,7 @@ PRInt32 nsInstallDelete::ProcessInstallDelete()
     }
     
     if(tempCString)
-        Recycle(tempCString);
+        delete [] tempCString;
 
     if (mFinalFile->Exists())
     {
@@ -257,12 +203,12 @@ PRInt32 nsInstallDelete::ProcessInstallDelete()
         }
         else
         {
-            err = nsInstall::IS_DIRECTORY;
+            err = nsInstall::FILE_IS_DIRECTORY;
         }
     }
     else
     {
-        err = nsInstall::DOES_NOT_EXIST;
+        err = nsInstall::FILE_DOES_NOT_EXIST;
     }
 
     return err;
@@ -272,7 +218,6 @@ PRInt32 nsInstallDelete::ProcessInstallDelete()
 
 PRInt32 nsInstallDelete::NativeComplete()
 {
-    NS_WARN_IF_FALSE(mFinalFile->Exists(),"nsInstallDelete::Complete -- file should exist!");
     if (mFinalFile->Exists())
     {
         if (mFinalFile->IsFile())
@@ -281,11 +226,10 @@ PRInt32 nsInstallDelete::NativeComplete()
         }
         else
         {
-            NS_ASSERTION(0,"nsInstallDelete::Complete -- expected file was a directory!");
-            return nsInstall::IS_DIRECTORY;
+            return nsInstall::FILE_IS_DIRECTORY;
         }
     }
     
-    return nsInstall::DOES_NOT_EXIST;
+    return nsInstall::FILE_DOES_NOT_EXIST;
 }
 

mozilla/xpinstall/src/nsInstallDelete.h

@@ -1,24 +1,24 @@
 /* -*- 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/
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "License"); you 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.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY 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 client code, 
  * released March 31, 1998. 
  *
  * 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.
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  *
- * Contributor(s): 
+ * Contributors:
  *     Daniel Veditz <dveditz@netscape.com>
  *     Douglas Turner <dougt@netscape.com>
  */
@@ -42,7 +42,7 @@ class nsInstallDelete : public nsInstallObject
     public:
 
         nsInstallDelete(  nsInstall* inInstall,
-                          nsInstallFolder* folderSpec,
+                          const nsString& folderSpec,
                           const nsString& inPartialPath,
                           PRInt32 *error);
 

mozilla/xpinstall/src/nsInstallExecute.cpp

@@ -1,24 +1,24 @@
 /* -*- 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/
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "License"); you 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.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY 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 client code, 
  * released March 31, 1998. 
  *
  * 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.
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  *
- * Contributor(s): 
+ * Contributors:
  *     Daniel Veditz <dveditz@netscape.com>
  *     Douglas Turner <dougt@netscape.com>
  */
@@ -37,8 +37,6 @@
 #include "nsInstall.h"
 #include "nsIDOMInstallVersion.h"
 
-MOZ_DECL_CTOR_COUNTER(nsInstallExecute);
-
 nsInstallExecute:: nsInstallExecute(  nsInstall* inInstall,
                                       const nsString& inJarLocation,
                                       const nsString& inArgs,
@@ -46,9 +44,7 @@ nsInstallExecute:: nsInstallExecute(  nsInstall* inInstall,
 
 : nsInstallObject(inInstall)
 {
-    MOZ_COUNT_CTOR(nsInstallExecute);
-
-    if ((inInstall == nsnull) || (inJarLocation.Equals("")) )
+    if ((inInstall == nsnull) || (inJarLocation == "null"))
     {
         *error = nsInstall::INVALID_ARGUMENTS;
         return;
@@ -65,15 +61,13 @@ nsInstallExecute::~nsInstallExecute()
 {
     if (mExecutableFile)
         delete mExecutableFile;
-
-    MOZ_COUNT_DTOR(nsInstallExecute);
 }
 
 
 
 PRInt32 nsInstallExecute::Prepare()
 {
-    if (mInstall == NULL || mJarLocation.Equals("")) 
+    if (mInstall == NULL || mJarLocation == "null") 
         return nsInstall::INVALID_ARGUMENTS;
 
     return mInstall->ExtractFileFromJar(mJarLocation, nsnull, &mExecutableFile);
@@ -110,38 +104,21 @@ void nsInstallExecute::Abort()
 char* nsInstallExecute::toString()
 {
     char* buffer = new char[1024];
-    char* rsrcVal = nsnull;
-
-    if (buffer == nsnull || !mInstall)
-        return nsnull;
-
+    
     // if the FileSpec is NULL, just us the in jar file name.
 
     if (mExecutableFile == nsnull)
     {
         char *tempString = mJarLocation.ToNewCString();
-        rsrcVal = mInstall->GetResourcedString("Execute");
-
-        if (rsrcVal)
-        {
-            sprintf( buffer, rsrcVal, tempString);
-            nsCRT::free(rsrcVal);
-        }
-        
-        if (tempString)
-            Recycle(tempString);
+        sprintf( buffer, nsInstallResources::GetExecuteString(), tempString);
+        delete [] tempString;
     }
     else
     {
-        rsrcVal = mInstall->GetResourcedString("Execute");
-
-        if (rsrcVal)
-        {
-            sprintf( buffer, rsrcVal, mExecutableFile->GetCString());
-            nsCRT::free(rsrcVal);
-        }
+        sprintf( buffer, nsInstallResources::GetExecuteString(), mExecutableFile->GetCString());
     }
     return buffer;
+
 }
 
 

mozilla/xpinstall/src/nsInstallExecute.h

@@ -1,24 +1,24 @@
 /* -*- 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/
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "License"); you 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.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY 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 client code, 
  * released March 31, 1998. 
  *
  * 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.
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  *
- * Contributor(s): 
+ * Contributors:
  *     Daniel Veditz <dveditz@netscape.com>
  *     Douglas Turner <dougt@netscape.com>
  */

mozilla/xpinstall/src/nsInstallFile.cpp

@@ -1,29 +1,28 @@
 /* -*- 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/
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "License"); you 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.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY 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 client code, 
  * released March 31, 1998. 
  *
  * 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.
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  *
- * Contributor(s): 
+ * Contributors:
  *     Daniel Veditz <dveditz@netscape.com>
  *     Douglas Turner <dougt@netscape.com>
  */
 
-#include "prprf.h"
 #include "nsInstallFile.h"
 #include "nsFileSpec.h"
 #include "VerReg.h"
@@ -42,62 +41,39 @@
         inFinalFileSpec	- final	location on disk
 */
 
-MOZ_DECL_CTOR_COUNTER(nsInstallFile);
 
 nsInstallFile::nsInstallFile(nsInstall* inInstall,
                              const nsString& inComponentName,
                              const nsString& inVInfo,
                              const nsString& inJarLocation,
-                             nsInstallFolder *folderSpec,
+                             const nsString& folderSpec,
                              const nsString& inPartialPath,
-                             PRInt32 mode,
+                             PRBool forceInstall,
                              PRInt32 *error) 
-  : nsInstallObject(inInstall),
-    mVersionInfo(nsnull),
-    mJarLocation(nsnull),
-    mExtractedFile(nsnull),
-    mFinalFile(nsnull),
-    mVersionRegistryName(nsnull),
-    mReplaceFile(PR_FALSE),
-    mChildFile(PR_TRUE),
-    mUpgradeFile(PR_FALSE),
-    mSkipInstall(PR_FALSE),
-    mMode(mode)
+: nsInstallObject(inInstall)
 {
-    MOZ_COUNT_CTOR(nsInstallFile);
+    mVersionRegistryName = nsnull;
+    mJarLocation         = nsnull;
+    mExtracedFile        = nsnull;
+    mFinalFile           = nsnull;
+    mVersionInfo         = nsnull;
 
-    if ((folderSpec == nsnull) || (inInstall == NULL))
+    mUpgradeFile = PR_FALSE;
+    
+    if ((folderSpec == "null") || (inInstall == NULL)) 
     {
         *error = nsInstall::INVALID_ARGUMENTS;
         return;
     }
 
-    *error = nsInstall::SUCCESS;
-    
     /* Check for existence of the newer	version	*/
-#if 0 // XXX need to re-implement force mode in the opposite sense
-
+    
+    PRBool versionNewer = PR_FALSE;  // Is this a newer version
     char* qualifiedRegNameString = inComponentName.ToNewCString();
 
-    // --------------------------------------------------------------------
-    // we always install if forceInstall is true, or the new file's
-    // version is null, or the file doesn't previously exist.
-    //
-    // IFF it's not force, AND the new file has a version, AND it's been
-    // previously installed, THEN we have to do the version comparing foo.
-    // --------------------------------------------------------------------
-    if ( !(mode & INSTALL_NO_COMPARE ) && (inVInfo !=  "") && 
-          ( VR_ValidateComponent( qualifiedRegNameString ) == 0 ) ) 
+    if ( (forceInstall == PR_FALSE ) && (inVInfo !=  "") && ( VR_ValidateComponent( qualifiedRegNameString ) == 0 ) ) 
     {
         nsInstallVersion *newVersion = new nsInstallVersion();
-        
-        if (newVersion == nsnull)
-        {
-            Recycle(qualifiedRegNameString);
-            *error = nsInstall::OUT_OF_MEMORY;
-            return;
-        }
-
         newVersion->Init(inVInfo);
         
         VERSION versionStruct;
@@ -105,14 +81,6 @@ nsInstallFile::nsInstallFile(nsInstall* inInstall,
         VR_GetVersion( qualifiedRegNameString, &versionStruct );
         
         nsInstallVersion* oldVersion = new nsInstallVersion();
-        
-        if (oldVersion == nsnull)
-        {
-            Recycle(qualifiedRegNameString);
-            delete oldVersion;
-            *error = nsInstall::OUT_OF_MEMORY;
-            return;
-        }
 
         oldVersion->Init(versionStruct.major,
                          versionStruct.minor,
@@ -125,81 +93,44 @@ nsInstallFile::nsInstallFile(nsInstall* inInstall,
         delete oldVersion;
         delete newVersion;
 
-        if ( areTheyEqual < 0 )
+        if (areTheyEqual == nsIDOMInstallVersion::MAJOR_DIFF_MINUS ||
+            areTheyEqual == nsIDOMInstallVersion::MINOR_DIFF_MINUS ||
+            areTheyEqual == nsIDOMInstallVersion::REL_DIFF_MINUS   ||
+            areTheyEqual == nsIDOMInstallVersion::BLD_DIFF_MINUS   )
         {
-            // the file to be installed is OLDER than what is on disk.
-            // Don't install it.
-            mSkipInstall = PR_TRUE;
-        }
-    }
-
-    Recycle(qualifiedRegNameString);
-#endif
-
-    nsFileSpec* tmp = folderSpec->GetFileSpec();
-    if (!tmp)
-    {
-        *error = nsInstall::INVALID_ARGUMENTS;
-        return;
-    }
-
-    mFinalFile = new nsFileSpec(*tmp);
-    if (mFinalFile == nsnull)
-    {
-        *error = nsInstall::OUT_OF_MEMORY;
-        return;
-    }
-
-    if ( mFinalFile->Exists() )
-    {
-        // is there a file with the same name as the proposed folder?
-        if ( mFinalFile->IsFile() ) 
-        {
-            *error = nsInstall::FILENAME_ALREADY_USED;
+            // the file to be installed is OLDER than what is on disk.  Return error
+            delete qualifiedRegNameString;
+            *error = areTheyEqual;
             return;
         }
-        // else this directory already exists, so do nothing
-    }
-    else
-    {
-        /* the nsFileSpecMac.cpp operator += requires "this" (the nsFileSpec)
-         * to be an existing dir
-         */
-        int dirPermissions = 0755; // std default for UNIX, ignored otherwise
-        mFinalFile->CreateDir(dirPermissions);
     }
 
+    delete qualifiedRegNameString;
+
+    
+     mFinalFile = new nsFileSpec(folderSpec);
     *mFinalFile += inPartialPath;
     
     mReplaceFile = mFinalFile->Exists();
     
     if (mReplaceFile == PR_FALSE)
     {
-       /* although it appears that we are creating the dir _again_ it is necessary
-        * when inPartialPath has arbitrary levels of nested dirs before the leaf
-        */
         nsFileSpec parent;
         mFinalFile->GetParent(parent);
         nsFileSpec makeDirs(parent.GetCString(), PR_TRUE);
     }
 
+    mForceInstall           = forceInstall;
+    
     mVersionRegistryName    = new nsString(inComponentName);
     mJarLocation            = new nsString(inJarLocation);
     mVersionInfo	        = new nsString(inVInfo);
-     
-    if (mVersionRegistryName == nsnull ||
-        mJarLocation         == nsnull ||
-        mVersionInfo         == nsnull )
-    {
-        *error = nsInstall::OUT_OF_MEMORY;
-        return;
-    }
-
+        
     nsString regPackageName;
     mInstall->GetRegPackageName(regPackageName);
     
     // determine Child status
-    if ( regPackageName.IsEmpty() ) 
+    if ( regPackageName == "" ) 
     {
         // in the "current communicator package" absolute pathnames (start
         // with slash) indicate shared files -- all others are children
@@ -207,9 +138,19 @@ nsInstallFile::nsInstallFile(nsInstall* inInstall,
     } 
     else 
     {
-        mChildFile = mVersionRegistryName->Equals( regPackageName,
-                                                   PR_FALSE,
-                                                   regPackageName.Length() );
+        
+        // there is no "starts with" api in nsString.  LAME!
+        nsString startsWith;
+        mVersionRegistryName->Left(startsWith, regPackageName.Length());
+
+        if (startsWith.Equals(regPackageName))
+        {
+            mChildFile = true;
+        }
+        else
+        {
+            mChildFile = false;
+        }
     }
 }
 
@@ -222,16 +163,14 @@ nsInstallFile::~nsInstallFile()
     if (mJarLocation)
         delete mJarLocation;
   
-    if (mExtractedFile)
-        delete mExtractedFile;
+    if (mExtracedFile)
+        delete mExtracedFile;
 
     if (mFinalFile)
         delete mFinalFile;
   
     if (mVersionInfo)
       delete mVersionInfo;
-
-    MOZ_COUNT_DTOR(nsInstallFile);
 }
 
 /* Prepare
@@ -239,13 +178,10 @@ nsInstallFile::~nsInstallFile()
  */
 PRInt32 nsInstallFile::Prepare()
 {
-    if (mSkipInstall)
-        return nsInstall::SUCCESS;
-
-    if (mInstall == nsnull || mFinalFile == nsnull || mJarLocation == nsnull )
+    if (mInstall == nsnull || mFinalFile == nsnull || mJarLocation == nsnull ) 
         return nsInstall::INVALID_ARGUMENTS;
 
-    return mInstall->ExtractFileFromJar(*mJarLocation, mFinalFile, &mExtractedFile);
+    return mInstall->ExtractFileFromJar(*mJarLocation, mFinalFile, &mExtracedFile);
 }
 
 /* Complete
@@ -261,18 +197,12 @@ PRInt32 nsInstallFile::Complete()
     {
        return nsInstall::INVALID_ARGUMENTS;
     }
-   
-    if (mSkipInstall)
-        return nsInstall::SUCCESS;
 
     err = CompleteFileMove();
     
     if ( 0 == err || nsInstall::REBOOT_NEEDED == err ) 
     {
-        // XXX Don't register individual files for now -- crucial performance
-        // speed up on the Mac, and we'll switch uninstall schemes after beta
-
-        // RegisterInVersionRegistry();
+        err = RegisterInVersionRegistry();
     }
     
     return err;
@@ -281,43 +211,27 @@ PRInt32 nsInstallFile::Complete()
 
 void nsInstallFile::Abort()
 {
-    if (mExtractedFile != nsnull)
-        mExtractedFile->Delete(PR_FALSE);
+    if (mExtracedFile != nsnull)
+        mExtracedFile->Delete(PR_FALSE);
 }
 
-#define RESBUFSIZE 1024
 char* nsInstallFile::toString()
 {
-    char* buffer = new char[RESBUFSIZE];
-    char* rsrcVal = nsnull;
-    const char* fname = nsnull;
-
-    if (buffer == nsnull || !mInstall)
-        return nsnull;
-    else
-        buffer[0] = '\0';
+    char* buffer = new char[1024];
     
-    if (mReplaceFile)
+    if (mFinalFile == nsnull)
     {
-        rsrcVal = mInstall->GetResourcedString("ReplaceFile");
+        sprintf( buffer, nsInstallResources::GetInstallFileString(), nsnull);
     }
-    else if (mSkipInstall)
+    else if (mReplaceFile)
     {
-        rsrcVal = mInstall->GetResourcedString("SkipFile");
+        // we are replacing this file.
+
+        sprintf( buffer, nsInstallResources::GetReplaceFileString(), mFinalFile->GetCString());
     }
     else
     {
-        rsrcVal = mInstall->GetResourcedString("InstallFile");
-    }
-
-    if (rsrcVal)
-    {
-        if (mFinalFile)
-            fname = mFinalFile->GetCString();
-
-        PR_snprintf( buffer, RESBUFSIZE, rsrcVal, fname );
-
-        Recycle(rsrcVal);
+        sprintf( buffer, nsInstallResources::GetInstallFileString(), mFinalFile->GetCString());
     }
 
     return buffer;
@@ -328,19 +242,19 @@ PRInt32 nsInstallFile::CompleteFileMove()
 {
     int result = 0;
     
-    if (mExtractedFile == nsnull) 
+    if (mExtracedFile == nsnull) 
     {
-        return nsInstall::UNEXPECTED_ERROR;
+        return -1;
     }
    	
-    if ( *mExtractedFile == *mFinalFile ) 
+    if ( *mExtracedFile == *mFinalFile ) 
     {
         /* No need to rename, they are the same */
-        result = nsInstall::SUCCESS;
+        result = 0;
     } 
     else 
     {
-        result = ReplaceFileNowOrSchedule(*mExtractedFile, *mFinalFile );
+        result = ReplaceFileNowOrSchedule(*mExtracedFile, *mFinalFile );
     }
 
   return result;  
@@ -359,7 +273,7 @@ nsInstallFile::RegisterInVersionRegistry()
     if (!mChildFile) 
     {
         int found;
-        if (!regPackageName.IsEmpty()) 
+        if (regPackageName != "") 
         {
             found = VR_UninstallFileExistsInList( (char*)(const char*)nsAutoCString(regPackageName) , 
                                                   (char*)(const char*)nsAutoCString(*mVersionRegistryName));
@@ -417,7 +331,7 @@ nsInstallFile::RegisterInVersionRegistry()
     
     if ( !mChildFile && !mUpgradeFile ) 
     {
-        if (!regPackageName.IsEmpty()) 
+        if (regPackageName != "") 
         { 
             VR_UninstallAddFileToList( (char*)(const char*)nsAutoCString(regPackageName), 
                                        (char*)(const char*)nsAutoCString(*mVersionRegistryName));
@@ -438,7 +352,7 @@ nsInstallFile::RegisterInVersionRegistry()
 PRBool
 nsInstallFile::CanUninstall()
 {
-    return PR_TRUE;
+    return TRUE;
 }
 
 /* RegisterPackageNode
@@ -448,5 +362,5 @@ nsInstallFile::CanUninstall()
 PRBool
 nsInstallFile::RegisterPackageNode()
 {
-    return PR_TRUE;
+    return TRUE;
 }

mozilla/xpinstall/src/nsInstallFile.h

@@ -1,24 +1,24 @@
 /* -*- 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/
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "License"); you 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.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY 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 client code, 
  * released March 31, 1998. 
  *
  * 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.
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  *
- * Contributor(s): 
+ * Contributors:
  *     Daniel Veditz <dveditz@netscape.com>
  *     Douglas Turner <dougt@netscape.com>
  */
@@ -35,13 +35,6 @@
 #include "nsInstall.h"
 #include "nsInstallVersion.h"
 
-
-/* Global defines for file handling mode bitfield values */
-#define INSTALL_NO_COMPARE        0x1
-#define INSTALL_IF_NEWER          0x2
-#define INSTALL_IF_EQUAL_OR_NEWER 0x4
-
-
 class nsInstallFile : public nsInstallObject 
 {
     public:
@@ -60,9 +53,9 @@ class nsInstallFile : public nsInstallObject
                         const nsString& inVRName,
                         const nsString& inVInfo,
                         const nsString& inJarLocation,
-                        nsInstallFolder *folderSpec,
+                        const nsString& folderSpec,
                         const nsString& inPartialPath,
-                        PRInt32 mode,
+                        PRBool forceInstall,
                         PRInt32 *error);
 
         virtual ~nsInstallFile();
@@ -74,32 +67,27 @@ class nsInstallFile : public nsInstallObject
 
         PRBool CanUninstall();
         PRBool RegisterPackageNode();
-
-
+	  
+  
     private:
 
         /* Private Fields */
         nsString*     mVersionInfo;	  /* Version info for this file*/
         
         nsString*     mJarLocation;	      /* Location in the JAR */
-        nsFileSpec*   mExtractedFile;	  /* temporary file location */
+        nsFileSpec*   mExtracedFile;	  /* temporary file location */
         nsFileSpec*   mFinalFile;	      /* final file destination */
 
         nsString*   mVersionRegistryName; /* full version path */
-
+        
         PRBool      mForceInstall;   /* whether install is forced */
         PRBool      mReplaceFile;    /* whether file exists */
         PRBool      mChildFile;      /* whether file is a child */
         PRBool      mUpgradeFile;    /* whether file is an upgrade */
-        PRBool      mSkipInstall;    /* if true don't install this file */
-        
-        PRInt32    mMode;            /* an integer used like a bitfield to control *
-                                      * how a file is installed or registered      */
+
 
         PRInt32     CompleteFileMove();
         PRInt32     RegisterInVersionRegistry();
-    
-
 };
 
 #endif /* nsInstallFile_h__ */

mozilla/xpinstall/src/nsInstallFileOpEnums.h

@@ -1,41 +1,37 @@
 /* -*- 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/
+ * 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 License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
+ * Software distributed under the 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 Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
+ * 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.
- *
- * Contributor(s): 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  */
 
 #ifndef nsInstallFileOpEnums_h__
 #define nsInstallFileOpEnums_h__
 
 typedef enum nsInstallFileOpEnums {
-  NS_FOP_DIR_CREATE         = 0,
-  NS_FOP_DIR_REMOVE         = 1,
-  NS_FOP_DIR_RENAME         = 2,
-  NS_FOP_FILE_COPY          = 3,
-  NS_FOP_FILE_DELETE        = 4,
-  NS_FOP_FILE_EXECUTE       = 5,
-  NS_FOP_FILE_MOVE          = 6,
-  NS_FOP_FILE_RENAME        = 7,
-  NS_FOP_WIN_SHORTCUT       = 8,
-  NS_FOP_MAC_ALIAS          = 9,
-  NS_FOP_UNIX_LINK          = 10,
-  NS_FOP_FILE_SET_STAT      = 11
+  NS_FOP_DIR_CREATE = 0,
+  NS_FOP_DIR_REMOVE = 1,
+  NS_FOP_DIR_RENAME = 2,
+  NS_FOP_FILE_COPY = 3,
+  NS_FOP_FILE_DELETE = 4,
+  NS_FOP_FILE_EXECUTE = 5,
+  NS_FOP_FILE_MOVE = 6,
+  NS_FOP_FILE_RENAME = 7,
+  NS_FOP_WIN_SHORTCUT_CREATE = 8,
+  NS_FOP_MAC_ALIAS_CREATE = 9,
+  NS_FOP_UNIX_LINK_CREATE = 10,
+  NS_FOP_FILE_SET_STAT = 11
 
 } nsInstallFileOpEnums;
 

mozilla/xpinstall/src/nsInstallFileOpItem.h

@@ -1,23 +1,19 @@
 /* -*- 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/
+ * 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 License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
+ * Software distributed under the 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 Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
+ * 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.
- *
- * Contributor(s): 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  */
 
 #ifndef nsInstallFileOpItem_h__
@@ -34,13 +30,6 @@ class nsInstallFileOpItem : public nsInstallObject
 {
   public:
     /* Public Fields */
-    enum 
-    {
-      ACTION_NONE                 = -401,
-      ACTION_SUCCESS              = -402,
-      ACTION_FAILED               = -403
-    };
-
 
     /* Public Methods */
     // used by:
@@ -53,9 +42,10 @@ class nsInstallFileOpItem : public nsInstallObject
 
     // used by:
     //   FileOpDirRemove()
+    //   FileOpDirRename()
     //   FileOpFileCopy()
     //   FileOpFileMove()
-    //   FileMacAlias()
+    //   FileOpFileRename()
     nsInstallFileOpItem(nsInstall*    installObj,
                         PRInt32       aCommand,
                         nsFileSpec&   aSrc,
@@ -70,34 +60,20 @@ class nsInstallFileOpItem : public nsInstallObject
                         PRInt32*      aReturn);
 
     // used by:
-    //   FileOpDirRename()
     //   FileOpFileExecute()
-    //   FileOpFileRename()
     nsInstallFileOpItem(nsInstall*    aInstallObj,
                         PRInt32       aCommand,
-                        nsFileSpec&   a1,
-                        nsString&     a2,
+                        nsFileSpec&   aTarget,
+                        nsString&     aParams,
                         PRInt32*      aReturn);
 
-    // used by:
-    //   WindowsShortcut()
-    nsInstallFileOpItem(nsInstall*     aInstallObj,
-                        PRInt32        aCommand,
-                        nsFileSpec&    aTarget,
-                        nsFileSpec&    aShortcutPath,
-                        nsString&      aDescription,
-                        nsFileSpec&    aWorkingPath,
-                        nsString&      aParams,
-                        nsFileSpec&    aIcon,
-                        PRInt32        aIconId,
-                        PRInt32*       aReturn);
-
-    virtual ~nsInstallFileOpItem();
+    ~nsInstallFileOpItem();
 
     PRInt32       Prepare(void);
     PRInt32       Complete();
     char*         toString();
     void          Abort();
+    float         GetInstallOrder();
     
   /* should these be protected? */
     PRBool        CanUninstall();
@@ -110,45 +86,24 @@ class nsInstallFileOpItem : public nsInstallObject
     nsInstall*    mIObj;        // initiating Install object
     nsFileSpec*   mSrc;
     nsFileSpec*   mTarget;
-    nsFileSpec*   mShortcutPath;
-    nsFileSpec*   mWorkingPath;
-    nsFileSpec*   mIcon;
-    nsString*     mDescription;
-    nsString*     mStrTarget;
     nsString*     mParams;
     long          mFStat;
     PRInt32       mFlags;
-    PRInt32       mIconId;
     PRInt32       mCommand;
-    PRInt32       mAction;
     
     /* Private Methods */
 
-    PRInt32       NativeFileOpDirCreatePrepare();
-    PRInt32       NativeFileOpDirCreateAbort();
-    PRInt32       NativeFileOpDirRemovePrepare();
-    PRInt32       NativeFileOpDirRemoveComplete();
-    PRInt32       NativeFileOpDirRenamePrepare();
-    PRInt32       NativeFileOpDirRenameComplete();
-    PRInt32       NativeFileOpDirRenameAbort();
-    PRInt32       NativeFileOpFileCopyPrepare();
-    PRInt32       NativeFileOpFileCopyComplete();
-    PRInt32       NativeFileOpFileCopyAbort();
-    PRInt32       NativeFileOpFileDeletePrepare();
-    PRInt32       NativeFileOpFileDeleteComplete(nsFileSpec *aTarget);
-    PRInt32       NativeFileOpFileExecutePrepare();
-    PRInt32       NativeFileOpFileExecuteComplete();
-    PRInt32       NativeFileOpFileMovePrepare();
-    PRInt32       NativeFileOpFileMoveComplete();
-    PRInt32       NativeFileOpFileMoveAbort();
-    PRInt32       NativeFileOpFileRenamePrepare();
-    PRInt32       NativeFileOpFileRenameComplete();
-    PRInt32       NativeFileOpFileRenameAbort();
-    PRInt32       NativeFileOpWindowsShortcutComplete();
-    PRInt32       NativeFileOpWindowsShortcutAbort();
-    PRInt32       NativeFileOpMacAliasComplete();
-    PRInt32       NativeFileOpMacAliasAbort();
-    PRInt32       NativeFileOpUnixLink();
+    PRInt32       NativeFileOpDirCreate(nsFileSpec* aTarget);
+    PRInt32       NativeFileOpDirRemove(nsFileSpec* aTarget, PRInt32 aFlags);
+    PRInt32       NativeFileOpDirRename(nsFileSpec* aSrc, nsFileSpec* aTarget);
+    PRInt32       NativeFileOpFileCopy(nsFileSpec* aSrc, nsFileSpec* aTarget);
+    PRInt32       NativeFileOpFileDelete(nsFileSpec* aTarget, PRInt32 aFlags);
+    PRInt32       NativeFileOpFileExecute(nsFileSpec* aTarget, nsString* aParams);
+    PRInt32       NativeFileOpFileMove(nsFileSpec* aSrc, nsFileSpec* aTarget);
+    PRInt32       NativeFileOpFileRename(nsFileSpec* aSrc, nsFileSpec* aTarget);
+    PRInt32       NativeFileOpWinShortcutCreate();
+    PRInt32       NativeFileOpMacAliasCreate();
+    PRInt32       NativeFileOpUnixLinkCreate();
 
 };
 

mozilla/xpinstall/src/nsInstallFolder.cpp

@@ -1,24 +1,24 @@
 /* -*- 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/
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "License"); you 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.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY 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 client code, 
  * released March 31, 1998. 
  *
  * 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.
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  *
- * Contributor(s): 
+ * Contributors:
  *     Daniel Veditz <dveditz@netscape.com>
  *     Douglas Turner <dougt@netscape.com>
  */
@@ -32,7 +32,6 @@
 
 #include "nsString.h"
 #include "nsFileSpec.h"
-#include "nsIFileSpec.h"
 #include "nsSpecialSystemDirectory.h"
 
 #include "nsFileLocations.h"
@@ -82,69 +81,36 @@ struct DirectoryTable DirectoryTable[] =
 };
 
 
-MOZ_DECL_CTOR_COUNTER(nsInstallFolder);
 
 nsInstallFolder::nsInstallFolder(const nsString& aFolderID)
 {
-    nsInstallFolder( aFolderID, "" );
+    mFileSpec = nsnull;
+    SetDirectoryPath( aFolderID, "");
 }
 
 nsInstallFolder::nsInstallFolder(const nsString& aFolderID, const nsString& aRelativePath)
 {
-    MOZ_COUNT_CTOR(nsInstallFolder);
-
     mFileSpec = nsnull;
 
     /*
-        aFolderID can be either a Folder enum in which case we merely pass it
-        to SetDirectoryPath, or it can be a Directory.  If it is the later, it
-        must already exist and of course be a directory not a file.  
+        aFolderID can be either a Folder enum in which case we merely pass it to SetDirectoryPath, or
+        it can be a Directory.  If it is the later, it must already exist and of course be a directory
+        not a file.  
     */
-
-    SetDirectoryPath( aFolderID, aRelativePath );
-
-    // check to see if that worked
-    if ( !mFileSpec )
+    
+    nsFileSpec dirCheck(aFolderID);
+    if ( (dirCheck.Error() == NS_OK) && (dirCheck.IsDirectory()) && (dirCheck.Exists()))
     {
-        // it didn't, so aFolderID is not one of the magic strings.
-        // maybe it's already a pathname? If so it had better be a directory
-        // if it already exists...
-        nsFileSpec dirCheck(aFolderID);
-        if ( (dirCheck.Error() == NS_OK) && 
-             ( dirCheck.IsDirectory() || !dirCheck.Exists() ) )
-        {
-            mFileSpec = new nsFileSpec( dirCheck );
+        nsString tempString = aFolderID;
+        tempString += aRelativePath;
+        mFileSpec = new nsFileSpec(tempString);
 
-            if (mFileSpec && aRelativePath.Length() > 0 )
-            {
-                // we've got a subdirectory to tack on
-                nsString morePath(aRelativePath);
-
-                if ( morePath.Last() != '/' || morePath.Last() != '\\' )
-                    morePath += '/';
-
-                *mFileSpec += morePath;
-            }
-
-            // make sure that the directory is created. 
-            // XXX: **why** are we creating these? they might not be used!
-            nsFileSpec(mFileSpec->GetCString(), PR_TRUE);
-        }
+        // make sure that the directory is created.
+        nsFileSpec(mFileSpec->GetCString(), PR_TRUE);
     }
-}
-
-
-nsInstallFolder::nsInstallFolder(nsInstallFolder& inFolder, const nsString& subString)
-{
-    MOZ_COUNT_CTOR(nsInstallFolder);
-
-    mFileSpec = new nsFileSpec();
-    if (mFileSpec != nsnull)
+    else
     {
-        *mFileSpec = *inFolder.mFileSpec;
-
-        if (!subString.IsEmpty())
-            *mFileSpec += subString;
+        SetDirectoryPath( aFolderID, aRelativePath);
     }
 }
 
@@ -153,10 +119,8 @@ nsInstallFolder::~nsInstallFolder()
 {
     if (mFileSpec != nsnull)
         delete mFileSpec;
-
-    MOZ_COUNT_DTOR(nsInstallFolder);
 }
-
+        
 void 
 nsInstallFolder::GetDirectoryPath(nsString& aDirectoryPath)
 {
@@ -165,13 +129,7 @@ nsInstallFolder::GetDirectoryPath(nsString& aDirectoryPath)
     if (mFileSpec != nsnull)
     {
         // We want the a NATIVE path.
-       aDirectoryPath.Assign(mFileSpec->GetCString());
-
-       if (mFileSpec->IsDirectory())
-       {
-          if (aDirectoryPath.Last() != FILESEP)
-              aDirectoryPath.Append(FILESEP);
-       }
+       aDirectoryPath.SetString(mFileSpec->GetCString());
     }
 }
 
@@ -185,61 +143,27 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe
     }
     else if ( aFolderID.EqualsIgnoreCase("Installed") )
     {   
-        // XXX block from users or remove "Installed"
-        // XXX the filespec creation will fail due to unix slashes on Mac
         mFileSpec = new nsFileSpec(aRelativePath, PR_TRUE);  // creates the directories to the relative path.
         return;
     }
     else
     {
-        nsresult rv = NS_OK;
         PRInt32 folderDirSpecID = MapNameToEnum(aFolderID);
         
         switch (folderDirSpecID) 
 		{
             case 100: ///////////////////////////////////////////////////////////  Plugins
-                if (!nsSoftwareUpdate::GetProgramDirectory())
-                {
-                    SetAppShellDirectory(nsSpecialFileSpec::App_PluginsDirectory );
-                }
-                else
-                {
-                    mFileSpec = new nsFileSpec();
-                    if ( !mFileSpec )
-                        rv = NS_ERROR_OUT_OF_MEMORY;
-                    else
-                        rv = nsSoftwareUpdate::GetProgramDirectory()->GetFileSpec(mFileSpec);
-
-                    if (NS_SUCCEEDED(rv))
-                    {
-#ifdef XP_MAC
-                        *mFileSpec += "Plugins";
-#else
-                        *mFileSpec += "plugins";
-#endif
-                    }
-                    else
-                        mFileSpec = nsnull;
-                }
+                SetAppShellDirectory(nsSpecialFileSpec::App_PluginsDirectory );
                 break; 
 
             case 101: ///////////////////////////////////////////////////////////  Program
-            case 102: ///////////////////////////////////////////////////////////  Communicator
-                if (!nsSoftwareUpdate::GetProgramDirectory())
-                    mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::OS_CurrentProcessDirectory ));
-                else
-                {
-                    mFileSpec = new nsFileSpec();
-                    if ( !mFileSpec )
-                        rv = NS_ERROR_OUT_OF_MEMORY;
-                    else
-                        rv = nsSoftwareUpdate::GetProgramDirectory()->GetFileSpec(mFileSpec);
-
-                    if (!NS_SUCCEEDED(rv))
-                        mFileSpec = nsnull;
-                }
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::OS_CurrentProcessDirectory ));
                 break;
             
+            case 102: ///////////////////////////////////////////////////////////  Communicator
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::OS_CurrentProcessDirectory ));
+                break;
+
             case 103: ///////////////////////////////////////////////////////////  User Pick
                 // we should never be here.
                 mFileSpec = nsnull;
@@ -268,68 +192,18 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe
 
             case 109: ///////////////////////////////////////////////////////////  File URL
                 {
-                    if (aRelativePath.IsEmpty())
-                    {
-                        mFileSpec = nsnull;
-                        return;
-                    }
-
                     nsString tempFileURLString = aFolderID;
                     tempFileURLString += aRelativePath;
                     mFileSpec = new nsFileSpec( nsFileURL(tempFileURLString) );
-
-                    // file:// is a special case where it returns and does not
-                    // go to the standard relative path code below.  This is
-                    // so that nsFile(Spec|Path) will work properly.  (ie. Passing
-                    // just "file://" to the nsFileSpec && nsFileURL is wrong).
-
-                    return;
-
                 }
                 break;
 
             case 110: ///////////////////////////////////////////////////////////  Components
-                if (!nsSoftwareUpdate::GetProgramDirectory())
-                    SetAppShellDirectory(nsSpecialFileSpec::App_ComponentsDirectory );
-                else
-                {
-                    mFileSpec = new nsFileSpec();
-                    if ( !mFileSpec )
-                        rv = NS_ERROR_OUT_OF_MEMORY;
-                    else
-                        rv = nsSoftwareUpdate::GetProgramDirectory()->GetFileSpec(mFileSpec);
-
-                    if (NS_SUCCEEDED(rv))
-                    {
-#ifdef XP_MAC
-                        *mFileSpec += "Components";
-#else
-                        *mFileSpec += "components";
-#endif
-                    }
-                }
+                SetAppShellDirectory(nsSpecialFileSpec::App_ComponentsDirectory );
                 break;
             
             case 111: ///////////////////////////////////////////////////////////  Chrome
-                if (!nsSoftwareUpdate::GetProgramDirectory())
-                    SetAppShellDirectory(nsSpecialFileSpec::App_ChromeDirectory );
-                else
-                {
-                    mFileSpec = new nsFileSpec();
-                    if ( !mFileSpec )
-                        rv = NS_ERROR_OUT_OF_MEMORY;
-                    else
-                        rv = nsSoftwareUpdate::GetProgramDirectory()->GetFileSpec(mFileSpec);
-
-                    if (NS_SUCCEEDED(rv))
-                    {
-#ifdef XP_MAC
-                        *mFileSpec += "Chrome";
-#else
-                        *mFileSpec += "chrome";
-#endif
-                    }
-                }
+                SetAppShellDirectory(nsSpecialFileSpec::App_ChromeDirectory );
                 break;
 
             case 200: ///////////////////////////////////////////////////////////  Win System
@@ -357,7 +231,7 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe
                 break;
 
             case 304: ///////////////////////////////////////////////////////////  Mac Shutdown
-                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_ShutdownDirectory ));
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_StartupDirectory ));
                 break;
 
             case 305: ///////////////////////////////////////////////////////////  Mac Apple Menu
@@ -398,8 +272,8 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe
                 mFileSpec = nsnull;
 			   return;
 		}
-
-        if (aRelativePath.Length() > 0 && mFileSpec)
+#ifndef XP_MAC
+        if (aRelativePath.Length() > 0)
         {
             nsString tempPath(aRelativePath);
 
@@ -408,6 +282,9 @@ nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRe
 
             *mFileSpec += tempPath;
         }
+#endif
+            // make sure that the directory is created.
+        nsFileSpec(mFileSpec->GetCString(), PR_TRUE);
     }
 }
 
@@ -424,7 +301,7 @@ nsInstallFolder::MapNameToEnum(const nsString& name)
 {
 	int i = 0;
 
-	if ( name.Equals(""))
+	if ( name == "null")
         return -1;
 
 	while ( DirectoryTable[i].directoryName[0] != 0 )
@@ -436,32 +313,24 @@ nsInstallFolder::MapNameToEnum(const nsString& name)
 	return -1;
 }
 
+
+static NS_DEFINE_IID(kFileLocatorIID, NS_IFILELOCATOR_IID);
+static NS_DEFINE_IID(kFileLocatorCID, NS_FILELOCATOR_CID);
+
 void
 nsInstallFolder::SetAppShellDirectory(PRUint32 value)
 {
-    nsIFileSpec* fs = NS_LocateFileOrDirectory(value);
-    if ( fs )
+    nsIFileLocator * appShellLocator;
+    
+    nsresult rv = nsComponentManager::CreateInstance(kFileLocatorCID, 
+                                                     nsnull,
+                                                     kFileLocatorIID,
+                                                     (void**) &appShellLocator);
+
+    if ( NS_SUCCEEDED(rv) )
     {
         mFileSpec = new nsFileSpec();
-        fs->GetFileSpec(mFileSpec);
-	    NS_RELEASE(fs);
+        appShellLocator->GetFileLocation(value, mFileSpec);
+        NS_RELEASE(appShellLocator);
     }
-}
-
-nsFileSpec*
-nsInstallFolder::GetFileSpec()
-{
-  if (mFileSpec == nsnull)
-    return nsnull;
-  return mFileSpec;
-}
-
-PRInt32
-nsInstallFolder::ToString(nsAutoString* outString)
-{
-  //XXX: May need to fix. Native charset paths will be converted into Unicode when the get to JS
-  //     This will appear to work on Latin-1 charsets but won't work on Mac or other charsets.
-
-  *outString = mFileSpec->GetCString();
-  return NS_OK;
-}
+}

mozilla/xpinstall/src/nsInstallFolder.h

@@ -1,24 +1,24 @@
 /* -*- 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/
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "License"); you 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.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY 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 client code, 
  * released March 31, 1998. 
  *
  * 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.
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  *
- * Contributor(s): 
+ * Contributors:
  *     Daniel Veditz <dveditz@netscape.com>
  *     Douglas Turner <dougt@netscape.com>
  */
@@ -39,23 +39,20 @@ class nsInstallFolder
     public:
         
        nsInstallFolder(const nsString& aFolderID);
-       nsInstallFolder(nsInstallFolder& inFolder, const nsString& subString);
        nsInstallFolder(const nsString& aFolderID, const nsString& aRelativePath);
        virtual ~nsInstallFolder();
 
        void GetDirectoryPath(nsString& aDirectoryPath);
-       nsFileSpec* GetFileSpec();
-       PRInt32 ToString(nsAutoString* outString);
        
     private:
         
         nsFileSpec*  mFileSpec;
 
-        void         SetDirectoryPath(const nsString& aFolderID, const nsString& aRelativePath);
+		void         SetDirectoryPath(const nsString& aFolderID, const nsString& aRelativePath);
         void         PickDefaultDirectory();
         PRInt32      MapNameToEnum(const nsString&  name);
         void         SetAppShellDirectory(PRUint32 value);
 };
 
 
-#endif
+#endif

mozilla/xpinstall/src/nsInstallObject.h

@@ -1,23 +1,19 @@
 /* -*- 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/
+ * 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 License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
+ * Software distributed under the 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 Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
+ * 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.
- *
- * Contributor(s): 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  */
 
 #ifndef nsInstallObject_h__
@@ -32,7 +28,6 @@ class nsInstallObject
     public:
         /* Public Methods */
         nsInstallObject(nsInstall* inInstall) {mInstall = inInstall; }
-        virtual ~nsInstallObject() {}
 
         /* Override with your set-up action */
         virtual PRInt32 Prepare() = 0;

mozilla/xpinstall/src/nsInstallPatch.cpp

@@ -1,23 +1,19 @@
 /* -*- 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/
+ * 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 License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
+ * Software distributed under the 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 Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
+ * 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.
- *
- * Contributor(s): 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  */
 
 #include "nsFileSpec.h"
@@ -33,7 +29,8 @@
 #include "VerReg.h"
 #include "ScheduledTasks.h"
 #include "plstr.h"
-#include "prlog.h"
+#include "xp_file.h" /* for XP_PlatformFileToURL */
+
 
 #ifdef XP_MAC
 #include "PatchableAppleSingle.h"
@@ -61,11 +58,7 @@ static int32   gdiff_getdiff( pDIFFDATA dd, uchar *buffer, uint32 length );
 static int32   gdiff_add( pDIFFDATA dd, uint32 count );
 static int32   gdiff_copy( pDIFFDATA dd, uint32 position, uint32 count );
 static int32   gdiff_validateFile( pDIFFDATA dd, int file );
-#ifdef WIN32
-static PRBool  su_unbind(char* oldsrc, char* newsrc);
-#endif
 
-MOZ_DECL_CTOR_COUNTER(nsInstallPatch);
 
 nsInstallPatch::nsInstallPatch( nsInstall* inInstall,
                                 const nsString& inVRName,
@@ -75,14 +68,12 @@ nsInstallPatch::nsInstallPatch( nsInstall* inInstall,
 
 : nsInstallObject(inInstall)
 {
-    MOZ_COUNT_CTOR(nsInstallPatch);
-
     char tempTargetFile[MAXREGPATHLEN];
     char* tempVersionString = inVRName.ToNewCString();
 
     PRInt32 err = VR_GetPath(tempVersionString, MAXREGPATHLEN, tempTargetFile );
     
-    Recycle(tempVersionString);
+    delete [] tempVersionString;
     
     if (err != REGERR_OK)
     {
@@ -97,18 +88,11 @@ nsInstallPatch::nsInstallPatch( nsInstall* inInstall,
     mRegistryName   =   new nsString(inVRName);
     mJarLocation    =   new nsString(inJarLocation);
     mTargetFile     =   new nsFileSpec(folderSpec);
+    
     mVersionInfo    =   new nsInstallVersion();
     
-    if (mRegistryName == nsnull ||
-        mJarLocation  == nsnull ||
-        mTargetFile   == nsnull ||
-        mVersionInfo  == nsnull )
-    {
-        *error = nsInstall::OUT_OF_MEMORY;
-        return;
-    }
-
     mVersionInfo->Init(inVInfo);
+    
 }
 
 
@@ -116,48 +100,29 @@ nsInstallPatch::nsInstallPatch( nsInstall* inInstall,
                                 const nsString& inVRName,
                                 const nsString& inVInfo,
                                 const nsString& inJarLocation,
-                                nsInstallFolder* folderSpec,
+                                const nsString& folderSpec,
                                 const nsString& inPartialPath,
                                 PRInt32 *error)
 
 : nsInstallObject(inInstall)
 {
-    MOZ_COUNT_CTOR(nsInstallPatch);
-
-    if ((inInstall == nsnull) || (inVRName.Equals("")) || (inJarLocation.Equals(""))) 
+    if ((inInstall == nsnull) || (inVRName == "null") || (inJarLocation == "null")) 
     {
         *error = nsInstall::INVALID_ARGUMENTS;
         return;
     }
     
-    nsFileSpec* tmp = folderSpec->GetFileSpec();
-    if (!tmp)
-    {
-        *error = nsInstall::INVALID_ARGUMENTS;
-        return;
-    }
-
     mPatchFile      =   nsnull;
     mTargetFile     =   nsnull;
     mPatchedFile    =   nsnull;
     mRegistryName   =   new nsString(inVRName);
     mJarLocation    =   new nsString(inJarLocation);
     mVersionInfo    =   new nsInstallVersion();
-    mTargetFile     =   new nsFileSpec(*tmp);
-
-    if (mRegistryName == nsnull ||
-        mJarLocation  == nsnull ||
-        mTargetFile   == nsnull ||
-        mVersionInfo  == nsnull )
-    {
-        *error = nsInstall::OUT_OF_MEMORY;
-        return;
-    }
     
     mVersionInfo->Init(inVInfo);
     
-    
-    if(! inPartialPath.Equals(""))
+    mTargetFile = new nsFileSpec(folderSpec);
+    if(inPartialPath != "null")
         *mTargetFile += inPartialPath;
 }
 
@@ -181,7 +146,6 @@ nsInstallPatch::~nsInstallPatch()
     if (mPatchFile)
         delete mPatchFile;
 
-    MOZ_COUNT_DTOR(nsInstallPatch);
 }
 
 
@@ -201,12 +165,12 @@ PRInt32 nsInstallPatch::Prepare()
         }
         else
         {
-            err = nsInstall::IS_DIRECTORY;
+            err = nsInstall::FILE_IS_DIRECTORY;
         }
     }
     else
     {
-        err = nsInstall::DOES_NOT_EXIST;
+        err = nsInstall::FILE_DOES_NOT_EXIST;
     }
 
     if (err != nsInstall::SUCCESS)
@@ -220,7 +184,7 @@ PRInt32 nsInstallPatch::Prepare()
     nsFileSpec *fileName = nsnull;
     nsVoidKey ikey( HashFilePath( nsFilePath(*mTargetFile) ) );
     
-    mInstall->GetPatch(&ikey, &fileName);
+    mInstall->GetPatch(&ikey, fileName);
 
     if (fileName != nsnull) 
     {
@@ -236,21 +200,9 @@ PRInt32 nsInstallPatch::Prepare()
                         *mPatchFile,         // the patch that was extracted from the jarfile
                         &mPatchedFile);     // the new patched file
     
-    // clean up extracted diff data file
-    if ( (mPatchFile != nsnull) && (mPatchFile->Exists()) )
-    {
-        mPatchFile->Delete(PR_FALSE);
-    }
-
-
     if (err != nsInstall::SUCCESS)
     {   
-        // clean up tmp patched file since patching failed
-		if ((mPatchedFile != nsnull) && (mPatchedFile->Exists()))
-        {
-			mPatchedFile->Delete(PR_FALSE);
-        }
-		return err;
+        return err;
     }
 
     PR_ASSERT(mPatchedFile != nsnull);
@@ -276,16 +228,12 @@ PRInt32 nsInstallPatch::Complete()
     nsFileSpec *fileName = nsnull;
     nsVoidKey ikey( HashFilePath( nsFilePath(*mTargetFile) )  );
     
-    mInstall->GetPatch(&ikey, &fileName);
+    mInstall->GetPatch(&ikey, fileName);
     
-    if (fileName == nsnull)
-    {
-        err = nsInstall::UNEXPECTED_ERROR;
-    }
-    else if (*fileName == *mPatchedFile) 
+    if (fileName != nsnull && (*fileName == *mPatchedFile) )
     {
         // the patch has not been superceded--do final replacement
-        err = ReplaceFileNowOrSchedule( *mPatchedFile, *mTargetFile);
+		err = ReplaceFileNowOrSchedule( *mTargetFile, *mPatchedFile);
         if ( 0 == err || nsInstall::REBOOT_NEEDED == err ) 
         {
             nsString tempVersionString;
@@ -294,16 +242,13 @@ PRInt32 nsInstallPatch::Complete()
             char* tempRegName = mRegistryName->ToNewCString();
             char* tempVersion = tempVersionString.ToNewCString();
 
-            // DO NOT propogate version registry errors, it will abort 
-            // FinalizeInstall() leaving things hosed. These piddly errors
-            // aren't worth that.
-            VR_Install( tempRegName, 
-                        (char*)(const char *)mTargetFile->GetNativePathCString(),
-                        tempVersion, 
-                        PR_FALSE );
+            err = VR_Install( tempRegName, 
+							  (char*) (const char *) nsNSPRPath(*mTargetFile),
+                              tempVersion, 
+                              PR_FALSE );
             
-            if (tempRegName) Recycle(tempRegName);
-            if (tempVersion) Recycle(tempVersion);
+            delete [] tempRegName;
+            delete [] tempVersion;
 
         }
         else
@@ -325,7 +270,7 @@ void nsInstallPatch::Abort()
     nsFileSpec *fileName = nsnull;
     nsVoidKey ikey( HashFilePath( nsFilePath(*mTargetFile) ) );
 
-    mInstall->GetPatch(&ikey, &fileName);
+    mInstall->GetPatch(&ikey, fileName);
 
     if (fileName != nsnull && (*fileName == *mPatchedFile) )
     {
@@ -336,21 +281,8 @@ void nsInstallPatch::Abort()
 char* nsInstallPatch::toString()
 {
 	char* buffer = new char[1024];
-    char* rsrcVal = nsnull;
 
-    if (buffer == nsnull || !mInstall)
-        return buffer;
-
-    if (mTargetFile != nsnull)
-    {
-        rsrcVal = mInstall->GetResourcedString("Patch");
-
-        if (rsrcVal)
-        {
-            sprintf( buffer, rsrcVal, mTargetFile->GetCString()); 
-            nsCRT::free(rsrcVal);
-        }
-    }
+	// FIX!  sprintf( buffer, nsInstallResources::GetPatchFileString(), mPatchedFile->GetCString());
 
 	return buffer;
 }
@@ -365,7 +297,7 @@ nsInstallPatch::CanUninstall()
 PRBool
 nsInstallPatch::RegisterPackageNode()
 {
-    return PR_TRUE;
+    return PR_FALSE;
 }
 
 
@@ -377,15 +309,7 @@ nsInstallPatch::NativePatch(const nsFileSpec &sourceFile, const nsFileSpec &patc
 	PRInt32		status		= GDIFF_ERR_MEM;
 	char 		*tmpurl		= NULL;
 	char 		*realfile	= PL_strdup(nsNSPRPath(sourceFile)); // needs to be sourceFile!!!
-	nsFileSpec  *outFileSpec = new nsFileSpec; 
-    nsFileSpec  *tempSrcFile = new nsFileSpec;   // TODO: do you need to free?
-    
-    if (!outFileSpec) {
-        status = GDIFF_ERR_MEM;
-        goto cleanup;
-    }
-    
-    *outFileSpec = sourceFile;
+	nsFileSpec  outFileSpec = sourceFile;
 
 	dd = (DIFFDATA *)PR_Calloc( 1, sizeof(DIFFDATA));
 	if (dd != NULL)
@@ -411,50 +335,41 @@ nsInstallPatch::NativePatch(const nsFileSpec &sourceFile, const nsFileSpec &patc
 			status = GDIFF_ERR_ACCESS;
 		}
 
-
-        // in case we need to unbind Win32 images OR encode Mac file
-        if (( dd->bWin32BoundImage || dd->bMacAppleSingle) && (status == GDIFF_OK ))
-        {
-            // make an unique tmp file  (FILENAME-src.EXT)
-            *tempSrcFile = sourceFile;
-            nsString tmpName = "-src";
-		    nsString tmpFileName = sourceFile.GetLeafName();
-
-            PRInt32 i;
-		    if ((i = tmpFileName.RFindChar('.')) > 0)
-		    {
-                nsString ext;
-                nsString fName;
-                tmpFileName.Right(ext, (tmpFileName.Length() - i) );        
-                tmpFileName.Left(fName, (tmpFileName.Length() - (tmpFileName.Length() - i)));
-                tmpFileName = fName + tmpName + ext;
-
-            } else {
-                tmpFileName += tmpName;
-            }
-        
-
-		    tempSrcFile->SetLeafName(tmpFileName);
-		    tempSrcFile->MakeUnique();
-
+#ifdef dono
 #ifdef WIN32
-            // unbind Win32 images
-            char *tmpFile = PL_strdup(nsNSPRPath(*tempSrcFile));
-            if (su_unbind(realfile, tmpFile))
-            {
-                PL_strfree(realfile);
-                realfile = PL_strdup(tmpFile);
+
+        /* unbind Win32 images */
+        if ( dd->bWin32BoundImage && status == GDIFF_OK ) {
+            tmpurl = WH_TempName( xpURL, NULL );
+            if ( tmpurl != NULL ) {
+                if (su_unbind( srcfile, srctype, tmpurl, xpURL ))  	
+				{
+                    PL_strfree(realfile);
+					realfile = tmpurl;
+                    realtype = xpURL;
+                    
+                }
             }
             else
-            {
                 status = GDIFF_ERR_MEM;
-            }
-            PL_strfree(tmpFile);
+        }
 #endif
+#endif
+
 #ifdef XP_MAC
+
+		if ( dd->bMacAppleSingle && status == GDIFF_OK ) 
+		{
+           // create a tmp file, so that we can AppleSingle the src file
+           nsSpecialSystemDirectory tempMacFile(nsSpecialSystemDirectory::OS_TemporaryDirectory);
+           nsString srcName = sourceFile.GetLeafName();
+           tempMacFile.SetLeafName(srcName);
+           tempMacFile.MakeUnique();
+           
+           // Encode! 
 		   // Encode src file, and put into temp file
 		   FSSpec sourceSpec = sourceFile.GetFSSpec();
-		   FSSpec tempSpec   = tempSrcFile->GetFSSpec();
+		   FSSpec tempSpec   = tempMacFile.GetFSSpec();
 		    
 			status = PAS_EncodeFile(&sourceSpec, &tempSpec);   
 				
@@ -462,10 +377,12 @@ nsInstallPatch::NativePatch(const nsFileSpec &sourceFile, const nsFileSpec &patc
 			{
 				// set
                 PL_strfree(realfile);
-				realfile = PL_strdup(nsNSPRPath(*tempSrcFile));
+				realfile = PL_strdup(nsNSPRPath(tempMacFile));
 			}
-#endif
-        }
+		}
+#endif 
+
+
 
 		if (status != NS_OK)
 			goto cleanup;
@@ -475,7 +392,7 @@ nsInstallPatch::NativePatch(const nsFileSpec &sourceFile, const nsFileSpec &patc
 		nsString newFileName = sourceFile.GetLeafName();
 
         PRInt32 index;
-		if ((index = newFileName.RFindChar('.')) > 0)
+		if ((index = newFileName.RFind(".")) > 0)
 		{
             nsString extention;
             nsString fileName;
@@ -488,10 +405,10 @@ nsInstallPatch::NativePatch(const nsFileSpec &sourceFile, const nsFileSpec &patc
         }
         
 
-		outFileSpec->SetLeafName(newFileName);
-		outFileSpec->MakeUnique();
+		outFileSpec.SetLeafName(newFileName); //????
+		outFileSpec.MakeUnique();
 
-        char *outFile = PL_strdup(nsNSPRPath(*outFileSpec));
+        char *outFile = PL_strdup(nsNSPRPath(outFileSpec));
 
 		// apply patch to the source file
 		dd->fSrc = PR_Open ( realfile, PR_RDONLY, 0666);
@@ -514,9 +431,12 @@ nsInstallPatch::NativePatch(const nsFileSpec &sourceFile, const nsFileSpec &patc
 			if (status == GDIFF_ERR_CHECKSUM)
 				status = GDIFF_ERR_CHECKSUM_RESULT;
 
-            *newFile = outFileSpec;
-            if ( outFile != nsnull)
-                PL_strfree( outFile );
+            if (status == GDIFF_OK)
+            {
+                *newFile = &outFileSpec;
+                if ( outFile != nsnull)
+                    PL_strfree( outFile );
+            }
 
 		} else {
 
@@ -530,7 +450,7 @@ nsInstallPatch::NativePatch(const nsFileSpec &sourceFile, const nsFileSpec &patc
 	if ( dd->bMacAppleSingle && status == GDIFF_OK ) 
 	{
         // create another file, so that we can decode somewhere
-        nsFileSpec anotherName = *outFileSpec;
+        nsFileSpec anotherName = outFileSpec;
         anotherName.MakeUnique();
         
 		// Close the out file so that we can read it 		
@@ -538,13 +458,8 @@ nsInstallPatch::NativePatch(const nsFileSpec &sourceFile, const nsFileSpec &patc
 		dd->fOut = NULL;
 		
 		
-		FSSpec outSpec = outFileSpec->GetFSSpec();
-		FSSpec anotherSpec = anotherName.GetFSSpec();
-		
-		if ( outFileSpec->Exists() )
-		{
-			printf("filesize: %d\n", outFileSpec->GetFileSize());
-		}
+		FSSpec outSpec = outFileSpec.GetFSSpec();
+		FSSpec anotherSpec   = anotherName.GetFSSpec();
 		
 			
         status =  PAS_DecodeFile(&outSpec, &anotherSpec);
@@ -555,14 +470,12 @@ nsInstallPatch::NativePatch(const nsFileSpec &sourceFile, const nsFileSpec &patc
 		
         nsFileSpec parent;
         
-        outFileSpec->GetParent(parent);
+        outFileSpec.GetParent(parent);
         
-        outFileSpec->Delete(PR_FALSE);
-        anotherName.CopyToDir(parent);
+        outFileSpec.Delete(PR_FALSE);
+        anotherName.Copy(parent);
         
-        *outFileSpec = anotherName;
-        
-        *newFile = outFileSpec;
+        *newFile = &anotherName;
 	}
 	
 #endif 
@@ -598,17 +511,7 @@ cleanup:
 		tmpurl = NULL;
         PR_DELETE( tmpurl );
     }
-
-    if (realfile != NULL)
-    {
-        PL_strfree(realfile);
-    }
     
-    if ((tempSrcFile != nsnull) && (tempSrcFile->Exists()) )
-    {
-        tempSrcFile->Delete(PR_FALSE);
-    }
-
 	/* lets map any GDIFF error to nice SU errors */
 
 	switch (status)
@@ -652,13 +555,19 @@ nsInstallPatch::HashFilePath(const nsFilePath& aPath)
     if(cPath != nsnull) 
     {
         char  ch;
-        char* pathIndex = cPath;
+        char* filePath = PL_strdup(cPath);
+        PRUint32 cnt=0;
 
-        while ((ch = *pathIndex++) != 0) 
+        while ((ch = *filePath++) != 0) 
         {
             // FYI: rv = rv*37 + ch
             rv = ((rv << 5) + (rv << 2) + rv) + ch;
+            cnt++;
         }
+        
+        for (PRUint32 i=0; i<=cnt; i++)
+            *filePath--;
+		PL_strfree(filePath);
     }
 
 	PL_strfree(cPath);
@@ -886,7 +795,7 @@ static
 int32 gdiff_ApplyPatch( pDIFFDATA dd )
 {
     int32   err;
-    PRBool done;
+    XP_Bool done;
     uint32  position;
     uint32  count;
     uchar   opcode;
@@ -1075,179 +984,3 @@ int32 gdiff_copy( pDIFFDATA dd, uint32 position, uint32 count )
     return (err);
 }
 
-
-#ifdef WIN32
-#include <winfile.h>
-/*---------------------------------------------------------
- *  su_unbind()
- *
- *  strips import binding information from Win32
- *  executables and .DLL's
- *---------------------------------------------------------
- */
-static 
-PRBool su_unbind(char* oldfile, char* newfile)
-{
-    PRBool bSuccess = FALSE;
-
-    int     i;
-    DWORD   nRead;
-    PDWORD  pOrigThunk;
-    PDWORD  pBoundThunk;
-    FILE    *fh = NULL;
-    char    *buf;
-    BOOL    bModified = FALSE;
-    BOOL    bImports = FALSE;
-
-    IMAGE_DOS_HEADER            mz;
-    IMAGE_NT_HEADERS            nt;
-    IMAGE_SECTION_HEADER        sec;
-
-    PIMAGE_DATA_DIRECTORY       pDir;
-    PIMAGE_IMPORT_DESCRIPTOR    pImp;
-
-    typedef BOOL (__stdcall *BINDIMAGEEX)(DWORD Flags,
-									  LPSTR ImageName,
-									  LPSTR DllPath,
-									  LPSTR SymbolPath,
-									  PVOID StatusRoutine);
-    HINSTANCE   hImageHelp;
-    BINDIMAGEEX pfnBindImageEx;
-
-    if ( oldfile != NULL && newfile != NULL &&
-         CopyFile( oldfile, newfile, FALSE ) )
-    {   
-        /* call BindImage() first to make maximum room for a possible
-         * NT-style Bound Import Descriptors which can change various
-         * offsets in the file */
-	    hImageHelp = LoadLibrary("IMAGEHLP.DLL");
-	    if ( hImageHelp > (HINSTANCE)HINSTANCE_ERROR ) {
-        	pfnBindImageEx = (BINDIMAGEEX)GetProcAddress(hImageHelp, "BindImageEx");
-    	    if (pfnBindImageEx) {
-                pfnBindImageEx(0, newfile, NULL, NULL, NULL);
-            }
-		    FreeLibrary(hImageHelp);
-	    }
-        
-        
-        fh = fopen( newfile, "r+b" );
-        if ( fh == NULL )
-            goto bail;
-
-
-        /* read and validate the MZ header */
-
-        nRead = fread( &mz, 1, sizeof(mz), fh );
-        if ( nRead != sizeof(mz) || mz.e_magic != IMAGE_DOS_SIGNATURE )
-            goto bail;
-
-
-        /* read and validate the NT header */
-        fseek( fh, mz.e_lfanew, SEEK_SET );
-        nRead = fread( &nt, 1, sizeof(nt), fh );
-        if ( nRead != sizeof(nt) || 
-             nt.Signature != IMAGE_NT_SIGNATURE ||
-             nt.OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR_MAGIC ) 
-        {
-            goto bail;
-        }
-
-
-        /* find .idata section */
-        for (i = nt.FileHeader.NumberOfSections; i > 0; i--)
-        {
-            nRead = fread( &sec, 1, sizeof(sec), fh );
-            if ( nRead != sizeof(sec) ) 
-                goto bail;
-
-            if ( memcmp( sec.Name, ".idata", 6 ) == 0 ) {
-                bImports = TRUE;
-                break;
-            }
-        }
-
-
-        /* Zap any binding in the imports section */
-        if ( bImports ) 
-        {
-            buf = (char*)malloc( sec.SizeOfRawData );
-            if ( buf == NULL )
-                goto bail;
-
-            fseek( fh, sec.PointerToRawData, SEEK_SET );
-            nRead = fread( buf, 1, sec.SizeOfRawData, fh );
-            if ( nRead != sec.SizeOfRawData ) {
-                free( buf );
-                goto bail;
-            }
-            
-            pImp = (PIMAGE_IMPORT_DESCRIPTOR)buf;
-            while ( pImp->OriginalFirstThunk != 0 )
-            {
-                if ( pImp->TimeDateStamp != 0 || pImp->ForwarderChain != 0 )
-                {
-                    /* found a bound .DLL */
-                    pImp->TimeDateStamp = 0;
-                    pImp->ForwarderChain = 0;
-                    bModified = TRUE;
-    
-                    pOrigThunk = (PDWORD)(buf + (DWORD)(pImp->OriginalFirstThunk) - sec.VirtualAddress);
-                    pBoundThunk = (PDWORD)(buf + (DWORD)(pImp->FirstThunk) - sec.VirtualAddress);
-    
-                    for ( ; *pOrigThunk != 0; pOrigThunk++, pBoundThunk++ ) {
-                        *pBoundThunk = *pOrigThunk;
-                    }
-                }
-                pImp++;
-            }
-
-            if ( bModified ) 
-            {
-                /* it's been changed, write out the section */
-                fseek( fh, sec.PointerToRawData, SEEK_SET );
-                fwrite( buf, 1, sec.SizeOfRawData, fh );
-            }
-    
-            free( buf );
-        }
-
-
-        /* Check for a Bound Import Directory in the headers */
-        pDir = &nt.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_BOUND_IMPORT];
-        if ( pDir->VirtualAddress != 0 ) 
-        {
-            /* we've got one, so stomp it */
-            buf = (char*)calloc( pDir->Size, 1 );
-            if ( buf == NULL )
-                goto bail;
-        
-            fseek( fh, pDir->VirtualAddress, SEEK_SET );
-            fwrite( buf, pDir->Size, 1, fh );
-            free( buf );
-
-            pDir->VirtualAddress = 0;
-            pDir->Size = 0;
-            bModified = TRUE;
-        }
-
-
-        /* Write out changed headers if necessary */
-        if ( bModified )
-        {
-            /* zap checksum since it's now invalid */
-            nt.OptionalHeader.CheckSum = 0;
-
-            fseek( fh, mz.e_lfanew, SEEK_SET );
-            fwrite( &nt, 1, sizeof(nt), fh );
-        }
-
-        bSuccess = TRUE;
-    }
-
-bail:
-    if ( fh != NULL ) 
-        fclose(fh);
-
-    return bSuccess;
-}
-#endif

mozilla/xpinstall/src/nsInstallPatch.h

@@ -1,23 +1,19 @@
 /* -*- 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/
+ * 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 License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
+ * Software distributed under the 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 Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
+ * 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.
- *
- * Contributor(s): 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  */
 
 #ifndef nsInstallPatch_h__
@@ -41,7 +37,7 @@ class nsInstallPatch : public nsInstallObject
                         const nsString& inVRName,
                         const nsString& inVInfo,
                         const nsString& inJarLocation,
-                        nsInstallFolder* folderSpec,
+                        const nsString& folderSpec,
                         const nsString& inPartialPath,
                         PRInt32 *error);
 

mozilla/xpinstall/src/nsInstallProgressDialog.cpp

@@ -1,57 +1,116 @@
 /* -*- 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/
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "License"); you 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.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY 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 client code, 
  * released March 31, 1998. 
  *
  * 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.
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  *
- * Contributor(s): 
+ * Contributors:
  *     Douglas Turner <dougt@netscape.com>
- *     Pierre Phaneuf <pp@ludusdesign.com>
  */
 
 
-#include "nsIXPINotifier.h"
+#include "nsIXPInstallProgress.h"
 #include "nsInstallProgressDialog.h"
 
 #include "nsIAppShellComponentImpl.h"
 
-
-#include "nsIDOMWindow.h"
 #include "nsIServiceManager.h"
 #include "nsIDocumentViewer.h"
 #include "nsIContent.h"
 #include "nsINameSpaceManager.h"
 #include "nsIContentViewer.h"
 #include "nsIDOMElement.h"
-#include "nsNetUtil.h"
-#include "nsIURL.h"
+#include "nsINetService.h"
+
 #include "nsIWebShell.h"
 #include "nsIWebShellWindow.h"
-#include "nsPIXPIManagerCallbacks.h"
 
 static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
 static NS_DEFINE_IID( kAppShellServiceCID, NS_APPSHELL_SERVICE_CID );
+static NS_DEFINE_IID( kNetServiceCID,      NS_NETSERVICE_CID );
 
-static NS_DEFINE_CID(kDialogParamBlockCID, NS_DialogParamBlock_CID);
+// Utility to set element attribute.
+static nsresult setAttribute( nsIDOMXULDocument *doc,
+                              const char *id,
+                              const char *name,
+                              const nsString &value ) {
+    nsresult rv = NS_OK;
 
-nsInstallProgressDialog::nsInstallProgressDialog(nsPIXPIManagerCallbacks *aManager)
-  : mManager(aManager)
+    if ( doc ) {
+        // Find specified element.
+        nsCOMPtr<nsIDOMElement> elem;
+        rv = doc->GetElementById( id, getter_AddRefs( elem ) );
+        if ( elem ) {
+            // Set the text attribute.
+            rv = elem->SetAttribute( name, value );
+            if ( NS_SUCCEEDED( rv ) ) {
+            } else {
+                 DEBUG_PRINTF( PR_STDOUT, "%s %d: SetAttribute failed, rv=0x%X\n",
+                               __FILE__, (int)__LINE__, (int)rv );
+            }
+        } else {
+            DEBUG_PRINTF( PR_STDOUT, "%s %d: GetElementById failed, rv=0x%X\n",
+                          __FILE__, (int)__LINE__, (int)rv );
+        }
+    } else {
+        rv = NS_ERROR_NULL_POINTER;
+    }
+
+    return rv;
+}
+
+
+// Utility to get element attribute.
+static nsresult getAttribute( nsIDOMXULDocument *doc,
+                              const char *id,
+                              const char *name,
+                              nsString &value ) {
+    nsresult rv = NS_OK;
+
+    if ( doc ) {
+        // Find specified element.
+        nsCOMPtr<nsIDOMElement> elem;
+        rv = doc->GetElementById( id, getter_AddRefs( elem ) );
+        if ( elem ) {
+            // Set the text attribute.
+            rv = elem->GetAttribute( name, value );
+            if ( NS_SUCCEEDED( rv ) ) {
+            } else {
+                 DEBUG_PRINTF( PR_STDOUT, "%s %d: SetAttribute failed, rv=0x%X\n",
+                               __FILE__, (int)__LINE__, (int)rv );
+            }
+        } else {
+            DEBUG_PRINTF( PR_STDOUT, "%s %d: GetElementById failed, rv=0x%X\n",
+                          __FILE__, (int)__LINE__, (int)rv );
+        }
+    } else {
+        rv = NS_ERROR_NULL_POINTER;
+    }
+
+    return rv;
+}
+
+
+nsInstallProgressDialog::nsInstallProgressDialog()
 {
-    NS_INIT_ISUPPORTS();
+    NS_INIT_REFCNT();
+    mWindow = nsnull;
+    mDocument = nsnull;
+
 }
 
 nsInstallProgressDialog::~nsInstallProgressDialog()
@@ -72,18 +131,18 @@ nsInstallProgressDialog::QueryInterface(REFNSIID aIID,void** aInstancePtr)
   // Always NULL result, in case of failure
   *aInstancePtr = NULL;
 
-  if (aIID.Equals(NS_GET_IID(nsIXPINotifier))) {
-    *aInstancePtr = (void*) ((nsIXPINotifier*)this);
+  if (aIID.Equals(nsIXPInstallProgress::GetIID())) {
+    *aInstancePtr = (void*) ((nsInstallProgressDialog*)this);
     NS_ADDREF_THIS();
     return NS_OK;
   }
-  if (aIID.Equals(NS_GET_IID(nsIXPIProgressDlg))) {
-    *aInstancePtr = (void*) ((nsIXPIProgressDlg*)this);
+  if (aIID.Equals(nsIXULWindowCallbacks::GetIID())) {
+    *aInstancePtr = (void*) ((nsIXULWindowCallbacks*)this);
     NS_ADDREF_THIS();
     return NS_OK;
   }
   if (aIID.Equals(kISupportsIID)) {
-    *aInstancePtr = (void*) (nsISupports*)((nsIXPINotifier*)this);
+    *aInstancePtr = (void*) (nsISupports*)((nsIXPInstallProgress*)this);
     NS_ADDREF_THIS();
     return NS_OK;
   }
@@ -92,125 +151,110 @@ nsInstallProgressDialog::QueryInterface(REFNSIID aIID,void** aInstancePtr)
 }
 
 NS_IMETHODIMP 
-nsInstallProgressDialog::BeforeJavascriptEvaluation(const PRUnichar *URL)
-{
-    return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsInstallProgressDialog::AfterJavascriptEvaluation(const PRUnichar *URL)
-{
-    return NS_OK;
-}
-
-NS_IMETHODIMP 
-nsInstallProgressDialog::InstallStarted(const PRUnichar *URL, const PRUnichar *UIPackageName)
-{
-    return SetHeading( UIPackageName );
-}
-
-NS_IMETHODIMP 
-nsInstallProgressDialog::ItemScheduled(const PRUnichar *message)
-{
-    return SetActionText( message );
-}
-
-NS_IMETHODIMP 
-nsInstallProgressDialog::FinalizeProgress(const PRUnichar *message, PRInt32 itemNum, PRInt32 totNum)
-{
-
-    nsresult rv = SetActionText( message );
-
-    if (NS_SUCCEEDED(rv))
-        rv = SetProgress( itemNum, totNum, 'n' );
-    
-    return rv;
-}
-
-NS_IMETHODIMP 
-nsInstallProgressDialog::FinalStatus(const PRUnichar *URL, PRInt32 status)
-{
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP 
-nsInstallProgressDialog::LogComment(const PRUnichar* comment)
-{
-    return NS_OK;
-}
-
-
-
-NS_IMETHODIMP
-nsInstallProgressDialog::Open(nsIDialogParamBlock* ioParamBlock)
+nsInstallProgressDialog::BeforeJavascriptEvaluation()
 {
     nsresult rv = NS_OK;
-    
-    // Now do the stuff to create a window and pass the JS args to it.
-    NS_WITH_SERVICE(nsIAppShellService, appShell, kAppShellServiceCID, &rv );
+
+    // Get app shell service.
+    nsIAppShellService *appShell;
+    rv = nsServiceManager::GetService( kAppShellServiceCID,
+                                       nsIAppShellService::GetIID(),
+                                       (nsISupports**)&appShell );
+
     if ( NS_SUCCEEDED( rv ) ) 
     {
-        nsCOMPtr<nsIDOMWindow> hiddenWindow;
-        JSContext* jsContext;
-        rv = appShell->GetHiddenWindowAndJSContext( getter_AddRefs(hiddenWindow), &jsContext);
-        if (NS_SUCCEEDED(rv))
+        // Open "progress" dialog.
+        nsIURL *url;
+        rv = NS_NewURL( &url, "resource:/res/xpinstall/progress.xul" );
+        
+        if ( NS_SUCCEEDED(rv) ) 
         {
-            nsCOMPtr<nsPIXPIManagerCallbacks> mgr = do_QueryInterface(mManager);
+        
+            nsIWebShellWindow *newWindow;
 
-            void* stackPtr;
-            jsval *argv = JS_PushArguments( jsContext,
-                                            &stackPtr,
-                                            "sss%ip%ip",
-                                            "chrome://xpinstall/content/xpistatus.xul",
-                                            "_blank",
-                                            "chrome",
-                                            (const nsIID*)&NS_GET_IID(nsIDialogParamBlock),
-                                            (nsISupports*)ioParamBlock,
-                                            (const nsIID*)&NS_GET_IID(nsPIXPIManagerCallbacks),
-                                            (nsISupports*)mgr
-                                            );
-            if (argv)
+            rv = appShell->CreateTopLevelWindow( nsnull,
+                                                 url,
+                                                 PR_TRUE,
+                                                 newWindow,
+                                                 nsnull,
+                                                 this,  // callbacks??
+                                                 0,
+                                                 0 );
+
+            if ( NS_SUCCEEDED( rv ) ) 
             {
-                rv = hiddenWindow->OpenDialog( jsContext,
-                                               argv,
-                                               5,
-                                               getter_AddRefs( mWindow ));
-            }
+                mWindow = newWindow;
+                NS_RELEASE( newWindow );
 
-            JS_PopArguments( jsContext, stackPtr);  
+                 if (mWindow != nsnull)
+                    mWindow->Show(PR_TRUE);
+            }
+            else 
+            {
+                DEBUG_PRINTF( PR_STDOUT, "Error creating progress dialog, rv=0x%X\n", (int)rv );
+            }
+            NS_RELEASE( url );
         }
         
+        nsServiceManager::ReleaseService( kAppShellServiceCID, appShell );
+    } 
+    else 
+    {
+        DEBUG_PRINTF( PR_STDOUT, "Unable to get app shell service, rv=0x%X\n", (int)rv );
     }
-    return rv;
-}
-
-
-NS_IMETHODIMP
-nsInstallProgressDialog::Close()
-{
-    mWindow->Close();
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsInstallProgressDialog::SetTitle(const PRUnichar * aTitle)
+NS_IMETHODIMP 
+nsInstallProgressDialog::AfterJavascriptEvaluation()
 {
-    return NS_ERROR_NOT_IMPLEMENTED;
+    if (mWindow)
+    {
+        mWindow->Close();
+    }
+
+    return NS_OK;
 }
 
-NS_IMETHODIMP
-nsInstallProgressDialog::SetHeading(const PRUnichar * aHeading)
+NS_IMETHODIMP 
+nsInstallProgressDialog::InstallStarted(const char *UIPackageName)
 {
-    return setDlgAttribute( "dialog.uiPackageName", "value", nsString(aHeading) );
+    setAttribute( mDocument, "dialog.uiPackageName", "value", nsString(UIPackageName) );
+    return NS_OK;
 }
 
-NS_IMETHODIMP
-nsInstallProgressDialog::SetActionText(const PRUnichar * aActionText)
+NS_IMETHODIMP 
+nsInstallProgressDialog::ItemScheduled(const char *message)
 {
-    const PRInt32 maxChars = 50;
+    PRInt32 maxChars = 40;
 
-    nsString theMessage(aActionText);
+    nsString theMessage(message);
+    PRInt32 len = theMessage.Length();
+    if (len > maxChars)
+    {
+        PRInt32 offset = (len/2) - ((len - maxChars)/2);
+        PRInt32 count  = (len - maxChars);
+        theMessage.Cut(offset, count); 
+        theMessage.Insert(nsString("..."), offset);
+    }
+    setAttribute( mDocument, "dialog.currentAction", "value", theMessage );
+    
+    nsString aValue;
+    getAttribute( mDocument, "data.canceled", "value", aValue );
+
+    if (aValue.EqualsIgnoreCase("true"))
+        return -1;
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP 
+nsInstallProgressDialog::InstallFinalization(const char *message, PRInt32 itemNum, PRInt32 totNum)
+{
+
+    PRInt32 maxChars = 40;
+
+    nsString theMessage(message);
     PRInt32 len = theMessage.Length();
     if (len > maxChars)
     {
@@ -220,145 +264,80 @@ nsInstallProgressDialog::SetActionText(const PRUnichar * aActionText)
         theMessage.Insert(nsString("..."), offset);
     }
 
-    return setDlgAttribute( "dialog.currentAction", "value", theMessage );
-}
+    setAttribute( mDocument, "dialog.currentAction", "value", theMessage );
 
-NS_IMETHODIMP
-nsInstallProgressDialog::SetProgress(PRInt32 aValue, PRInt32 aMax, char mode)
-{
-    char buf[16];
-    static char modeFlag = 'n';
-    nsresult rv;
-    static PRInt32 previousMax;
-
-    //First check to see if the max value changed so we don't
-    //have to send a max value across the proxy every time.
-    if ( aMax != previousMax)
-    {
-        previousMax = aMax;
-
-        PR_snprintf( buf, sizeof buf, "%lu", aMax );
-        rv = setDlgAttribute( "dialog.progress", "max", buf );
-    }
-    
-    //I use this modeFlag business so I don't have to send
-    //progressmeter mode information across the proxy every time.
-    if ( mode != modeFlag )
-    {
-        modeFlag = mode;
-        if ( modeFlag == 'n' )
-            rv = setDlgAttribute( "dialog.progress", "mode", "normal");
-        else
-            rv = setDlgAttribute( "dialog.progress", "mode", "undetermined");
-    }
-
-    if ( NS_SUCCEEDED(rv))
-    {
-        if (aMax != 0)
-            PR_snprintf( buf, sizeof buf, "%lu", 100 * aValue/aMax );
-        else
-            PR_snprintf( buf, sizeof buf, "%lu", 0 );
-
-        rv = setDlgAttribute( "dialog.progress", "value", buf );
-    }
-    return rv;
-}
-
-NS_IMETHODIMP
-nsInstallProgressDialog::StartInstallPhase()
-{
     nsresult rv = NS_OK;
-
-    // don't care if this fails
-    setDlgAttribute("dialog.cancel", "disabled", nsString("true"));
-
-    return rv;
-}
-
-NS_IMETHODIMP
-nsInstallProgressDialog::GetCancelStatus(PRBool *_retval)
-{
-    *_retval = PR_FALSE;
+    char buf[16];
+    
+    PR_snprintf( buf, sizeof buf, "%lu", totNum );
+    setAttribute( mDocument, "dialog.progress", "max", buf );
+   
+    if (totNum != 0)
+    {
+        PR_snprintf( buf, sizeof buf, "%lu", ((totNum-itemNum)/totNum) );
+    }
+    else
+    {
+        PR_snprintf( buf, sizeof buf, "%lu", 0 );
+    }
+    setAttribute( mDocument, "dialog.progress", "value", buf );
+    
     return NS_OK;
 }
 
-// Utility to set element attribute.
-nsresult nsInstallProgressDialog::setDlgAttribute( const char *id,
-                                                   const char *name,
-                                                   const nsString &value )
+NS_IMETHODIMP 
+nsInstallProgressDialog::InstallAborted()
+{
+    return NS_OK;
+}
+
+
+
+
+// Do startup stuff from C++ side.
+NS_IMETHODIMP
+nsInstallProgressDialog::ConstructBeforeJavaScript(nsIWebShell *aWebShell) 
 {
     nsresult rv = NS_OK;
 
-    if (!mDocument)
-    {
-        nsCOMPtr<nsIDOMDocument> doc;
-        rv = mWindow->GetDocument( getter_AddRefs(doc) );
-        if (NS_SUCCEEDED(rv))
-        {
-            mDocument = do_QueryInterface(doc,&rv);
-        }
-        NS_WARN_IF_FALSE(rv == NS_OK,"couldn't get nsIDOMXULDocument from nsXPIProgressDlg");
-    }
+    // Get content viewer from the web shell.
+    nsCOMPtr<nsIContentViewer> contentViewer;
+    rv = aWebShell ? aWebShell->GetContentViewer(getter_AddRefs(contentViewer))
+                   : NS_ERROR_NULL_POINTER;
 
-    if ( mDocument ) {
-        // Find specified element.
-        nsCOMPtr<nsIDOMElement> elem;
-        rv = mDocument->GetElementById( id, getter_AddRefs( elem ) );
-        if ( elem ) {
-            // Set the text attribute.
-            rv = elem->SetAttribute( name, value );
-            if ( NS_SUCCEEDED( rv ) ) {
-            } else {
-                 DEBUG_PRINTF( PR_STDOUT, "%s %d: SetAttribute failed, rv=0x%X\n",
-                               __FILE__, (int)__LINE__, (int)rv );
+    if ( contentViewer ) {
+        // Up-cast to a document viewer.
+        nsCOMPtr<nsIDocumentViewer> docViewer( do_QueryInterface( contentViewer, &rv ) );
+        if ( docViewer ) {
+            // Get the document from the doc viewer.
+            nsCOMPtr<nsIDocument> document;
+            rv = docViewer->GetDocument(*getter_AddRefs(document));
+            if ( document ) {
+                // Upcast to XUL document.
+                mDocument = do_QueryInterface( document, &rv );
+                if ( ! mDocument ) 
+                {
+                    DEBUG_PRINTF( PR_STDOUT, "%s %d: Upcast to nsIDOMXULDocument failed, rv=0x%X\n",
+                                  __FILE__, (int)__LINE__, (int)rv );
+                }
+            } 
+            else 
+            {
+                DEBUG_PRINTF( PR_STDOUT, "%s %d: GetDocument failed, rv=0x%X\n",
+                              __FILE__, (int)__LINE__, (int)rv );
             }
-        } else {
-            DEBUG_PRINTF( PR_STDOUT, "%s %d: GetElementById failed, rv=0x%X\n",
+        } 
+        else 
+        {
+            DEBUG_PRINTF( PR_STDOUT, "%s %d: Upcast to nsIDocumentViewer failed, rv=0x%X\n",
                           __FILE__, (int)__LINE__, (int)rv );
         }
-    } else {
-        rv = NS_ERROR_NULL_POINTER;
-    }
-    return rv;
-}
-
-// Utility to get element attribute.
-nsresult nsInstallProgressDialog::getDlgAttribute(  const char *id,
-                                                    const char *name,
-                                                    nsString &value ) 
-{
-    nsresult rv = NS_OK;
-
-    if (!mDocument)
+    } 
+    else 
     {
-        nsCOMPtr<nsIDOMDocument> doc;
-        rv = mWindow->GetDocument( getter_AddRefs(doc) );
-        if (NS_SUCCEEDED(rv))
-        {
-            mDocument = do_QueryInterface(doc,&rv);
-        }
-        NS_WARN_IF_FALSE(rv == NS_OK,"couldn't get nsIDOMXULDocument from nsXPIProgressDlg");
-    }
-
-    if ( mDocument ) {
-        // Find specified element.
-        nsCOMPtr<nsIDOMElement> elem;
-        rv = mDocument->GetElementById( id, getter_AddRefs( elem ) );
-        if ( elem ) {
-            // Set the text attribute.
-            rv = elem->GetAttribute( name, value );
-            if ( NS_SUCCEEDED( rv ) ) {
-            } else {
-                 DEBUG_PRINTF( PR_STDOUT, "%s %d: GetAttribute failed, rv=0x%X\n",
-                               __FILE__, (int)__LINE__, (int)rv );
-            }
-        } else {
-            DEBUG_PRINTF( PR_STDOUT, "%s %d: GetElementById failed, rv=0x%X\n",
-                          __FILE__, (int)__LINE__, (int)rv );
-        }
-    } else {
-        rv = NS_ERROR_NULL_POINTER;
+        DEBUG_PRINTF( PR_STDOUT, "%s %d: GetContentViewer failed, rv=0x%X\n",
+                      __FILE__, (int)__LINE__, (int)rv );
     }
 
     return rv;
-}
+}

mozilla/xpinstall/src/nsInstallProgressDialog.h

@@ -1,32 +1,30 @@
 /* -*- 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/
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "License"); you 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.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY 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 client code, 
  * released March 31, 1998. 
  *
  * 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.
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  *
- * Contributor(s): 
+ * Contributors:
  *     Douglas Turner <dougt@netscape.com>
  */
 #ifndef __nsInstallProgressDialog_h__
 #define __nsInstallProgressDialog_h__
 
-#include "nscore.h"
-#include "nsIXPINotifier.h"
-#include "nsIXPIProgressDlg.h"
+#include "nsIXPInstallProgress.h"
 #include "nsISupports.h"
 #include "nsISupportsUtils.h"
 
@@ -34,39 +32,36 @@
 
 #include "nsIWebShell.h"
 #include "nsIWebShellWindow.h"
-#include "nsPIXPIManagerCallbacks.h"    
+#include "nsIXULWindowCallbacks.h"    
 
 #include "nsIDocument.h"
-#include "nsIDOMWindow.h"
-#include "nsIDOMDocument.h"
 #include "nsIDOMXULDocument.h"
 
 
-class nsInstallProgressDialog : public nsIXPINotifier,
-                                public nsIXPIProgressDlg
+class nsInstallProgressDialog : public nsIXPInstallProgress, public nsIXULWindowCallbacks
 {
     public: 
 
-        nsInstallProgressDialog(nsPIXPIManagerCallbacks *aManager);
+        nsInstallProgressDialog();
         virtual ~nsInstallProgressDialog();
         
         NS_DECL_ISUPPORTS
 
-        // implement nsIXPINotifier
-        NS_DECL_NSIXPINOTIFIER
+        
+        NS_IMETHOD BeforeJavascriptEvaluation();
+        NS_IMETHOD AfterJavascriptEvaluation();
+        NS_IMETHOD InstallStarted(const char *UIPackageName);
+        NS_IMETHOD ItemScheduled(const char *message);
+        NS_IMETHOD InstallFinalization(const char *message, PRInt32 itemNum, PRInt32 totNum);
+        NS_IMETHOD InstallAborted();
 
-        // implement nsIXPIProgressDlg
-        NS_DECL_NSIXPIPROGRESSDLG
-
-//        void SetWindow(nsISupports* aWindow);
-
-    protected:
-        nsresult setDlgAttribute(const char *id, const char *name, const nsString &value);
-        nsresult getDlgAttribute(const char *id, const char *name, nsString &value);
+        // Declare implementations of nsIXULWindowCallbacks interface functions.
+        NS_IMETHOD ConstructBeforeJavaScript(nsIWebShell *aWebShell);
+        NS_IMETHOD ConstructAfterJavaScript(nsIWebShell *aWebShell) { return NS_OK; }
 
     private:
-        nsPIXPIManagerCallbacks*       mManager;
-        nsCOMPtr<nsIDOMXULDocument>    mDocument;   // Should this be a weak reference?
-        nsCOMPtr<nsIDOMWindow>         mWindow;     // Should this be a weak reference?
+
+        nsCOMPtr<nsIDOMXULDocument>  mDocument;
+        nsCOMPtr<nsIWebShellWindow>  mWindow;
 };
-#endif
+#endif

mozilla/xpinstall/src/nsInstallResources.cpp

@@ -1,83 +1,67 @@
  /* -*- 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/
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "License"); you 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.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY 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 client code, 
  * released March 31, 1998. 
  *
  * 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.
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  *
- * Contributor(s): 
+ * Contributors:
  *     Daniel Veditz <dveditz@netscape.com>
  *     Douglas Turner <dougt@netscape.com>
- *     Samir Gehani <sgehani@netscape.com>
  */
 
-#include <string.h>
-#include "nscore.h"
 #include "nsInstallResources.h"
 
-static nsXPIResourceTableItem XPIResTable[] = 
-{
-    /*---------------------------------------------------------------------*
-     *   Install Actions 
-     *---------------------------------------------------------------------*/
-    { "InstallFile",        "Installing: %s" },
-    { "ReplaceFile",        "Replacing: %s" },
-    { "SkipFile",           "Skipping: %s" },
-    { "DeleteFile",         "Deleting file: %s" },
-    { "DeleteComponent",    "Deleting component: %s" },
-    { "Execute",            "Executing: %s" },
-    { "ExecuteWithArgs",    "Executing: %s with argument: %s" },
-    { "Patch",              "Patching: %s" },
-    { "Uninstall",          "Uninstalling: %s" },
-
-    // XXX FileOp*() action strings
-    // XXX WinReg and WinProfile action strings
-
-    /*---------------------------------------------------------------------*
-     *   Dialog Messages 
-     *---------------------------------------------------------------------*/
-    { "FinishingInstallMsg", "Finishing install... please wait." },
-
-    /*---------------------------------------------------------------------*
-     *    Miscellaneous 
-     *---------------------------------------------------------------------*/
-    { "ERROR", "ERROR" },
-
-    { NS_XPI_EOT, "" }
-};
-
-char* 
-nsInstallResources::GetDefaultVal(const char* aResName)
-{
-    char    *currResName = XPIResTable[0].resName;
-    char    *currResVal = nsnull;
-    PRInt32 idx, len = 0;
-
-    for (idx = 0; 0 != strcmp(currResName, NS_XPI_EOT); idx++)
-    {
-        currResName = XPIResTable[idx].resName;
-        len = strlen(currResName);
-
-        if (0 == strncmp(currResName, aResName, len))
-        {
-            currResVal = XPIResTable[idx].defaultString;
-            break;
-        }
-    }
-
-    return currResVal;
+char* nsInstallResources::GetInstallFileString(void)
+{ 
+    return "Installing: %s"; 
+}
+
+char* nsInstallResources::GetReplaceFileString(void)
+{ 
+    return "Replacing %s"; 
+}     
+
+char* nsInstallResources::GetDeleteFileString(void)
+{ 
+    return "Deleting file: %s"; 
+} 
+
+char* nsInstallResources::GetDeleteComponentString(void) 
+{ 
+    return "Deleting component: %s"; 
+}
+
+char* nsInstallResources::GetExecuteString(void)         
+{ 
+    return "Executing: %s"; 
+}
+
+char* nsInstallResources::GetExecuteWithArgsString(void) 
+{ 
+    return "Executing: %s with argument: %s"; 
+}
+
+char* nsInstallResources::GetPatchFileString(void)       
+{ 
+    return "Patching: %s"; 
+}
+
+char* nsInstallResources::GetUninstallString(void)       
+{ 
+    return "Uninstalling: %s"; 
 }
 

mozilla/xpinstall/src/nsInstallResources.h

@@ -1,48 +1,45 @@
 /* -*- 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/
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "License"); you 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.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY 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 client code, 
  * released March 31, 1998. 
  *
  * 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.
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  *
- * Contributor(s): 
+ * Contributors:
  *     Daniel Veditz <dveditz@netscape.com>
  *     Douglas Turner <dougt@netscape.com>
- *     Samir Gehani <sgehani@netscape.com>
  */
 
 
 #ifndef __NS_INSTALLRESOURCES_H__
 #define __NS_INSTALLRESOURCES_H__
 
-#define NS_XPI_EOT "___END_OF_TABLE___"
-
-typedef struct _nsXPIResourceTableItem
-{
-    char *resName;
-    char *defaultString;
-} nsXPIResourceTableItem;
-
-
 class nsInstallResources
 {
     public:
-        
-       static char* GetDefaultVal(const char* aResName);
+       
+       static char* GetInstallFileString(void);
+       static char* GetReplaceFileString(void);     
+       static char* GetDeleteFileString(void);      
+       static char* GetDeleteComponentString(void); 
+       static char* GetExecuteString(void);         
+       static char* GetExecuteWithArgsString(void); 
+       static char* GetPatchFileString(void);       
+       static char* GetUninstallString(void);       
 };
 
 
-#endif
+#endif

mozilla/xpinstall/src/nsInstallTrigger.cpp

@@ -1,29 +1,25 @@
 /* -*- 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/
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "License"); you 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.
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY 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 client 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): 
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
  */
 
 #include "nsSoftwareUpdate.h"
-#include "nsXPInstallManager.h"
+#include "nsSoftwareUpdateStream.h"
 #include "nsInstallTrigger.h"
-#include "nsInstallVersion.h"
 #include "nsIDOMInstallTriggerGlobal.h"
 
 #include "nscore.h"
@@ -38,8 +34,6 @@
 
 #include "nsSpecialSystemDirectory.h"
 
-#include "VerReg.h"
-
 static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
 static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
 static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
@@ -145,7 +139,7 @@ nsInstallTrigger::UpdateEnabled(PRBool* aReturn)
 
     if ( NS_SUCCEEDED(rv) )
     {
-        rv = prefs->GetBoolPref( (const char*) XPINSTALL_ENABLE_PREF, aReturn);
+        rv = prefs->GetBoolPref( (const char*) AUTOUPDATE_ENABLE_PREF, aReturn);
 
         if (NS_FAILED(rv))
         {
@@ -158,313 +152,118 @@ nsInstallTrigger::UpdateEnabled(PRBool* aReturn)
     {
         *aReturn = PR_FALSE;  /* no prefs manager.  set to false */
     }
-
+    
+    //FIX!!!!!!!!!!  
+    *aReturn = PR_TRUE; 
     return NS_OK;
 }
 
-NS_IMETHODIMP
-nsInstallTrigger::Install(nsXPITriggerInfo* aTrigger, PRBool* aReturn)
-{
-    nsresult rv;
-    *aReturn = PR_FALSE;
-
-    PRBool enabled;
-    UpdateEnabled(&enabled);
-    if (!enabled) 
-    {
-        delete aTrigger;
-        return NS_OK;
-    }
-
-    nsXPInstallManager *mgr = new nsXPInstallManager();
-    if (mgr)
-    {
-        // The Install manager will delete itself when done
-        rv = mgr->InitManager( aTrigger );
-        if (NS_SUCCEEDED(rv))
-            *aReturn = PR_TRUE;
-    }
-    else
-    {
-        delete aTrigger;
-        rv = NS_ERROR_OUT_OF_MEMORY;
-    }
-
-
-    return rv;
-}
-
 
 NS_IMETHODIMP    
-nsInstallTrigger::StartSoftwareUpdate(const nsString& aURL, PRInt32 aFlags, PRBool* aReturn)
+nsInstallTrigger::StartSoftwareUpdate(const nsString& aURL, PRInt32 aFlags, PRInt32* aReturn)
 {
-    PRBool enabled;
-    nsresult rv = NS_ERROR_OUT_OF_MEMORY;
-    *aReturn = PR_FALSE;
+    nsString localFile;
+    CreateTempFileFromURL(aURL, localFile);
 
-    UpdateEnabled(&enabled);
-    if (!enabled)
-        return NS_OK;
+    // start the download (this will clean itself up)
+    nsSoftwareUpdateListener *downloader = new nsSoftwareUpdateListener(aURL, localFile, aFlags);
 
-    // The Install manager will delete itself when done, once we've called
-    // InitManager. Before then **WE** must delete it
-    nsXPInstallManager *mgr = new nsXPInstallManager();
-    if (mgr)
-    {
-        nsXPITriggerInfo* trigger = new nsXPITriggerInfo();
-        if ( trigger )
-        {
-            nsXPITriggerItem* item = new nsXPITriggerItem(0,aURL.GetUnicode());
-            if (item)
-            {
-                trigger->Add( item );
-                // The Install manager will delete itself when done
-                rv = mgr->InitManager( trigger );
-                *aReturn = PR_TRUE;
-            }
-            else
-            {
-                rv = NS_ERROR_OUT_OF_MEMORY;
-                delete trigger;
-                delete mgr;
-            }
-        }
-        else
-        {
-            rv = NS_ERROR_OUT_OF_MEMORY;
-            delete mgr;
-        }
-    }
+    *aReturn = NS_OK;  // maybe we should do something more.
+    return NS_OK;
+}
 
-    return rv;
+NS_IMETHODIMP    
+nsInstallTrigger::StartSoftwareUpdate(const nsString& aURL, PRInt32* aReturn)
+{
+    nsString localFile;
+    CreateTempFileFromURL(aURL, localFile);
+
+    // start the download (this will clean itself up)
+    nsSoftwareUpdateListener *downloader = new nsSoftwareUpdateListener(aURL, localFile, 0);
+
+    *aReturn = NS_OK;  // maybe we should do something more.
+    return NS_OK;
 }
 
 NS_IMETHODIMP    
 nsInstallTrigger::ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn)
 {
-    nsInstallVersion inVersion;
-    inVersion.Init(aVersion);
-    return ConditionalSoftwareUpdate(aURL, aRegName, aDiffLevel, &inVersion, aMode, aReturn);
+    return NS_OK;
 }
 
 NS_IMETHODIMP    
 nsInstallTrigger::ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn)
 {
-    PRBool needJar = PR_FALSE;
-
-    PRBool enabled;
-
-    UpdateEnabled(&enabled);
-    if (!enabled)
-        return NS_OK;
-
-    if (aURL.IsEmpty() || aVersion == nsnull)
-    {
-        needJar = PR_TRUE;
-    }
-    else
-    {
-        char * regNameCString = aRegName.ToNewCString();
-
-        REGERR status = VR_ValidateComponent( regNameCString );
-        
-        if ( status == REGERR_NOFIND || status == REGERR_NOFILE )
-        {
-            // either component is not in the registry or it's a file
-            // node and the physical file is missing
-            needJar = PR_TRUE;
-        }
-        else
-        {
-            VERSION oldVersion;
-            PRInt32 diffValue;
-
-            status = VR_GetVersion( regNameCString, &oldVersion );
-            nsInstallVersion oldInstallVersion;
-
-            oldInstallVersion.Init(oldVersion.major, 
-                                oldVersion.minor, 
-                                oldVersion.release, 
-                                oldVersion.build);
-
-
-            if ( status != REGERR_OK )
-                needJar = PR_TRUE;
-            else if ( aDiffLevel < 0 )
-            {
-                aVersion->CompareTo(&oldInstallVersion, &diffValue); 
-                needJar = (diffValue <= aDiffLevel);
-            }
-            else
-            {
-                aVersion->CompareTo(&oldInstallVersion, &diffValue);
-                needJar = (diffValue >= aDiffLevel);
-            }
-        }
-    }
-
-    if (needJar)
-        return StartSoftwareUpdate(aURL, aMode, aReturn);
-    else
-        *aReturn = 0;
-
     return NS_OK;
 }
 
 NS_IMETHODIMP    
 nsInstallTrigger::ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn)
 {
-    return ConditionalSoftwareUpdate(aURL, aRegName, BLD_DIFF, aVersion, aMode, aReturn);
+    return NS_OK;
 }
 
 NS_IMETHODIMP    
 nsInstallTrigger::ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn)
 {
-    nsInstallVersion inVersion;
-    inVersion.Init(aVersion);
-    return ConditionalSoftwareUpdate(aURL, aRegName, BLD_DIFF, &inVersion, aMode, aReturn);
+    return NS_OK;
 }
 
 NS_IMETHODIMP    
 nsInstallTrigger::ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn)
 {
-    nsInstallVersion inVersion;
-    inVersion.Init(aVersion);;
-    return ConditionalSoftwareUpdate(aURL, aRegName, BLD_DIFF, &inVersion, 0, aReturn);
+    return NS_OK;
 }
 
 NS_IMETHODIMP    
 nsInstallTrigger::ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn)
 {
-    return ConditionalSoftwareUpdate(aURL, aRegName, BLD_DIFF, aVersion, 0, aReturn);
+    return NS_OK;
 }
 
 NS_IMETHODIMP    
 nsInstallTrigger::CompareVersion(const nsString& aRegName, PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn)
 {
-    nsInstallVersion inVersion;
-    inVersion.Init(aMajor, aMinor, aRelease, aBuild);
-
-    return CompareVersion(aRegName, &inVersion, aReturn);
+    return NS_OK;
 }
 
 NS_IMETHODIMP    
 nsInstallTrigger::CompareVersion(const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn)
 {
-    nsInstallVersion inVersion;
-    inVersion.Init(aVersion);
-
-    return CompareVersion(aRegName, &inVersion, aReturn);
+    return NS_OK;
 }
 
 NS_IMETHODIMP    
 nsInstallTrigger::CompareVersion(const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn)
 {
-    *aReturn = EQUAL;  // assume failure.
-
-    PRBool enabled;
-
-    UpdateEnabled(&enabled);
-    if (!enabled)
-        return NS_OK;
-
-    VERSION              cVersion;
-    char*                tempCString;
-    REGERR               status;
-    nsInstallVersion     regNameVersion;
-    
-    tempCString = aRegName.ToNewCString();
-
-    status = VR_GetVersion( tempCString, &cVersion );
-
-    /* if we got the version */
-    if ( status == REGERR_OK ) 
-    {
-        if ( VR_ValidateComponent( tempCString ) == REGERR_NOFILE ) 
-        {
-            regNameVersion.Init(0,0,0,0);
-        }
-        else
-        {
-            regNameVersion.Init(cVersion.major, 
-                                cVersion.minor, 
-                                cVersion.release, 
-                                cVersion.build);
-        }
-    }
-    else
-        regNameVersion.Init(0,0,0,0);
-        
-    regNameVersion.CompareTo( aVersion, aReturn );
-
-    if (tempCString)
-        Recycle(tempCString);
-    
-    return NS_OK;
-}
-
-NS_IMETHODIMP    
-nsInstallTrigger::GetVersion(const nsString& component, nsString& version)
-{
-    PRBool enabled;
-
-    UpdateEnabled(&enabled);
-    if (!enabled)
-        return NS_OK;
-
-    VERSION              cVersion;
-    char*                tempCString;
-    REGERR               status;
-    
-    tempCString = component.ToNewCString();
-
-    status = VR_GetVersion( tempCString, &cVersion );
-
-    version.Truncate();
-
-    /* if we got the version */
-    if ( status == REGERR_OK && VR_ValidateComponent( tempCString ) == REGERR_OK) 
-    {
-        nsInstallVersion regNameVersion;
-        
-        regNameVersion.Init(cVersion.major, 
-                            cVersion.minor, 
-                            cVersion.release, 
-                            cVersion.build);
-
-        regNameVersion.ToString(version);
-    }
-    
-    if (tempCString)
-         Recycle(tempCString);
-
     return NS_OK;
 }
 
 
-// this will take a nsIURI, and create a temporary file.  If it is local, we just us it.
+
+// this will take a nsIUrl, and create a temporary file.  If it is local, we just us it.
  
 void
 nsInstallTrigger::CreateTempFileFromURL(const nsString& aURL, nsString& tempFileString)
 {
     // Checking to see if the url is local
 
-    if ( aURL.EqualsIgnoreCase("file:/", 6) )
+    if ( aURL.EqualsIgnoreCase("file://", 7) )
     {       
-        tempFileString.Assign( nsNSPRPath(nsFileURL(aURL)) );
+        tempFileString.SetString( nsNSPRPath(nsFileURL(aURL)) );
     }
     else
     {
         nsSpecialSystemDirectory tempFile(nsSpecialSystemDirectory::OS_TemporaryDirectory);
     
-        PRInt32 result = aURL.RFindChar('/');
+        PRInt32 result = aURL.RFind("/");
         if (result != -1)
         {    
             nsString jarName;
                        
             aURL.Right(jarName, (aURL.Length() - result) );
             
-            PRInt32 argOffset = jarName.RFindChar('?');
+            PRInt32 argOffset = jarName.RFind("?");
 
             if (argOffset != -1)
             {
@@ -482,8 +281,79 @@ nsInstallTrigger::CreateTempFileFromURL(const nsString& aURL, nsString& tempFile
 
         tempFile.MakeUnique();
 
-        tempFileString.Assign( nsNSPRPath( nsFilePath(tempFile) ) );
+        tempFileString.SetString( nsNSPRPath( nsFilePath(tempFile) ) );
     }
 }
 
 
+/////////////////////////////////////////////////////////////////////////
+// 
+/////////////////////////////////////////////////////////////////////////
+
+
+
+nsInstallTriggerFactory::nsInstallTriggerFactory(void)
+{
+    NS_INIT_REFCNT();
+}
+
+nsInstallTriggerFactory::~nsInstallTriggerFactory(void)
+{
+    NS_ASSERTION(mRefCnt == 0, "non-zero refcnt at destruction");
+}
+
+NS_IMETHODIMP
+nsInstallTriggerFactory::QueryInterface(const nsIID &aIID, void **aResult)
+{
+    if (! aResult)
+        return NS_ERROR_NULL_POINTER;
+
+    // Always NULL result, in case of failure
+    *aResult = nsnull;
+
+    if (aIID.Equals(kISupportsIID)) {
+        *aResult = NS_STATIC_CAST(nsISupports*, this);
+        AddRef();
+        return NS_OK;
+    } else if (aIID.Equals(kIFactoryIID)) {
+        *aResult = NS_STATIC_CAST(nsIFactory*, this);
+        AddRef();
+        return NS_OK;
+    }
+
+    return NS_NOINTERFACE;
+}
+
+NS_IMPL_ADDREF(nsInstallTriggerFactory);
+NS_IMPL_RELEASE(nsInstallTriggerFactory);
+
+NS_IMETHODIMP
+nsInstallTriggerFactory::CreateInstance(nsISupports *aOuter, REFNSIID aIID, void **aResult)
+{
+   if (! aResult)
+        return NS_ERROR_NULL_POINTER;
+
+    *aResult = nsnull;
+
+    nsresult rv;
+
+    nsInstallTrigger *inst = new nsInstallTrigger();
+    
+    if (! inst)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    if (NS_FAILED(rv = inst->QueryInterface(aIID, aResult))) 
+    {
+        // We didn't get the right interface.
+        NS_ERROR("didn't support the interface you wanted");
+    }
+    return rv;
+}
+
+    
+NS_IMETHODIMP
+nsInstallTriggerFactory::LockFactory(PRBool aLock)
+{
+    // Not implemented in simplest case.
+    return NS_OK;
+}

mozilla/xpinstall/src/nsInstallTrigger.h

@@ -7,12 +7,13 @@
 #include "nsISupports.h"
 #include "nsIScriptObjectOwner.h"
 
-#include "prtypes.h"
-#include "nsHashtable.h"
-
 #include "nsIDOMInstallTriggerGlobal.h"
 #include "nsSoftwareUpdate.h"
-#include "nsXPITriggerInfo.h"
+
+#include "prtypes.h"
+#include "nsHashtable.h"
+#include "nsVector.h"
+
 
 
 
@@ -23,7 +24,7 @@ class nsInstallTrigger: public nsIScriptObjectOwner, public nsIDOMInstallTrigger
         static const nsIID& IID() { static nsIID iid = NS_SoftwareUpdateInstallTrigger_CID; return iid; }
 
         nsInstallTrigger();
-        virtual ~nsInstallTrigger();
+        ~nsInstallTrigger();
         
         NS_DECL_ISUPPORTS
 
@@ -31,8 +32,8 @@ class nsInstallTrigger: public nsIScriptObjectOwner, public nsIDOMInstallTrigger
         NS_IMETHOD    SetScriptObject(void* aScriptObject);
 
         NS_IMETHOD    UpdateEnabled(PRBool* aReturn);
-        NS_IMETHOD    Install(nsXPITriggerInfo *aInfo, PRBool* aReturn);
         NS_IMETHOD    StartSoftwareUpdate(const nsString& aURL, PRInt32 aFlags, PRInt32* aReturn);
+        NS_IMETHOD    StartSoftwareUpdate(const nsString& aURL, PRInt32* aReturn);
         NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, const nsString& aVersion, PRInt32 aMode, PRInt32* aReturn);
         NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, PRInt32 aDiffLevel, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn);
         NS_IMETHOD    ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32 aMode, PRInt32* aReturn);
@@ -42,7 +43,6 @@ class nsInstallTrigger: public nsIScriptObjectOwner, public nsIDOMInstallTrigger
         NS_IMETHOD    CompareVersion(const nsString& aRegName, PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn);
         NS_IMETHOD    CompareVersion(const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn);
         NS_IMETHOD    CompareVersion(const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn);
-        NS_IMETHOD    GetVersion(const nsString& component, nsString& version);
 
         
     private:
@@ -51,5 +51,22 @@ class nsInstallTrigger: public nsIScriptObjectOwner, public nsIDOMInstallTrigger
 
 };
 
-#define NS_INSTALLTRIGGERCOMPONENT_PROGID NS_IXPINSTALLCOMPONENT_PROGID "/installtrigger"
+
+class nsInstallTriggerFactory : public nsIFactory 
+{
+    public:
+        
+        nsInstallTriggerFactory();
+        ~nsInstallTriggerFactory();
+        
+        NS_DECL_ISUPPORTS
+
+              NS_IMETHOD CreateInstance(nsISupports *aOuter,
+                                        REFNSIID aIID,
+                                        void **aResult);
+
+              NS_IMETHOD LockFactory(PRBool aLock);
+
+};
+
 #endif

mozilla/xpinstall/src/nsInstallUninstall.cpp

@@ -1,24 +1,24 @@
 /* -*- 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/
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "License"); you 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.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY 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 client code, 
  * released March 31, 1998. 
  *
  * 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.
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  *
- * Contributor(s): 
+ * Contributors:
  *     Daniel Veditz <dveditz@netscape.com>
  *     Douglas Turner <dougt@netscape.com>
  */
@@ -34,7 +34,6 @@
 extern "C" NS_EXPORT PRInt32 SU_Uninstall(char *regPackageName);
 REGERR su_UninstallProcessItem(char *component_path);
 
-MOZ_DECL_CTOR_COUNTER(nsInstallUninstall);
 
 nsInstallUninstall::nsInstallUninstall( nsInstall* inInstall,
                                         const nsString& regName,
@@ -42,22 +41,20 @@ nsInstallUninstall::nsInstallUninstall( nsInstall* inInstall,
 
 : nsInstallObject(inInstall)
 {
-    MOZ_COUNT_CTOR(nsInstallUninstall);
-
-    if (regName.Equals("")) 
+    if (regName == "null") 
     {
         *error = nsInstall::INVALID_ARGUMENTS;
         return;
     }
     
-    mRegName.Assign(regName);
+    mRegName.SetString(regName);
 
     char* userName = (char*)PR_Malloc(MAXREGPATHLEN);
     PRInt32 err = VR_GetUninstallUserName( (char*) (const char*) nsAutoCString(regName), 
                                            userName, 
                                            MAXREGPATHLEN );
     
-    mUIName.Assign(userName);
+    mUIName.SetString(userName);
     
     if (err != REGERR_OK)
     {
@@ -70,7 +67,6 @@ nsInstallUninstall::nsInstallUninstall( nsInstall* inInstall,
 
 nsInstallUninstall::~nsInstallUninstall()
 {
-    MOZ_COUNT_CTOR(nsInstallUninstall);
 }
 
 
@@ -99,26 +95,10 @@ void nsInstallUninstall::Abort()
 char* nsInstallUninstall::toString()
 {
     char* buffer = new char[1024];
-    char* rsrcVal = nsnull;
-
-    if (buffer == nsnull || !mInstall)
-        return buffer;
     
     char* temp = mUIName.ToNewCString();
-    
-    if (temp)
-    {
-        rsrcVal = mInstall->GetResourcedString("Uninstall");
-
-        if (rsrcVal)
-        {
-            sprintf( buffer, rsrcVal, temp);
-            nsCRT::free(rsrcVal);
-        }
-    }
-
-    if (temp)
-         Recycle(temp);
+    sprintf( buffer, nsInstallResources::GetUninstallString(), temp);
+    delete [] temp;
 
     return buffer;
 }

mozilla/xpinstall/src/nsInstallUninstall.h

@@ -1,24 +1,24 @@
 /* -*- 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/
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "License"); you 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.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY 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 client code, 
  * released March 31, 1998. 
  *
  * 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.
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  *
- * Contributor(s): 
+ * Contributors:
  *     Daniel Veditz <dveditz@netscape.com>
  *     Douglas Turner <dougt@netscape.com>
  */

mozilla/xpinstall/src/nsInstallVersion.cpp

@@ -1,23 +1,20 @@
 /* -*- 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/
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "License"); you 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.
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY 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 client 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): 
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
  */
 
 #include "nsSoftwareUpdate.h"
@@ -31,7 +28,6 @@
 #include "nsIScriptGlobalObject.h"
 
 #include "prprf.h"
-#include "prmem.h"
 
 static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
 static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
@@ -219,12 +215,9 @@ nsInstallVersion::CompareTo(nsIDOMInstallVersion* aVersion, PRInt32* aReturn)
 
 
 NS_IMETHODIMP    
-nsInstallVersion::CompareTo(const nsString& aString, PRInt32* aReturn)
+nsInstallVersion::CompareTo(const nsString& aAString, PRInt32* aReturn)
 {
-    nsInstallVersion inVersion;
-    inVersion.Init(aString);
-
-    return CompareTo(&inVersion, aReturn);
+    return NS_OK;
 }
 
 NS_IMETHODIMP    
@@ -272,9 +265,7 @@ nsInstallVersion::ToString(nsString& aReturn)
     char *result=NULL;
     result = PR_sprintf_append(result, "%d.%d.%d.%d", major, minor, release, build);
     
-    aReturn.Assign(result);
-
-    PR_FREEIF(result);
+    aReturn = result;
 
     return NS_OK;
 }
@@ -285,7 +276,7 @@ nsInstallVersion::StringToVersionNumbers(const nsString& version, PRInt32 *aMajo
 {
     PRInt32 errorCode;
 
-    int dot = version.FindChar('.', PR_FALSE,0);
+    int dot = version.Find('.', 0);
     
     if ( dot == -1 ) 
     {
@@ -298,7 +289,7 @@ nsInstallVersion::StringToVersionNumbers(const nsString& version, PRInt32 *aMajo
         *aMajor  = majorStr.ToInteger(&errorCode);
 
         int prev = dot+1;
-        dot = version.FindChar('.',PR_FALSE,prev);
+        dot = version.Find('.',prev);
         if ( dot == -1 ) 
         {
             nsString minorStr;
@@ -312,7 +303,7 @@ nsInstallVersion::StringToVersionNumbers(const nsString& version, PRInt32 *aMajo
             *aMinor = minorStr.ToInteger(&errorCode);
 
             prev = dot+1;
-            dot = version.FindChar('.',PR_FALSE,prev);
+            dot = version.Find('.',prev);
             if ( dot == -1 ) 
             {
                 nsString releaseStr;
@@ -339,3 +330,70 @@ nsInstallVersion::StringToVersionNumbers(const nsString& version, PRInt32 *aMajo
     return errorCode;
 }
 
+/////////////////////////////////////////////////////////////////////////
+// 
+/////////////////////////////////////////////////////////////////////////
+
+nsInstallVersionFactory::nsInstallVersionFactory(void)
+{
+    NS_INIT_REFCNT();
+}
+
+nsInstallVersionFactory::~nsInstallVersionFactory(void)
+{
+    NS_ASSERTION(mRefCnt == 0, "non-zero refcnt at destruction");
+}
+
+NS_IMETHODIMP
+nsInstallVersionFactory::QueryInterface(const nsIID &aIID, void **aResult)
+{
+    if (! aResult)
+        return NS_ERROR_NULL_POINTER;
+
+    // Always NULL result, in case of failure
+    *aResult = nsnull;
+
+    if (aIID.Equals(kISupportsIID)) {
+        *aResult = NS_STATIC_CAST(nsISupports*, this);
+        AddRef();
+        return NS_OK;
+    } else if (aIID.Equals(kIFactoryIID)) {
+        *aResult = NS_STATIC_CAST(nsIFactory*, this);
+        AddRef();
+        return NS_OK;
+    }
+    return NS_NOINTERFACE;
+}
+
+NS_IMPL_ADDREF(nsInstallVersionFactory);
+NS_IMPL_RELEASE(nsInstallVersionFactory);
+
+NS_IMETHODIMP
+nsInstallVersionFactory::CreateInstance(nsISupports *aOuter, REFNSIID aIID, void **aResult)
+{
+    if (aResult == NULL)
+    {
+        return NS_ERROR_NULL_POINTER;
+    }
+
+    *aResult = NULL;
+
+    /* do I have to use iSupports? */
+    nsInstallVersion *inst = new nsInstallVersion();
+
+    if (inst == NULL)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    nsresult result =  inst->QueryInterface(aIID, aResult);
+
+    if (NS_FAILED(result)) 
+        delete inst;
+
+    return result;
+}
+
+NS_IMETHODIMP
+nsInstallVersionFactory::LockFactory(PRBool aLock)
+{
+  return NS_OK;
+}

mozilla/xpinstall/src/nsInstallVersion.h

@@ -56,5 +56,21 @@ class nsInstallVersion: public nsIScriptObjectOwner, public nsIDOMInstallVersion
 };
 
 
-#define NS_INSTALLVERSIONCOMPONENT_PROGID NS_IXPINSTALLCOMPONENT_PROGID "/installversion"
+class nsInstallVersionFactory : public nsIFactory 
+{
+    public:
+        
+        nsInstallVersionFactory();
+        virtual ~nsInstallVersionFactory();
+        
+        NS_DECL_ISUPPORTS
+
+              NS_IMETHOD CreateInstance(nsISupports *aOuter,
+                                        REFNSIID aIID,
+                                        void **aResult);
+
+              NS_IMETHOD LockFactory(PRBool aLock);
+
+};
+
 #endif

mozilla/xpinstall/src/nsJSFile.h

@@ -1,93 +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 __NS_JSFILE_H__
-#define __NS_JSFILE_H__
-
-#include "jsapi.h"
-#include "nsJSUtils.h"
-#include "nscore.h"
-
-
-JSBool PR_CALLBACK
-InstallFileOpDirCreate(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpDirGetParent(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpDirRemove(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpDirRename(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileCopy(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileDelete(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileExists(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileExecute(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileGetNativeVersion(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileGetDiskSpaceAvailable(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileGetModDate(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileGetSize(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileIsDirectory(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileIsFile(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileModDateChanged(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileMove(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileRename(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileWindowsShortcut(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileMacAlias(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-JSBool PR_CALLBACK
-InstallFileOpFileUnixLink(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
-
-PRInt32 InitXPFileOpObjectPrototype(JSContext *jscontext, JSObject *global, JSObject **fileOpObjectPrototype);
-
-#endif

mozilla/xpinstall/src/nsJSFileSpecObj.cpp

@@ -1,150 +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.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.
- */
-
-#include "jsapi.h"
-#include "nsJSUtils.h"
-#include "nscore.h"
-#include "nsIScriptContext.h"
-
-#include "nsString.h"
-#include "nsInstall.h"
-#include "nsJSFileSpecObj.h"
-
-extern void ConvertJSValToStr(nsString&  aString,
-                             JSContext* aContext,
-                             jsval      aValue);
-
-extern void ConvertStrToJSVal(const nsString& aProp,
-                             JSContext* aContext,
-                             jsval* aReturn);
-
-extern PRBool ConvertJSValToBool(PRBool* aProp,
-                                JSContext* aContext,
-                                jsval aValue);
-
-extern PRBool ConvertJSValToObj(nsISupports** aSupports,
-                               REFNSIID aIID,
-                               const nsString& aTypeName,
-                               JSContext* aContext,
-                               jsval aValue);
-
-
-
-/***********************************************************************************/
-// Native methods for FileSpecObj functions
-
-/*
- * Native method fso_ToString
- */
-PR_STATIC_CALLBACK(JSBool)
-fso_ToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-
-  nsInstallFolder *nativeThis = (nsInstallFolder*)JS_GetPrivate(cx, obj);
-  nsAutoString stringReturned;
-
-  *rval = JSVAL_NULL;
-
-  // If there's no private data, this must be the prototype, so ignore
-  if(nsnull == nativeThis)
-  {
-    return JS_TRUE;
-  }
-
-    if(NS_OK != nativeThis->ToString(&stringReturned))
-      return JS_FALSE;
-    nsJSUtils::nsConvertStringToJSVal(stringReturned, cx, rval);
-
-  return JS_TRUE;
-}
-
-
-/*
- * Native method fso_AppendString
- */
-PR_STATIC_CALLBACK(JSBool)
-fso_AppendPath(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  return JS_TRUE;
-}
-
-
-/*
- * FileSpecObj destructor
- */
-static void PR_CALLBACK FileSpecObjectCleanup(JSContext *cx, JSObject *obj)
-{
-    nsInstallFolder *nativeThis = (nsInstallFolder*)JS_GetPrivate(cx, obj);
-    if (nativeThis != nsnull)
-       delete nativeThis;
-}
-
-/***********************************************************************/
-//
-// class for FileObj
-//
-JSClass FileSpecObjectClass = {
-  "FileSpecObject",
-  JSCLASS_HAS_PRIVATE,
-  JS_PropertyStub,
-  JS_PropertyStub,
-  JS_PropertyStub,
-  JS_PropertyStub,
-  JS_EnumerateStub,
-  JS_ResolveStub,
-  JS_ConvertStub,
-  FileSpecObjectCleanup
-};
-
-
-//
-// FileObj class methods
-//
-static JSFunctionSpec fileSpecObjMethods[] = 
-{
-  {"appendPath",       fso_AppendPath,     1},
-  {"toString",         fso_ToString,       0},
-  {0}
-};
-
-
-PRInt32  InitFileSpecObjectPrototype(JSContext *jscontext, 
-                                      JSObject *global, 
-                                      JSObject **fileSpecObjectPrototype)
-{
-  *fileSpecObjectPrototype  = JS_InitClass( jscontext,         // context
-                                            global,            // global object
-                                            nsnull,            // parent proto 
-                                            &FileSpecObjectClass, // JSClass
-                                            nsnull,            // JSNative ctor
-                                            0,                 // ctor args
-                                            nsnull,            // proto props
-                                            fileSpecObjMethods,// proto funcs
-                                            nsnull,            // ctor props (static)
-                                            nsnull);           // ctor funcs (static)
-
-  if (nsnull == *fileSpecObjectPrototype) 
-  {
-      return NS_ERROR_FAILURE;
-  }
-
- 
-  return NS_OK;
-}
-
-

mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp

@@ -1,24 +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.1 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.mozilla.org/NPL/
+ * The contents of this file are subject to the 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 License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
+ * Software distributed under the 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 Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
+ * 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.
- *
- * Contributor(s): 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  */
+/* AUTO-GENERATED. DO NOT EDIT!!! */
 
 #include "jsapi.h"
 #include "nsJSUtils.h"
@@ -27,15 +24,10 @@
 #include "nsIJSScriptObject.h"
 #include "nsIScriptObjectOwner.h"
 #include "nsIScriptGlobalObject.h"
-#include "nsCRT.h"
+#include "nsIPtr.h"
 #include "nsString.h"
 #include "nsIDOMInstallVersion.h"
 #include "nsIDOMInstallTriggerGlobal.h"
-#include "nsXPITriggerInfo.h"
-
-#include "nsRepository.h"
-
-#include "nsSoftwareUpdateIIDs.h"
 
 extern void ConvertJSValToStr(nsString&  aString,
                              JSContext* aContext,
@@ -60,6 +52,66 @@ static NS_DEFINE_IID(kIJSScriptObjectIID, NS_IJSSCRIPTOBJECT_IID);
 static NS_DEFINE_IID(kIScriptGlobalObjectIID, NS_ISCRIPTGLOBALOBJECT_IID);
 static NS_DEFINE_IID(kIInstallTriggerGlobalIID, NS_IDOMINSTALLTRIGGERGLOBAL_IID);
 
+NS_DEF_PTR(nsIDOMInstallTriggerGlobal);
+
+
+/***********************************************************************/
+//
+// InstallTriggerGlobal Properties Getter
+//
+PR_STATIC_CALLBACK(JSBool)
+GetInstallTriggerGlobalProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+  nsIDOMInstallTriggerGlobal *a = (nsIDOMInstallTriggerGlobal*)JS_GetPrivate(cx, obj);
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == a) {
+    return JS_TRUE;
+  }
+
+  if (JSVAL_IS_INT(id)) {
+    switch(JSVAL_TO_INT(id)) {
+      case 0:
+      default:
+        return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp);
+    }
+  }
+  else {
+    return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp);
+  }
+
+  return PR_TRUE;
+}
+
+/***********************************************************************/
+//
+// InstallTriggerGlobal Properties Setter
+//
+PR_STATIC_CALLBACK(JSBool)
+SetInstallTriggerGlobalProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+  nsIDOMInstallTriggerGlobal *a = (nsIDOMInstallTriggerGlobal*)JS_GetPrivate(cx, obj);
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == a) {
+    return JS_TRUE;
+  }
+
+  if (JSVAL_IS_INT(id)) {
+    switch(JSVAL_TO_INT(id)) {
+      case 0:
+      default:
+        return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp);
+    }
+  }
+  else {
+    return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp);
+  }
+
+  return PR_TRUE;
+}
+
+
 //
 // InstallTriggerGlobal finalizer
 //
@@ -69,37 +121,24 @@ FinalizeInstallTriggerGlobal(JSContext *cx, JSObject *obj)
   nsJSUtils::nsGenericFinalize(cx, obj);
 }
 
-static NS_DEFINE_IID(kIDOMInstallTriggerIID, NS_IDOMINSTALLTRIGGERGLOBAL_IID);
-static NS_DEFINE_IID(kInstallTrigger_CID, NS_SoftwareUpdateInstallTrigger_CID);
 
-static JSBool CreateNativeObject(JSContext *cx, JSObject *obj, nsIDOMInstallTriggerGlobal **aResult)
+//
+// InstallTriggerGlobal enumerate
+//
+PR_STATIC_CALLBACK(JSBool)
+EnumerateInstallTriggerGlobal(JSContext *cx, JSObject *obj)
 {
-    nsresult result;
-    nsIScriptObjectOwner *owner = nsnull;
-    nsIDOMInstallTriggerGlobal *nativeThis;
+  return nsJSUtils::nsGenericEnumerate(cx, obj);
+}
 
-    result = nsRepository::CreateInstance(kInstallTrigger_CID,
-                                        nsnull,
-                                        kIDOMInstallTriggerIID,
-                                        (void **)&nativeThis);
 
-    if (NS_OK != result) return JS_FALSE;
-    
-    result = nativeThis->QueryInterface(kIScriptObjectOwnerIID, (void **)&owner);
-
-    if (NS_OK != result) 
-    {
-        NS_RELEASE(nativeThis);
-        return JS_FALSE;
-    }
-
-    owner->SetScriptObject((void *)obj);
-    JS_SetPrivate(cx, obj, nativeThis);
-    
-    *aResult = nativeThis;
-    
-    NS_RELEASE(nativeThis);  // we only want one refcnt. JSUtils cleans us up.
-    return JS_TRUE;
+//
+// InstallTriggerGlobal resolve
+//
+PR_STATIC_CALLBACK(JSBool)
+ResolveInstallTriggerGlobal(JSContext *cx, JSObject *obj, jsval id)
+{
+  return nsJSUtils::nsGenericResolve(cx, obj, id);
 }
 
 //
@@ -109,12 +148,15 @@ PR_STATIC_CALLBACK(JSBool)
 InstallTriggerGlobalUpdateEnabled(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
   nsIDOMInstallTriggerGlobal *nativeThis = (nsIDOMInstallTriggerGlobal*)JS_GetPrivate(cx, obj);
+  JSBool rBool = JS_FALSE;
   PRBool nativeRet;
 
   *rval = JSVAL_NULL;
 
-  if (nsnull == nativeThis  &&  (JS_FALSE == CreateNativeObject(cx, obj, &nativeThis)) )
-    return JS_FALSE;
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == nativeThis) {
+    return JS_TRUE;
+  }
 
   if (argc >= 0) {
 
@@ -132,109 +174,6 @@ InstallTriggerGlobalUpdateEnabled(JSContext *cx, JSObject *obj, uintN argc, jsva
   return JS_TRUE;
 }
 
-//
-// Native method Install
-//
-PR_STATIC_CALLBACK(JSBool)
-InstallTriggerGlobalInstall(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsIDOMInstallTriggerGlobal *nativeThis = (nsIDOMInstallTriggerGlobal*)JS_GetPrivate(cx, obj);
-
-  *rval = JSVAL_FALSE;
-
-  if (nsnull == nativeThis  &&  (JS_FALSE == CreateNativeObject(cx, obj, &nativeThis)) )
-    return JS_FALSE;
-
-
-  // make sure XPInstall is enabled, return false if not
-  PRBool enabled = PR_FALSE;
-  nativeThis->UpdateEnabled(&enabled);
-  if (!enabled)
-      return JS_TRUE;
-
-
-  // get window.location to construct relative URLs
-  nsString baseURL;
-  JSObject* global = JS_GetGlobalObject(cx);
-  if (global)
-  {
-    jsval v;
-    if (JS_GetProperty(cx,global,"location",&v))
-    {
-      ConvertJSValToStr( baseURL, cx, v );
-      PRInt32 lastslash = baseURL.RFindChar('/');
-      if (lastslash != kNotFound)
-      {
-        baseURL.Truncate(lastslash+1);
-      }
-    }
-  }
-
-  
-  // parse associative array of installs
-  if ( argc >= 1 && JSVAL_IS_OBJECT(argv[0]) )
-  {
-    nsXPITriggerInfo *trigger = new nsXPITriggerInfo();
-    if (!trigger)
-      return JS_FALSE;
-
-    JSIdArray *ida = JS_Enumerate( cx, JSVAL_TO_OBJECT(argv[0]) );
-    if ( ida ) 
-    {
-      jsval v;
-      PRUnichar *name, *URL;
-
-      for (int i = 0; i < ida->length; i++ )
-      {
-        JS_IdToValue( cx, ida->vector[i], &v );
-        name = JS_GetStringChars( JS_ValueToString( cx, v ) );
-
-        JS_GetUCProperty( cx, JSVAL_TO_OBJECT(argv[0]), name, nsCRT::strlen(name), &v );
-        URL = JS_GetStringChars( JS_ValueToString( cx, v ) );
-
-        if ( name && URL )
-        {
-            nsXPITriggerItem *item = new nsXPITriggerItem( name, URL );
-            if ( item )
-            {
-                if ( item->IsRelativeURL() )
-                {
-                  item->mURL.Insert( baseURL, 0 );
-                }
-                trigger->Add( item );
-            }
-            else
-                ; // XXX signal error somehow
-        }
-        else
-            ; // XXX need to signal error
-      }
-      JS_DestroyIdArray( cx, ida );
-    }
-
-
-    // save callback function if any (ignore bad args for now)
-    if ( argc >= 2 && JS_TypeOfValue(cx,argv[1]) == JSTYPE_FUNCTION )
-    {
-      trigger->SaveCallback( cx, argv[1] );
-    }
-
-
-    // pass on only if good stuff found
-    if (trigger->Size() > 0)
-    {
-        PRBool result;
-        nativeThis->Install(trigger,&result);
-        *rval = BOOLEAN_TO_JSVAL(result);
-        return JS_TRUE;
-    }
-    else
-        delete trigger;
-  }
-
-  JS_ReportError(cx, "Incorrect arguments to InstallTrigger.Install()");
-  return JS_FALSE;
-}
 
 //
 // Native method StartSoftwareUpdate
@@ -243,30 +182,50 @@ PR_STATIC_CALLBACK(JSBool)
 InstallTriggerGlobalStartSoftwareUpdate(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
   nsIDOMInstallTriggerGlobal *nativeThis = (nsIDOMInstallTriggerGlobal*)JS_GetPrivate(cx, obj);
-  PRBool       nativeRet;
+  JSBool       rBool = JS_FALSE;
+  PRInt32      nativeRet;
   nsAutoString b0;
-  PRInt32      b1 = 0;
+  PRInt32      b1;
 
-  *rval = JSVAL_FALSE;
+  *rval = JSVAL_NULL;
 
-  if (nsnull == nativeThis  &&  (JS_FALSE == CreateNativeObject(cx, obj, &nativeThis)) )
-    return JS_FALSE;
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == nativeThis) {
+    return JS_TRUE;
+  }
 
-  if ( argc >= 1 )
+  if (argc >= 2)
   {
+    //  public int StartSoftwareUpdate(String url,
+    //                                 int flag);
+
     ConvertJSValToStr(b0, cx, argv[0]);
 
-    if (argc >= 2 && !JS_ValueToInt32(cx, argv[1], (int32 *)&b1))
+    if(!JS_ValueToInt32(cx, argv[1], (int32 *)&b1))
     {
-        JS_ReportError(cx, "StartSoftwareUpdate() 2nd parameter must be a number");
-        return JS_FALSE;
+      JS_ReportError(cx, "2nd parameter must be a number");
+      return JS_FALSE;
     }
 
     if(NS_OK != nativeThis->StartSoftwareUpdate(b0, b1, &nativeRet))
     {
       return JS_FALSE;
     }
-    *rval = BOOLEAN_TO_JSVAL(nativeRet);
+
+    *rval = INT_TO_JSVAL(nativeRet);
+  }
+  else if(argc >= 1)
+  {
+    //  public int StartSoftwareUpdate(String url);
+
+    ConvertJSValToStr(b0, cx, argv[0]);
+
+    if(NS_OK != nativeThis->StartSoftwareUpdate(b0, &nativeRet))
+    {
+      return JS_FALSE;
+    }
+
+    *rval = INT_TO_JSVAL(nativeRet);
   }
   else
   {
@@ -285,6 +244,7 @@ PR_STATIC_CALLBACK(JSBool)
 InstallTriggerGlobalConditionalSoftwareUpdate(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
   nsIDOMInstallTriggerGlobal *nativeThis = (nsIDOMInstallTriggerGlobal*)JS_GetPrivate(cx, obj);
+  JSBool rBool = JS_FALSE;
   PRInt32 nativeRet;
   nsAutoString b0;
   nsAutoString b1;
@@ -296,8 +256,10 @@ InstallTriggerGlobalConditionalSoftwareUpdate(JSContext *cx, JSObject *obj, uint
 
   *rval = JSVAL_NULL;
 
-  if (nsnull == nativeThis  &&  (JS_FALSE == CreateNativeObject(cx, obj, &nativeThis)) )
-    return JS_FALSE;
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == nativeThis) {
+    return JS_TRUE;
+  }
 
   if(argc >= 5)
   {
@@ -439,199 +401,152 @@ PR_STATIC_CALLBACK(JSBool)
 InstallTriggerGlobalCompareVersion(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
   nsIDOMInstallTriggerGlobal *nativeThis = (nsIDOMInstallTriggerGlobal*)JS_GetPrivate(cx, obj);
+  JSBool rBool = JS_FALSE;
   PRInt32 nativeRet;
-  nsAutoString regname;
-  nsAutoString version;
-  int32        major,minor,release,build;
+  nsAutoString b0;
+  nsAutoString b1str;
+  PRInt32      b1int;
+  PRInt32      b2int;
+  PRInt32      b3int;
+  PRInt32      b4int;
 
   *rval = JSVAL_NULL;
 
-  if (nsnull == nativeThis  &&  (JS_FALSE == CreateNativeObject(cx, obj, &nativeThis)) )
-    return JS_FALSE;
-
-  if (argc < 2 )
-  {
-    JS_ReportError(cx, "CompareVersion requires at least 2 parameters");
-    return JS_FALSE;
-  }
-  else if ( !JSVAL_IS_STRING(argv[0]) )
-  {
-    JS_ReportError(cx, "Invalid parameter passed to CompareVersion");
-    return JS_FALSE;
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == nativeThis) {
+    return JS_TRUE;
   }
 
-  // get the registry name argument
-  ConvertJSValToStr(regname, cx, argv[0]);
-
-  if (argc == 2 )
-  {
-    //  public int CompareVersion(String registryName, String version)
-    //  --OR-- CompareVersion(String registryNamve, InstallVersion version)
-
-    ConvertJSValToStr(version, cx, argv[1]);
-    if(NS_OK != nativeThis->CompareVersion(regname, version, &nativeRet))
-    {
-          return JS_FALSE;
-    }
-  }
-  else
+  if(argc >= 5)
   {
     //  public int CompareVersion(String registryName,
     //                            int    major,
     //                            int    minor,
     //                            int    release,
     //                            int    build);
-    //
-    //  minor, release, and build values are optional
 
-    major = minor = release = build = 0;
+    ConvertJSValToStr(b0, cx, argv[0]);
 
-    if(!JS_ValueToInt32(cx, argv[1], &major))
+    if(!JS_ValueToInt32(cx, argv[1], (int32 *)&b1int))
     {
       JS_ReportError(cx, "2th parameter must be a number");
       return JS_FALSE;
     }
-    if( argc > 2 && !JS_ValueToInt32(cx, argv[2], &minor) )
+    if(!JS_ValueToInt32(cx, argv[2], (int32 *)&b2int))
     {
       JS_ReportError(cx, "3th parameter must be a number");
       return JS_FALSE;
     }
-    if( argc > 3 && !JS_ValueToInt32(cx, argv[3], &release) )
+    if(!JS_ValueToInt32(cx, argv[3], (int32 *)&b3int))
     {
       JS_ReportError(cx, "4th parameter must be a number");
       return JS_FALSE;
     }
-    if( argc > 4 && !JS_ValueToInt32(cx, argv[4], &build) )
+    if(!JS_ValueToInt32(cx, argv[4], (int32 *)&b4int))
     {
       JS_ReportError(cx, "5th parameter must be a number");
       return JS_FALSE;
     }
 
-    if(NS_OK != nativeThis->CompareVersion(regname, major, minor, release, build, &nativeRet))
+    if(NS_OK != nativeThis->CompareVersion(b0, b1int, b2int, b3int, b4int, &nativeRet))
     {
       return JS_FALSE;
     }
+
+    *rval = INT_TO_JSVAL(nativeRet);
   }
-
-  *rval = INT_TO_JSVAL(nativeRet);
-  return JS_TRUE;
-}
-
-//
-// Native method GetVersion
-//
-PR_STATIC_CALLBACK(JSBool)
-InstallTriggerGlobalGetVersion(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsIDOMInstallTriggerGlobal *nativeThis = (nsIDOMInstallTriggerGlobal*)JS_GetPrivate(cx, obj);
-  
-  nsAutoString regname;
-  nsAutoString version;
-
-  *rval = JSVAL_NULL;
-
-  if (nsnull == nativeThis  &&  (JS_FALSE == CreateNativeObject(cx, obj, &nativeThis)) )
-    return JS_FALSE;
-
-  // get the registry name argument
-  ConvertJSValToStr(regname, cx, argv[0]);
-
-  if(NS_OK != nativeThis->GetVersion(regname, version))
+  else if(argc >= 2)
   {
-        return JS_FALSE;
-  }
-  
-  if(version.Equals(""))
-      *rval = JSVAL_NULL;
+    //  public int CompareVersion(String registryName,
+    //                            String version); --OR-- VersionInfo version
+
+    ConvertJSValToStr(b0, cx, argv[0]);
+
+    if(JSVAL_IS_OBJECT(argv[1]))
+    {
+        JSObject* jsobj = JSVAL_TO_OBJECT(argv[1]);
+        JSClass* jsclass = JS_GetClass(cx, jsobj);
+        if((nsnull != jsclass) && (jsclass->flags & JSCLASS_HAS_PRIVATE)) 
+        {
+          nsIDOMInstallVersion* version = (nsIDOMInstallVersion*)JS_GetPrivate(cx, jsobj);
+
+          if(NS_OK != nativeThis->CompareVersion(b0, version, &nativeRet))
+          {
+                return JS_FALSE;
+          }
+        }
+    }
     else
-      ConvertStrToJSVal(version, cx, rval);
+    {
+        ConvertJSValToStr(b1str, cx, argv[1]);
+        if(NS_OK != nativeThis->CompareVersion(b0, b1str, &nativeRet))
+        {
+          return JS_FALSE;
+        }
+    }
+
+    *rval = INT_TO_JSVAL(nativeRet);
+  }
+  else
+  {
+    JS_ReportError(cx, "Function CompareVersion requires 5 parameters");
+    return JS_FALSE;
+  }
 
   return JS_TRUE;
 }
 
+
 /***********************************************************************/
 //
 // class for InstallTriggerGlobal
 //
 JSClass InstallTriggerGlobalClass = {
-  "InstallTrigger", 
+  "InstallTriggerGlobal", 
   JSCLASS_HAS_PRIVATE,
   JS_PropertyStub,
   JS_PropertyStub,
-  JS_PropertyStub,
-  JS_PropertyStub,
-  JS_EnumerateStub,
-  JS_ResolveStub,
+  GetInstallTriggerGlobalProperty,
+  SetInstallTriggerGlobalProperty,
+  EnumerateInstallTriggerGlobal,
+  ResolveInstallTriggerGlobal,
   JS_ConvertStub,
   FinalizeInstallTriggerGlobal
 };
 
+
+//
+// InstallTriggerGlobal class properties
+//
+static JSPropertySpec InstallTriggerGlobalProperties[] =
+{
+  {0}
+};
+
+
 //
 // InstallTriggerGlobal class methods
 //
 static JSFunctionSpec InstallTriggerGlobalMethods[] = 
 {
-  {"UpdateEnabled",             InstallTriggerGlobalUpdateEnabled,             0},
-  {"Install",                   InstallTriggerGlobalInstall,                   2},
-  {"StartSoftwareUpdate",       InstallTriggerGlobalStartSoftwareUpdate,       2},
-  {"ConditionalSoftwareUpdate", InstallTriggerGlobalConditionalSoftwareUpdate, 5},
-  {"CompareVersion",            InstallTriggerGlobalCompareVersion,            5},
-  {"GetVersion",                InstallTriggerGlobalGetVersion,                2},
-  // -- new forms to match JS style --
-  {"updateEnabled",             InstallTriggerGlobalUpdateEnabled,             0},
-  {"install",                   InstallTriggerGlobalInstall,                   2},
-  {"startSoftwareUpdate",       InstallTriggerGlobalStartSoftwareUpdate,       2},
-  {"conditionalSoftwareUpdate", InstallTriggerGlobalConditionalSoftwareUpdate, 5},
-  {"compareVersion",            InstallTriggerGlobalCompareVersion,            5},
-  {"getVersion",                InstallTriggerGlobalGetVersion,                2},
+  {"UpdateEnabled",          InstallTriggerGlobalUpdateEnabled,     0},
+  {"StartSoftwareUpdate",          InstallTriggerGlobalStartSoftwareUpdate,     2},
+  {"ConditionalSoftwareUpdate",          InstallTriggerGlobalConditionalSoftwareUpdate,     5},
+  {"CompareVersion",          InstallTriggerGlobalCompareVersion,     5},
   {0}
 };
 
 
-static JSConstDoubleSpec diff_constants[] = 
+//
+// InstallTriggerGlobal constructor
+//
+PR_STATIC_CALLBACK(JSBool)
+InstallTriggerGlobal(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
-    { nsIDOMInstallTriggerGlobal::MAJOR_DIFF,    "MAJOR_DIFF" },
-    { nsIDOMInstallTriggerGlobal::MINOR_DIFF,    "MINOR_DIFF" },
-    { nsIDOMInstallTriggerGlobal::REL_DIFF,      "REL_DIFF"   },
-    { nsIDOMInstallTriggerGlobal::BLD_DIFF,      "BLD_DIFF"   },
-    { nsIDOMInstallTriggerGlobal::EQUAL,         "EQUAL"      },
-    {0}
-};
-
-
-
-nsresult InitInstallTriggerGlobalClass(JSContext *jscontext, JSObject *global, void** prototype)
-{
-  JSObject *proto = nsnull;
-  
-  if (prototype != nsnull)
-    *prototype = nsnull;
-
-    proto = JS_InitClass(jscontext,                       // context
-                         global,                          // global object
-                         nsnull,                          // parent proto 
-                         &InstallTriggerGlobalClass,      // JSClass
-                         nsnull,                          // JSNative ctor
-                         nsnull,                          // ctor args
-                         nsnull,                          // proto props
-                         nsnull,                          // proto funcs
-                         nsnull,                          // ctor props (static)
-                         InstallTriggerGlobalMethods);    // ctor funcs (static)
-    
-    
-    if (nsnull == proto) return NS_ERROR_FAILURE;
-    
-    if ( PR_FALSE == JS_DefineConstDoubles(jscontext, proto, diff_constants) )
-            return NS_ERROR_FAILURE;
-
-    if (prototype != nsnull)
-      *prototype = proto;
-  
-  return NS_OK;
+  return JS_FALSE;
 }
 
 
-
 //
 // InstallTriggerGlobal class initialization
 //
@@ -640,6 +555,7 @@ nsresult NS_InitInstallTriggerGlobalClass(nsIScriptContext *aContext, void **aPr
   JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
   JSObject *proto = nsnull;
   JSObject *constructor = nsnull;
+  JSObject *parent_proto = nsnull;
   JSObject *global = JS_GetGlobalObject(jscontext);
   jsval vp;
 
@@ -647,23 +563,53 @@ nsresult NS_InitInstallTriggerGlobalClass(nsIScriptContext *aContext, void **aPr
       !JSVAL_IS_OBJECT(vp) ||
       ((constructor = JSVAL_TO_OBJECT(vp)) == nsnull) ||
       (PR_TRUE != JS_LookupProperty(jscontext, JSVAL_TO_OBJECT(vp), "prototype", &vp)) || 
-      !JSVAL_IS_OBJECT(vp)) 
-  {
-    nsresult rv = InitInstallTriggerGlobalClass(jscontext, global, (void**)&proto);
-    if (NS_FAILED(rv)) return rv;
+      !JSVAL_IS_OBJECT(vp)) {
+
+    proto = JS_InitClass(jscontext,     // context
+                         global,        // global object
+                         parent_proto,  // parent proto 
+                         &InstallTriggerGlobalClass,      // JSClass
+                         InstallTriggerGlobal,            // JSNative ctor
+                         0,             // ctor args
+                         InstallTriggerGlobalProperties,  // proto props
+                         InstallTriggerGlobalMethods,     // proto funcs
+                         nsnull,        // ctor props (static)
+                         nsnull);       // ctor funcs (static)
+    if (nsnull == proto) {
+      return NS_ERROR_FAILURE;
+    }
+
+    if ((PR_TRUE == JS_LookupProperty(jscontext, global, "InstallTriggerGlobal", &vp)) &&
+        JSVAL_IS_OBJECT(vp) &&
+        ((constructor = JSVAL_TO_OBJECT(vp)) != nsnull)) {
+      vp = INT_TO_JSVAL(nsIDOMInstallTriggerGlobal::MAJOR_DIFF);
+      JS_SetProperty(jscontext, constructor, "MAJOR_DIFF", &vp);
+
+      vp = INT_TO_JSVAL(nsIDOMInstallTriggerGlobal::MINOR_DIFF);
+      JS_SetProperty(jscontext, constructor, "MINOR_DIFF", &vp);
+
+      vp = INT_TO_JSVAL(nsIDOMInstallTriggerGlobal::REL_DIFF);
+      JS_SetProperty(jscontext, constructor, "REL_DIFF", &vp);
+
+      vp = INT_TO_JSVAL(nsIDOMInstallTriggerGlobal::BLD_DIFF);
+      JS_SetProperty(jscontext, constructor, "BLD_DIFF", &vp);
+
+      vp = INT_TO_JSVAL(nsIDOMInstallTriggerGlobal::EQUAL);
+      JS_SetProperty(jscontext, constructor, "EQUAL", &vp);
+
+    }
+
   }
-  else if ((nsnull != constructor) && JSVAL_IS_OBJECT(vp)) 
-  {
+  else if ((nsnull != constructor) && JSVAL_IS_OBJECT(vp)) {
     proto = JSVAL_TO_OBJECT(vp);
   }
-  else 
-  {
+  else {
     return NS_ERROR_FAILURE;
   }
 
-  if (aPrototype) 
+  if (aPrototype) {
     *aPrototype = proto;
-  
+  }
   return NS_OK;
 }
 

mozilla/xpinstall/src/nsJSInstallVersion.cpp

@@ -1,23 +1,19 @@
 /* -*- 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/
+ * 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 License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
+ * Software distributed under the 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 Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
+ * 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.
- *
- * Contributor(s): 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  */
 /* AUTO-GENERATED. DO NOT EDIT!!! */
 
@@ -28,14 +24,13 @@
 #include "nsIJSScriptObject.h"
 #include "nsIScriptObjectOwner.h"
 #include "nsIScriptGlobalObject.h"
+#include "nsIPtr.h"
 #include "nsString.h"
 #include "nsIDOMInstallVersion.h"
 #include "nsIScriptNameSpaceManager.h"
 #include "nsRepository.h"
 #include "nsDOMCID.h"
 
-#include "nsSoftwareUpdateIIDs.h"
-
 extern void ConvertJSValToStr(nsString&  aString,
                              JSContext* aContext,
                              jsval      aValue);
@@ -62,6 +57,8 @@ static NS_DEFINE_IID(kIJSScriptObjectIID, NS_IJSSCRIPTOBJECT_IID);
 static NS_DEFINE_IID(kIScriptGlobalObjectIID, NS_ISCRIPTGLOBALOBJECT_IID);
 static NS_DEFINE_IID(kIInstallVersionIID, NS_IDOMINSTALLVERSION_IID);
 
+NS_DEF_PTR(nsIDOMInstallVersion);
+
 //
 // InstallVersion property ids
 //
@@ -133,11 +130,11 @@ GetInstallVersionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
         break;
       }
       default:
-        return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, obj, id, vp);
+        return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp);
     }
   }
   else {
-    return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, obj, id, vp);
+    return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, id, vp);
   }
 
   return PR_TRUE;
@@ -224,11 +221,11 @@ SetInstallVersionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
         break;
       }
       default:
-        return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, obj, id, vp);
+        return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp);
     }
   }
   else {
-    return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, obj, id, vp);
+    return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, id, vp);
   }
 
   return PR_TRUE;
@@ -272,6 +269,7 @@ PR_STATIC_CALLBACK(JSBool)
 InstallVersionInit(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
   nsIDOMInstallVersion *nativeThis = (nsIDOMInstallVersion*)JS_GetPrivate(cx, obj);
+  JSBool rBool = JS_FALSE;
   nsAutoString b0;
 
   *rval = JSVAL_NULL;
@@ -281,19 +279,20 @@ InstallVersionInit(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval
     return JS_TRUE;
   }
 
-  if (argc == 1) 
-  {
-      nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]);
+  if (argc >= 1) {
+
+    nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]);
+
+    if (NS_OK != nativeThis->Init(b0)) {
+      return JS_FALSE;
+    }
+
+    *rval = JSVAL_VOID;
   }
-  else 
-  {
-      b0 = "0.0.0.0";
+  else {
+    JS_ReportError(cx, "Function init requires 1 parameters");
+    return JS_FALSE;
   }
-    
-  if (NS_OK != nativeThis->Init(b0)) 
-        return JS_FALSE;
-  
-  *rval = JSVAL_VOID;
 
   return JS_TRUE;
 }
@@ -306,6 +305,7 @@ PR_STATIC_CALLBACK(JSBool)
 InstallVersionToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
   nsIDOMInstallVersion *nativeThis = (nsIDOMInstallVersion*)JS_GetPrivate(cx, obj);
+  JSBool rBool = JS_FALSE;
   nsAutoString nativeRet;
 
   *rval = JSVAL_NULL;
@@ -339,12 +339,14 @@ PR_STATIC_CALLBACK(JSBool)
 InstallVersionCompareTo(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
   nsIDOMInstallVersion *nativeThis = (nsIDOMInstallVersion*)JS_GetPrivate(cx, obj);
+  JSBool                  rBool = JS_FALSE;
   PRInt32                 nativeRet;
   nsString                b0str;
   PRInt32                 b0int;
   PRInt32                 b1int;
   PRInt32                 b2int;
   PRInt32                 b3int;
+  nsIDOMInstallVersionPtr versionObj;
 
   *rval = JSVAL_NULL;
 
@@ -399,9 +401,7 @@ InstallVersionCompareTo(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j
 
     if(JSVAL_IS_OBJECT(argv[0]))
     {
-        nsCOMPtr<nsIDOMInstallVersion> versionObj;
-
-        if(JS_FALSE == ConvertJSValToObj(getter_AddRefs(versionObj),
+        if(JS_FALSE == ConvertJSValToObj((nsISupports **)&versionObj,
                                          kIInstallVersionIID,
                                          "InstallVersion",
                                          cx,
@@ -462,7 +462,7 @@ static JSPropertySpec InstallVersionProperties[] =
 {
   {"major",    INSTALLVERSION_MAJOR,    JSPROP_ENUMERATE},
   {"minor",    INSTALLVERSION_MINOR,    JSPROP_ENUMERATE},
-  {"release",  INSTALLVERSION_RELEASE,  JSPROP_ENUMERATE},
+  {"release",    INSTALLVERSION_RELEASE,    JSPROP_ENUMERATE},
   {"build",    INSTALLVERSION_BUILD,    JSPROP_ENUMERATE},
   {0}
 };
@@ -473,27 +473,12 @@ static JSPropertySpec InstallVersionProperties[] =
 //
 static JSFunctionSpec InstallVersionMethods[] = 
 {
-  {"init",          InstallVersionInit,       1},
-  {"toString",      InstallVersionToString,   0},
-  {"compareTo",     InstallVersionCompareTo,  1},
+  {"init",          InstallVersionInit,     1},
+  {"toString",          InstallVersionToString,     0},
+  {"compareTo",          InstallVersionCompareTo,     1},
   {0}
 };
 
-static JSConstDoubleSpec version_constants[] = 
-{
-    { nsIDOMInstallVersion::EQUAL,                  "EQUAL"              },
-    { nsIDOMInstallVersion::BLD_DIFF,               "BLD_DIFF"           },
-    { nsIDOMInstallVersion::BLD_DIFF_MINUS,         "BLD_DIFF_MINUS"     },
-    { nsIDOMInstallVersion::REL_DIFF,               "REL_DIFF"           },
-    { nsIDOMInstallVersion::REL_DIFF_MINUS,         "REL_DIFF_MINUS"     },
-    { nsIDOMInstallVersion::MINOR_DIFF,             "MINOR_DIFF"         },
-    { nsIDOMInstallVersion::MINOR_DIFF_MINUS,       "MINOR_DIFF_MINUS"   },
-    { nsIDOMInstallVersion::MAJOR_DIFF,             "MAJOR_DIFF"         },
-    { nsIDOMInstallVersion::MAJOR_DIFF_MINUS,       "MAJOR_DIFF_MINUS"   },
-    {0}
-};
-
-
 
 //
 // InstallVersion constructor
@@ -502,20 +487,35 @@ PR_STATIC_CALLBACK(JSBool)
 InstallVersion(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
   nsresult result;
-  
+  nsIID classID;
+  nsIScriptContext* context = (nsIScriptContext*)JS_GetContextPrivate(cx);
+  nsIScriptNameSpaceManager* manager;
   nsIDOMInstallVersion *nativeThis;
   nsIScriptObjectOwner *owner = nsnull;
 
   static NS_DEFINE_IID(kIDOMInstallVersionIID, NS_IDOMINSTALLVERSION_IID);
-  static NS_DEFINE_IID(kInstallVersion_CID, NS_SoftwareUpdateInstallVersion_CID);
 
-  result = nsRepository::CreateInstance(kInstallVersion_CID,
+  result = context->GetNameSpaceManager(&manager);
+  if (NS_OK != result) {
+    return JS_FALSE;
+  }
+
+  result = manager->LookupName("InstallVersion", PR_TRUE, classID);
+  NS_RELEASE(manager);
+  if (NS_OK != result) {
+    return JS_FALSE;
+  }
+
+  result = nsRepository::CreateInstance(classID,
                                         nsnull,
                                         kIDOMInstallVersionIID,
                                         (void **)&nativeThis);
-  if (NS_OK != result) return JS_FALSE;
+  if (NS_OK != result) {
+    return JS_FALSE;
+  }
+
+  // XXX We should be calling Init() on the instance
 
-            
   result = nativeThis->QueryInterface(kIScriptObjectOwnerIID, (void **)&owner);
   if (NS_OK != result) {
     NS_RELEASE(nativeThis);
@@ -526,44 +526,9 @@ InstallVersion(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rva
   JS_SetPrivate(cx, obj, nativeThis);
 
   NS_RELEASE(owner);
-   
-  jsval ignore;
-  InstallVersionInit(cx, obj, argc, argv, &ignore);
-
   return JS_TRUE;
 }
 
-nsresult InitInstallVersionClass(JSContext *jscontext, JSObject *global, void** prototype)
-{
-  JSObject *proto = nsnull;
-
-  if (prototype != nsnull)
-    *prototype = nsnull;
-
-  proto = JS_InitClass(jscontext,     // context
-                       global,        // global object
-                       nsnull,  // parent proto 
-                       &InstallVersionClass,      // JSClass
-                       InstallVersion,            // JSNative ctor
-                       0,             // ctor args
-                       InstallVersionProperties,  // proto props
-                       InstallVersionMethods,     // proto funcs
-                       nsnull,        // ctor props (static)
-                       nsnull);       // ctor funcs (static)
-  
-  if (nsnull == proto)
-      return NS_ERROR_FAILURE;
-  
-  
-  if ( PR_FALSE == JS_DefineConstDoubles(jscontext, proto, version_constants) )
-            return NS_ERROR_FAILURE;
-  
-  if (prototype != nsnull)
-      *prototype = proto;
-  
-  return NS_OK;
-}
-
 //
 // InstallVersion class initialization
 //
@@ -572,6 +537,7 @@ nsresult NS_InitInstallVersionClass(nsIScriptContext *aContext, void **aPrototyp
   JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
   JSObject *proto = nsnull;
   JSObject *constructor = nsnull;
+  JSObject *parent_proto = nsnull;
   JSObject *global = JS_GetGlobalObject(jscontext);
   jsval vp;
 
@@ -579,23 +545,65 @@ nsresult NS_InitInstallVersionClass(nsIScriptContext *aContext, void **aPrototyp
       !JSVAL_IS_OBJECT(vp) ||
       ((constructor = JSVAL_TO_OBJECT(vp)) == nsnull) ||
       (PR_TRUE != JS_LookupProperty(jscontext, JSVAL_TO_OBJECT(vp), "prototype", &vp)) || 
-      !JSVAL_IS_OBJECT(vp)) 
-  {
-    nsresult rv = InitInstallVersionClass(jscontext, global, (void**)&proto);
-    if (NS_FAILED(rv)) return rv;
+      !JSVAL_IS_OBJECT(vp)) {
+
+    proto = JS_InitClass(jscontext,     // context
+                         global,        // global object
+                         parent_proto,  // parent proto 
+                         &InstallVersionClass,      // JSClass
+                         InstallVersion,            // JSNative ctor
+                         0,             // ctor args
+                         InstallVersionProperties,  // proto props
+                         InstallVersionMethods,     // proto funcs
+                         nsnull,        // ctor props (static)
+                         nsnull);       // ctor funcs (static)
+    if (nsnull == proto) {
+      return NS_ERROR_FAILURE;
+    }
+
+    if ((PR_TRUE == JS_LookupProperty(jscontext, global, "InstallVersion", &vp)) &&
+        JSVAL_IS_OBJECT(vp) &&
+        ((constructor = JSVAL_TO_OBJECT(vp)) != nsnull)) {
+      vp = INT_TO_JSVAL(nsIDOMInstallVersion::EQUAL);
+      JS_SetProperty(jscontext, constructor, "EQUAL", &vp);
+
+      vp = INT_TO_JSVAL(nsIDOMInstallVersion::BLD_DIFF);
+      JS_SetProperty(jscontext, constructor, "BLD_DIFF", &vp);
+
+      vp = INT_TO_JSVAL(nsIDOMInstallVersion::BLD_DIFF_MINUS);
+      JS_SetProperty(jscontext, constructor, "BLD_DIFF_MINUS", &vp);
+
+      vp = INT_TO_JSVAL(nsIDOMInstallVersion::REL_DIFF);
+      JS_SetProperty(jscontext, constructor, "REL_DIFF", &vp);
+
+      vp = INT_TO_JSVAL(nsIDOMInstallVersion::REL_DIFF_MINUS);
+      JS_SetProperty(jscontext, constructor, "REL_DIFF_MINUS", &vp);
+
+      vp = INT_TO_JSVAL(nsIDOMInstallVersion::MINOR_DIFF);
+      JS_SetProperty(jscontext, constructor, "MINOR_DIFF", &vp);
+
+      vp = INT_TO_JSVAL(nsIDOMInstallVersion::MINOR_DIFF_MINUS);
+      JS_SetProperty(jscontext, constructor, "MINOR_DIFF_MINUS", &vp);
+
+      vp = INT_TO_JSVAL(nsIDOMInstallVersion::MAJOR_DIFF);
+      JS_SetProperty(jscontext, constructor, "MAJOR_DIFF", &vp);
+
+      vp = INT_TO_JSVAL(nsIDOMInstallVersion::MAJOR_DIFF_MINUS);
+      JS_SetProperty(jscontext, constructor, "MAJOR_DIFF_MINUS", &vp);
+
+    }
+
   }
-  else if ((nsnull != constructor) && JSVAL_IS_OBJECT(vp)) 
-  {
+  else if ((nsnull != constructor) && JSVAL_IS_OBJECT(vp)) {
     proto = JSVAL_TO_OBJECT(vp);
   }
-  else 
-  {
+  else {
     return NS_ERROR_FAILURE;
   }
 
-  if (aPrototype) 
+  if (aPrototype) {
     *aPrototype = proto;
-  
+  }
   return NS_OK;
 }
 

mozilla/xpinstall/src/nsJSWinProfile.cpp

@@ -1,23 +1,19 @@
 /* -*- 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/
+ * 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 License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
+ * Software distributed under the 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 Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
+ * 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.
- *
- * Contributor(s): 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  */
 
 #include "jsapi.h"
@@ -84,7 +80,7 @@ WinProfileGetString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval
     ConvertJSValToStr(b0, cx, argv[0]);
     ConvertJSValToStr(b1, cx, argv[1]);
 
-    nativeThis->GetString(b0, b1, &nativeRet);
+    nativeThis->getString(b0, b1, &nativeRet);
 
     ConvertStrToJSVal(nativeRet, cx, rval);
   }
@@ -127,7 +123,7 @@ WinProfileWriteString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsv
     ConvertJSValToStr(b1, cx, argv[1]);
     ConvertJSValToStr(b2, cx, argv[2]);
 
-    if(NS_OK != nativeThis->WriteString(b0, b1, b2, &nativeRet))
+    if(NS_OK != nativeThis->writeString(b0, b1, b2, &nativeRet))
     {
       return JS_FALSE;
     }

mozilla/xpinstall/src/nsJSWinProfile.h

@@ -1,23 +1,19 @@
 /* -*- 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/
+ * 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 License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
+ * Software distributed under the 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 Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
+ * 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.
- *
- * Contributor(s): 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  */
 
 #ifndef __NS_JSWINPROTOTYPE_H__

mozilla/xpinstall/src/nsJSWinReg.cpp

@@ -1,23 +1,19 @@
 /* -*- 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/
+ * 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 License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
+ * Software distributed under the 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 Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
+ * 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.
- *
- * Contributor(s): 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  */
 
 #include "jsapi.h"
@@ -87,7 +83,7 @@ WinRegSetRootKey(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *r
       return JS_FALSE;
     }
 
-    if(NS_OK != nativeThis->SetRootKey(b0))
+    if(NS_OK != nativeThis->setRootKey(b0))
     {
       return JS_FALSE;
     }
@@ -131,7 +127,7 @@ WinRegCreateKey(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rv
     ConvertJSValToStr(b0, cx, argv[0]);
     ConvertJSValToStr(b1, cx, argv[1]);
 
-    if(NS_OK != nativeThis->CreateKey(b0, b1, &nativeRet))
+    if(NS_OK != nativeThis->createKey(b0, b1, &nativeRet))
     {
       return JS_FALSE;
     }
@@ -171,7 +167,7 @@ WinRegDeleteKey(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rv
 
     ConvertJSValToStr(b0, cx, argv[0]);
 
-    if(NS_OK != nativeThis->DeleteKey(b0, &nativeRet))
+    if(NS_OK != nativeThis->deleteKey(b0, &nativeRet))
     {
       return JS_FALSE;
     }
@@ -215,7 +211,7 @@ WinRegDeleteValue(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *
     ConvertJSValToStr(b0, cx, argv[0]);
     ConvertJSValToStr(b1, cx, argv[1]);
 
-    if(NS_OK != nativeThis->DeleteValue(b0, b1, &nativeRet))
+    if(NS_OK != nativeThis->deleteValue(b0, b1, &nativeRet))
     {
       return JS_FALSE;
     }
@@ -261,7 +257,7 @@ WinRegSetValueString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsva
     ConvertJSValToStr(b1, cx, argv[1]);
     ConvertJSValToStr(b2, cx, argv[2]);
 
-    if(NS_OK != nativeThis->SetValueString(b0, b1, b2, &nativeRet))
+    if(NS_OK != nativeThis->setValueString(b0, b1, b2, &nativeRet))
     {
       return JS_FALSE;
     }
@@ -283,8 +279,8 @@ WinRegSetValueString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsva
 PR_STATIC_CALLBACK(JSBool)
 WinRegGetValueString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
-  nsWinReg*    nativeThis = (nsWinReg*)JS_GetPrivate(cx, obj);
-  nsString     nativeRet;
+  nsWinReg *nativeThis = (nsWinReg*)JS_GetPrivate(cx, obj);
+  nsString* nativeRet;
   nsAutoString b0;
   nsAutoString b1;
 
@@ -304,12 +300,12 @@ WinRegGetValueString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsva
     ConvertJSValToStr(b0, cx, argv[0]);
     ConvertJSValToStr(b1, cx, argv[1]);
 
-    if(NS_OK != nativeThis->GetValueString(b0, b1, &nativeRet))
+    if(NS_OK != nativeThis->getValueString(b0, b1, &nativeRet))
     {
       return JS_FALSE;
     }
 
-    ConvertStrToJSVal(nativeRet, cx, rval);
+    *rval = INT_TO_JSVAL(nativeRet);
   }
   else
   {
@@ -320,106 +316,6 @@ WinRegGetValueString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsva
   return JS_TRUE;
 }
 
-//
-// Native method SetValueNumber
-//
-PR_STATIC_CALLBACK(JSBool)
-WinRegSetValueNumber(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsWinReg *nativeThis = (nsWinReg*)JS_GetPrivate(cx, obj);
-  PRInt32 nativeRet;
-  nsAutoString b0;
-  nsAutoString b1;
-//  nsAutoString b2;
-  PRInt32      ib2;
-
-  *rval = JSVAL_NULL;
-
-  // If there's no private data, this must be the prototype, so ignore
-  if(nsnull == nativeThis)
-  {
-    return JS_TRUE;
-  }
-
-  if(argc >= 3)
-  {
-    //  public int setValueNumber ( String subKey,
-    //                              String valueName,
-    //                              Number value);
-
-    ConvertJSValToStr(b0, cx, argv[0]);
-    ConvertJSValToStr(b1, cx, argv[1]);
-
-    if(JSVAL_IS_INT(argv[2])) 
-    {
-      ib2 = JSVAL_TO_INT(argv[2]);
-//      ConvertJSValToStr(b2, cx, argv[2]);
-    }
-    else
-    {
-      JS_ReportError(cx, "Parameter 3 must be a number");
-      return JS_FALSE;
-    }
-
-    if(NS_OK != nativeThis->SetValueNumber(b0, b1, ib2, &nativeRet))
-    {
-      return JS_FALSE;
-    }
-
-    *rval = INT_TO_JSVAL(nativeRet);
-  }
-  else
-  {
-    JS_ReportError(cx, "WinReg.SetValueNumber() parameters error");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-//
-// Native method GetValueNumber
-//
-PR_STATIC_CALLBACK(JSBool)
-WinRegGetValueNumber(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsWinReg*    nativeThis = (nsWinReg*)JS_GetPrivate(cx, obj);
-  PRInt32      nativeRet;
-  nsAutoString b0;
-  nsAutoString b1;
-
-  *rval = JSVAL_NULL;
-
-  // If there's no private data, this must be the prototype, so ignore
-  if(nsnull == nativeThis)
-  {
-    return JS_TRUE;
-  }
-
-  if(argc >= 2)                             
-  {
-    //  public int getValueNumber ( String subKey,
-    //                              Number valueName);
-
-    ConvertJSValToStr(b0, cx, argv[0]);
-    ConvertJSValToStr(b1, cx, argv[1]);
-
-    if(NS_OK != nativeThis->GetValueNumber(b0, b1, &nativeRet))
-    {
-      return JS_FALSE;
-    }
-
-    *rval = INT_TO_JSVAL(nativeRet);
-  }
-  else
-  {
-    JS_ReportError(cx, "WinReg.GetValueNumber() parameters error");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
 //
 // Native method SetValue
 //
@@ -427,7 +323,7 @@ PR_STATIC_CALLBACK(JSBool)
 WinRegSetValue(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
   nsWinReg *nativeThis = (nsWinReg*)JS_GetPrivate(cx, obj);
-//  PRInt32 nativeRet;
+  PRInt32 nativeRet;
   nsAutoString b0;
   nsAutoString b1;
 //  nsWinRegItem *b2;
@@ -453,12 +349,12 @@ WinRegSetValue(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rva
     // A way needs to be figured out to convert the JSVAL to this object type
 //    ConvertJSValToStr(b2, cx, argv[2]);
 
-//    if(NS_OK != nativeThis->SetValue(b0, b1, b2, &nativeRet))
+//    if(NS_OK != nativeThis->setValue(b0, b1, b2, &nativeRet))
 //    {
 //      return JS_FALSE;
 //    }
 
-//    *rval = INT_TO_JSVAL(nativeRet);
+    *rval = INT_TO_JSVAL(nativeRet);
   }
   else
   {
@@ -496,7 +392,7 @@ WinRegGetValue(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rva
     ConvertJSValToStr(b0, cx, argv[0]);
     ConvertJSValToStr(b1, cx, argv[1]);
 
-    if(NS_OK != nativeThis->GetValue(b0, b1, &nativeRet))
+    if(NS_OK != nativeThis->getValue(b0, b1, &nativeRet))
     {
       return JS_FALSE;
     }
@@ -512,6 +408,32 @@ WinRegGetValue(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rva
   return JS_TRUE;
 }
 
+//
+// Native method InstallObject
+//
+PR_STATIC_CALLBACK(JSBool)
+WinRegInstallObject(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsWinReg     *nativeThis = (nsWinReg*)JS_GetPrivate(cx, obj);
+  nsInstall    *nativeRet;
+  nsAutoString b0;
+  nsAutoString b1;
+
+  *rval = JSVAL_NULL;
+
+  // If there's no private data, this must be the prototype, so ignore
+  if(nsnull == nativeThis)
+  {
+    return JS_TRUE;
+  }
+
+  //  public int installObject ();
+
+  nativeRet = nativeThis->installObject();
+
+  *rval = INT_TO_JSVAL(nativeRet);
+  return JS_TRUE;
+}
 
 //
 // WinReg constructor
@@ -560,10 +482,9 @@ static JSFunctionSpec WinRegMethods[] =
   {"deleteValue",               WinRegDeleteValue,              2},
   {"setValueString",            WinRegSetValueString,           3},
   {"getValueString",            WinRegGetValueString,           2},
-  {"setValueNumber",            WinRegSetValueNumber,           3},
-  {"getValueNumber",            WinRegGetValueNumber,           2},
   {"setValue",                  WinRegSetValue,                 3},
   {"getValue",                  WinRegGetValue,                 2},
+  {"installObject",             WinRegInstallObject,            0},
   {0}
 };
 

mozilla/xpinstall/src/nsJSWinReg.h

@@ -1,23 +1,19 @@
 /* -*- 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/
+ * 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 License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
+ * Software distributed under the 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 Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
+ * 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.
- *
- * Contributor(s): 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  */
 
 #ifndef __NS_JSWINREG_H__

mozilla/xpinstall/src/nsLoggingProgressNotifier.cpp

@@ -1,33 +1,30 @@
 /* -*- 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/
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "License"); you 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.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY 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 client code, 
  * released March 31, 1998. 
  *
  * 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.
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  *
- * Contributor(s): 
+ * Contributors:
  *     Douglas Turner <dougt@netscape.com>
- *     Pierre Phaneuf <pp@ludusdesign.com>
  */
 
-#include "nsIXPINotifier.h"
+#include "nsIXPInstallProgress.h"
 #include "nsLoggingProgressNotifier.h"
 
-#include "nsInstall.h"
-
 #include "nsFileSpec.h"
 #include "nsFileStream.h"
 #include "nsSpecialSystemDirectory.h"
@@ -37,61 +34,34 @@
 
 
 nsLoggingProgressNotifier::nsLoggingProgressNotifier()
-    : mLogStream(0)
 {
-    NS_INIT_ISUPPORTS();
+    NS_INIT_REFCNT();
 }
 
 nsLoggingProgressNotifier::~nsLoggingProgressNotifier()
 {
-    if (mLogStream)
-    {
-        NS_WARN_IF_FALSE(PR_FALSE, "We're being destroyed before script finishes!");
-        mLogStream->close();
-        delete mLogStream;
-        mLogStream = 0;
-    }
 }
 
-NS_IMPL_ISUPPORTS(nsLoggingProgressNotifier, NS_GET_IID(nsIXPINotifier));
+NS_IMPL_ISUPPORTS(nsLoggingProgressNotifier, nsIXPInstallProgress::GetIID());
 
 NS_IMETHODIMP
-nsLoggingProgressNotifier::BeforeJavascriptEvaluation(const PRUnichar *URL)
+nsLoggingProgressNotifier::BeforeJavascriptEvaluation()
 {
     nsSpecialSystemDirectory logFile(nsSpecialSystemDirectory::OS_CurrentProcessDirectory);
-#ifdef XP_MAC
-    logFile += "Install Log";
-#else
-    logFile += "install.log";
-#endif
+    logFile += "Install.log";
 
     mLogStream = new nsOutputFileStream(logFile, PR_WRONLY | PR_CREATE_FILE | PR_APPEND, 0744 );
-    if (!mLogStream) 
-        return NS_ERROR_NULL_POINTER;
-
-    char* time;
-    GetTime(&time);
-
     mLogStream->seek(logFile.GetFileSize());
-
-    *mLogStream << "-------------------------------------------------------------------------------" << nsEndl;
-    *mLogStream << nsAutoCString(URL) << "  --  " << time << nsEndl;
-    *mLogStream << "-------------------------------------------------------------------------------" << nsEndl;
-    *mLogStream << nsEndl;
-
-    PL_strfree(time);
     return NS_OK;
 }
 
 NS_IMETHODIMP
-nsLoggingProgressNotifier::AfterJavascriptEvaluation(const PRUnichar *URL)
+nsLoggingProgressNotifier::AfterJavascriptEvaluation()
 {
-    if (mLogStream == nsnull) return NS_ERROR_NULL_POINTER;
-    
     char* time;
     GetTime(&time);
 
-//    *mLogStream << nsEndl;
+    *mLogStream << nsEndl;
     *mLogStream << "     Finished Installation  " << time << nsEndl << nsEndl;
 
     PL_strfree(time);
@@ -104,76 +74,51 @@ nsLoggingProgressNotifier::AfterJavascriptEvaluation(const PRUnichar *URL)
 }
 
 NS_IMETHODIMP
-nsLoggingProgressNotifier::InstallStarted(const PRUnichar *URL, const PRUnichar* UIPackageName)
+nsLoggingProgressNotifier::InstallStarted(const char* UIPackageName)
 {
-    if (mLogStream == nsnull) return NS_ERROR_NULL_POINTER;
-
-//    char* time;
-//    GetTime(&time);
-
-    nsCString name(UIPackageName);
-    nsCString uline;
-    uline.SetCapacity(name.Length());
-    for ( unsigned int i=0; i < name.Length(); ++i)
-        uline.Append('-');
-
-    *mLogStream << "     " << name.GetBuffer() << nsEndl;
-    *mLogStream << "     " << uline.GetBuffer() << nsEndl;
+    if (mLogStream == nsnull) return -1;
 
+    char* time;
+    GetTime(&time);
+    
+    *mLogStream << "---------------------------------------------------------------------------" << nsEndl;
+    *mLogStream << UIPackageName << nsEndl;    
+    *mLogStream << "---------------------------------------------------------------------------" << nsEndl;
     *mLogStream << nsEndl;
-//    *mLogStream << "     Starting Installation at " << time << nsEndl;   
-//    *mLogStream << nsEndl;
-
-
-//    PL_strfree(time);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsLoggingProgressNotifier::ItemScheduled(const PRUnichar* message )
-{
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsLoggingProgressNotifier::FinalizeProgress(const PRUnichar* message, PRInt32 itemNum, PRInt32 totNum )
-{
-    if (mLogStream == nsnull) return NS_ERROR_NULL_POINTER;
-
-    *mLogStream << "     [" << (itemNum) << "/" << totNum << "]\t" << nsAutoCString(message) << nsEndl;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsLoggingProgressNotifier::FinalStatus(const PRUnichar *URL, PRInt32 status)
-{
-    if (mLogStream == nsnull) return NS_ERROR_NULL_POINTER;
-
+    *mLogStream << "     Starting Installation at " << nsAutoCString(time) << nsEndl;   
     *mLogStream << nsEndl;
 
-    switch (status)
-    {
-    case nsInstall::SUCCESS:
-        *mLogStream << "     Install completed successfully" << nsEndl;
-        break;
 
-    case nsInstall::REBOOT_NEEDED:
-        *mLogStream << "     Install completed successfully, restart required" << nsEndl;
-        break;
+    PL_strfree(time);
+    return NS_OK;
+}
 
-    case nsInstall::ABORT_INSTALL:
-        *mLogStream << "     Install script aborted" << nsEndl;
-        break;
+NS_IMETHODIMP
+nsLoggingProgressNotifier::ItemScheduled(const char* message )
+{
+    return NS_OK;
+}
 
-    case nsInstall::USER_CANCELLED:
-        *mLogStream << "     Install cancelled by user" << nsEndl;
-        break;
+NS_IMETHODIMP
+nsLoggingProgressNotifier::InstallFinalization(const char* message, PRInt32 itemNum, PRInt32 totNum )
+{
+    if (mLogStream == nsnull) return -1;
 
-    default:
-        *mLogStream << "     Install **FAILED** with error " << status << nsEndl;
-        break;
-    }
+    *mLogStream << "     Item [" << (itemNum+1) << "/" << totNum << "]\t" << message << nsEndl;
+    return NS_OK;
+}
 
+NS_IMETHODIMP
+nsLoggingProgressNotifier::InstallAborted()
+{
+    if (mLogStream == nsnull) return -1;
+
+    char* time;
+    GetTime(&time);
+    
+    *mLogStream << "     Aborted Installation at " << time << nsEndl << nsEndl;
+
+    PL_strfree(time);
     return NS_OK;
 }
 
@@ -186,13 +131,4 @@ nsLoggingProgressNotifier::GetTime(char** aString)
     PR_FormatTimeUSEnglish(line, sizeof(line), "%m/%d/%Y %H:%M:%S", &et);
     *aString = PL_strdup(line);
 }
-
-NS_IMETHODIMP
-nsLoggingProgressNotifier::LogComment(const PRUnichar* comment)
-{
-    if (mLogStream == nsnull) return NS_ERROR_NULL_POINTER;
-
-    *mLogStream << "     ** " << nsAutoCString(comment) << nsEndl;    
-    return NS_OK;
-}
-
+    

mozilla/xpinstall/src/nsLoggingProgressNotifier.h

@@ -1,24 +1,24 @@
 /* -*- 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/
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "License"); you 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.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY 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 client code, 
  * released March 31, 1998. 
  *
  * 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.
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  *
- * Contributor(s): 
+ * Contributors:
  *     Daniel Veditz <dveditz@netscape.com>
  *     Douglas Turner <dougt@netscape.com>
  */
@@ -27,11 +27,11 @@
 #ifndef nsLoggingProgressNotifier_H__
 #define nsLoggingProgressNotifier_H__
 
-#include "nsIXPINotifier.h"
+#include "nsIXPInstallProgress.h"
 #include "nsFileStream.h"
 
 
-class nsLoggingProgressNotifier : public nsIXPINotifier
+class nsLoggingProgressNotifier : public nsIXPInstallProgress
 {
     public:
         
@@ -40,12 +40,16 @@ class nsLoggingProgressNotifier : public nsIXPINotifier
         
         NS_DECL_ISUPPORTS
 
-        // nsIXPINotifier interfaces
-        NS_DECL_NSIXPINOTIFIER
+        NS_IMETHOD BeforeJavascriptEvaluation();
+        NS_IMETHOD AfterJavascriptEvaluation();
+        NS_IMETHOD InstallStarted(const char* UIPackageName);
+        NS_IMETHOD ItemScheduled(const char* message );
+        NS_IMETHOD InstallFinalization(const char* message, PRInt32 itemNum, PRInt32 totNum );
+        NS_IMETHOD InstallAborted();
    
      private:
         void GetTime(char** aString);
         nsOutputFileStream  *mLogStream;
 };
 
-#endif
+#endif

mozilla/xpinstall/src/nsSoftwareUpdate.cpp

@@ -1,40 +1,32 @@
-
 /* -*- 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/
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "License"); you 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.
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY 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 client 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): 
- *   Pierre Phaneuf <pp@ludusdesign.com>
+ * Corporation.  Portions created by Netscape are Copyright (C) 1998
+ * Netscape Communications Corporation.  All Rights Reserved.
  */
 
 
 #include "nscore.h"
-#include "nsIGenericFactory.h"
 #include "nsIFactory.h"
 #include "nsISupports.h"
 #include "nsIComponentManager.h"
 #include "nsIServiceManager.h"
 #include "nsCOMPtr.h"
-#include "nsCRT.h"
 
 #include "nspr.h"
-#include "prlock.h"
-#include "NSReg.h"
+#include "nsVector.h"
 #include "VerReg.h"
 #include "nsSpecialSystemDirectory.h"
 
@@ -48,10 +40,10 @@
 
 #include "nsTopProgressNotifier.h"
 #include "nsLoggingProgressNotifier.h"
+#include "nsInstallProgressDialog.h"
 
 #include "nsIAppShellComponent.h"
 #include "nsIRegistry.h"
-#include "nsBuildID.h"
 
 /* For Javascript Namespace Access */
 #include "nsDOMCID.h"
@@ -77,58 +69,134 @@ static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
 static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID);
 
 static NS_DEFINE_IID(kIScriptNameSetRegistryIID, NS_ISCRIPTNAMESETREGISTRY_IID);
-static NS_DEFINE_CID(kCScriptNameSetRegistryCID, NS_SCRIPT_NAMESET_REGISTRY_CID);
+static NS_DEFINE_IID(kCScriptNameSetRegistryCID, NS_SCRIPT_NAMESET_REGISTRY_CID);
 static NS_DEFINE_IID(kIScriptExternalNameSetIID, NS_ISCRIPTEXTERNALNAMESET_IID);
 
 static NS_DEFINE_IID(kISoftwareUpdate_IID, NS_ISOFTWAREUPDATE_IID);
+static NS_DEFINE_IID(kSoftwareUpdate_CID,  NS_SoftwareUpdate_CID);
 
 static NS_DEFINE_IID(kIInstallTrigger_IID, NS_IDOMINSTALLTRIGGERGLOBAL_IID);
-static NS_DEFINE_CID(kInstallTrigger_CID, NS_SoftwareUpdateInstallTrigger_CID);
+static NS_DEFINE_IID(kInstallTrigger_CID, NS_SoftwareUpdateInstallTrigger_CID);
 
 static NS_DEFINE_IID(kIInstallVersion_IID, NS_IDOMINSTALLVERSION_IID);
-static NS_DEFINE_CID(kInstallVersion_CID, NS_SoftwareUpdateInstallVersion_CID);
-
-static NS_DEFINE_CID(knsRegistryCID, NS_REGISTRY_CID);
-
-nsSoftwareUpdate* nsSoftwareUpdate::mInstance = nsnull;
-nsIFileSpec*      nsSoftwareUpdate::mProgramDir = nsnull;
-
-#if NOTIFICATION_ENABLE
-#include "nsUpdateNotification.h"
-static NS_DEFINE_CID(kUpdateNotificationCID, NS_XPI_UPDATE_NOTIFIER_CID);
-nsIUpdateNotification*      nsSoftwareUpdate::mUpdateNotifier= nsnull;
-#endif
-
-
-nsSoftwareUpdate *
-nsSoftwareUpdate::GetInstance()
-{
-    if (mInstance == nsnull) 
-        mInstance = new nsSoftwareUpdate();
-
-    NS_IF_ADDREF(mInstance);
-    return mInstance;
-}
+static NS_DEFINE_IID(kInstallVersion_CID, NS_SoftwareUpdateInstallVersion_CID);
 
+static NS_DEFINE_IID(kProxyObjectManagerIID, NS_IPROXYEVENT_MANAGER_IID);
+static NS_DEFINE_IID(kEventQueueServiceIID, NS_IEVENTQUEUESERVICE_IID);
 
 
 nsSoftwareUpdate::nsSoftwareUpdate()
-: mInstalling(PR_FALSE),
-  mStubLockout(PR_FALSE),
-  mReg(0)
 {
+#ifdef NS_DEBUG
+    printf("XPInstall Component created\n");
+#endif
+
     NS_INIT_ISUPPORTS();
+    
+     /***************************************/
+    /* Create us a queue                   */
+    /***************************************/
+    mInstalling = nsnull;
 
-    mLock = PR_NewLock();
+    mJarInstallQueue = new nsVector();
 
+    /***************************************/
+    /* Add us to the Javascript Name Space */
+    /***************************************/
+   
+    new nsSoftwareUpdateNameSet();
+    
+    /***************************************/
+    /* Register us with NetLib             */
+    /***************************************/
+        // FIX 
+    
+    
     /***************************************/
     /* Startup the Version Registry        */
     /***************************************/
-
+    
     NR_StartupRegistry();   /* startup the registry; if already started, this will essentially be a noop */
 
     nsSpecialSystemDirectory appDir(nsSpecialSystemDirectory::OS_CurrentProcessDirectory);
     VR_SetRegDirectory( appDir.GetNativePathCString() );
+    
+    /***************************************/
+    /* Stupid Hack to test js env*/
+    /***************************************/
+    // FIX:  HACK HACK HACK!
+#if 0  
+    nsSpecialSystemDirectory jarFile(nsSpecialSystemDirectory::OS_TemporaryDirectory);
+    jarFile += "test.jar";
+    if (jarFile.Exists())
+    {
+        InstallJar(nsString(nsFileURL(jarFile)), "", "");
+    }
+#endif    
+    /***************************************/
+    /* Perform Scheduled Tasks             */
+    /***************************************/
+    
+    PR_CreateThread(PR_USER_THREAD,
+                    PerformScheduledTasks,
+                    nsnull, 
+                    PR_PRIORITY_NORMAL, 
+                    PR_GLOBAL_THREAD, 
+                    PR_UNJOINABLE_THREAD,
+                    0);  
+    
+    /***************************************/
+    /* Create a top level observer         */
+    /***************************************/
+
+    mTopLevelObserver = new nsTopProgressNotifier();
+    
+    nsLoggingProgressNotifier *logger = new nsLoggingProgressNotifier();
+    RegisterNotifier(logger);
+
+    nsIProxyObjectManager *manager;
+    nsInstallProgressDialog *dialog = new nsInstallProgressDialog();
+    nsInstallProgressDialog *proxy; 
+    nsISupports *dialogBase;
+
+    nsresult rv = dialog->QueryInterface(kISupportsIID, (void**)&dialogBase);
+
+    if (NS_SUCCEEDED(rv))
+    {
+        rv = nsServiceManager::GetService( NS_XPCOMPROXY_PROGID, 
+                                                kProxyObjectManagerIID,
+                                                (nsISupports **)&manager);
+
+        if (NS_SUCCEEDED(rv))
+        {
+            // I am assuming that the thread that starts us up is the UI thread.  this will/may break
+            // I need to make a generic way of getting at the UI event queue.
+        
+            nsIEventQueueService *eventQService;
+            rv = nsServiceManager::GetService(NS_EVENTQUEUESERVICE_PROGID, 
+                                            kEventQueueServiceIID,
+                                            (nsISupports **)&eventQService);
+
+                                
+            if (NS_SUCCEEDED(rv))
+            {
+                nsIEventQueue *eventQ;
+                eventQService->GetThreadEventQueue(PR_GetCurrentThread(), &eventQ);
+
+                PLEventQueue *plEventQ;
+                eventQ->GetPLEventQueue(&plEventQ);
+
+                rv = manager->GetProxyObject(plEventQ, nsIXPInstallProgress::GetIID(), dialogBase, PROXY_SYNC, (void**)&proxy);
+                if (NS_SUCCEEDED(rv))
+                {
+                    RegisterNotifier(proxy);
+                }
+            }
+        }
+    }
+
+    if (dialog)
+        dialog->Release();
 }
 
 
@@ -137,68 +205,67 @@ nsSoftwareUpdate::nsSoftwareUpdate()
 
 nsSoftwareUpdate::~nsSoftwareUpdate()
 {
-    PR_Lock(mLock);
+#ifdef NS_DEBUG
+    printf("*** XPInstall Component destroyed\n");
+#endif
 
-    nsInstallInfo* element;
-    for (PRInt32 i=0; i < mJarInstallQueue.Count(); i++)
+    if (mJarInstallQueue != nsnull)
     {
-        element = (nsInstallInfo*)mJarInstallQueue.ElementAt(i);
-        //FIX:  need to add to registry....
-        delete element;
+        PRUint32 i=0;
+        for (; i < mJarInstallQueue->GetSize(); i++) 
+        {
+            nsInstallInfo* element = (nsInstallInfo*)mJarInstallQueue->Get(i);
+            //FIX:  need to add to registry....
+            delete element;
+        }
+
+        mJarInstallQueue->RemoveAll();
+        delete (mJarInstallQueue);
+        mJarInstallQueue = nsnull;
     }
 
-    mJarInstallQueue.Clear();
-
-    PR_Unlock(mLock);
-    PR_DestroyLock(mLock);
-
     NR_ShutdownRegistry();
-
-    NS_IF_RELEASE( mProgramDir );
-
-    mInstance = nsnull;
 }
 
-
-//------------------------------------------------------------------------
-//  nsISupports implementation
-//------------------------------------------------------------------------
-NS_IMPL_THREADSAFE_ADDREF( nsSoftwareUpdate );
-NS_IMPL_THREADSAFE_RELEASE( nsSoftwareUpdate );
-
+NS_IMPL_ADDREF( nsSoftwareUpdate );
+NS_IMPL_RELEASE( nsSoftwareUpdate );
 
 NS_IMETHODIMP
-nsSoftwareUpdate::QueryInterface( REFNSIID anIID, void **anInstancePtr )
+nsSoftwareUpdate::QueryInterface( REFNSIID anIID, void **anInstancePtr ) 
 {
     nsresult rv = NS_OK;
     /* Check for place to return result. */
     
-    if ( !anInstancePtr )
+    if ( !anInstancePtr ) 
     {
         rv = NS_ERROR_NULL_POINTER;
-    }
-    else
+    } 
+    else 
     {
+        /* Initialize result. */
+        *anInstancePtr = 0;
         /* Check for IIDs we support and cast this appropriately. */
-        if ( anIID.Equals( NS_GET_IID(nsISoftwareUpdate) ) ) 
-            *anInstancePtr = (void*) ( (nsISoftwareUpdate*)this );
-        else if ( anIID.Equals( NS_GET_IID(nsIAppShellComponent) ) ) 
-            *anInstancePtr = (void*) ( (nsIAppShellComponent*)this );
-        else if (anIID.Equals( NS_GET_IID(nsPIXPIStubHook) ) )
-            *anInstancePtr = (void*) ( (nsPIXPIStubHook*)this );
-        else if ( anIID.Equals( kISupportsIID ) )
-            *anInstancePtr = (void*) ( (nsISupports*) (nsISoftwareUpdate*) this );
-        else
+        if ( anIID.Equals( nsISoftwareUpdate::GetIID() ) ) 
         {
-            /* Not an interface we support. */
-            *anInstancePtr = 0;
+            *anInstancePtr = (void*) ( (nsISoftwareUpdate*)this );
+            NS_ADDREF_THIS();
+        } 
+        else if ( anIID.Equals( nsIAppShellComponent::GetIID() ) ) 
+        {
+            *anInstancePtr = (void*) ( (nsIAppShellComponent*)this );
+            NS_ADDREF_THIS();
+        } 
+        else if ( anIID.Equals( kISupportsIID ) )
+        {
+            *anInstancePtr = (void*) ( (nsISupports*) (nsISoftwareUpdate*) this );
+            NS_ADDREF_THIS();
+        }
+        else 
+        {
+            /* Not an interface we support. */\
             rv = NS_NOINTERFACE;
         }
     }
-
-    if (NS_SUCCEEDED(rv))
-        NS_ADDREF_THIS();
-
     return rv;
 }
 
@@ -206,313 +273,173 @@ nsSoftwareUpdate::QueryInterface( REFNSIID anIID, void **anInstancePtr )
 NS_IMETHODIMP
 nsSoftwareUpdate::Initialize( nsIAppShellService *anAppShell, nsICmdLineService  *aCmdLineService ) 
 {
-    // Close the registry if open. We left it open through most of startup
-    // so it wouldn't get opened and closed a lot by different services
-    if (mReg) 
-        NR_RegClose(mReg);
-
-    // prevent use of nsPIXPIStubHook by browser
-    mStubLockout = PR_TRUE;
-
-    /***************************************/
-    /* Add us to the Javascript Name Space */
-    /***************************************/
-
-    RegisterNameset();
-
-    /***************************************/
-    /* Register us with NetLib             */
-    /***************************************/
-        // FIX 
-
-
-    /***************************************/
-    /* Create a top level observer         */
-    /***************************************/
-
-    nsLoggingProgressNotifier *logger = new nsLoggingProgressNotifier();
-    RegisterNotifier(logger);
+    nsresult rv;
     
-#if NOTIFICATION_ENABLE
-    /***************************************/
-    /* Create a Update notification object */
-    /***************************************/
-    NS_IF_RELEASE(mUpdateNotifier);
-
-    nsComponentManager::CreateInstance(kUpdateNotificationCID,
-                                       nsnull,
-                                       NS_GET_IID(nsIUpdateNotification),
-                                       (void**)&mUpdateNotifier);
-
-#endif
-    return NS_OK;
+    rv = nsServiceManager::RegisterService( NS_IXPINSTALLCOMPONENT_PROGID, ( (nsISupports*) (nsISoftwareUpdate*) this ) );
+    
+    return rv;
 }
 
 NS_IMETHODIMP
 nsSoftwareUpdate::Shutdown()
 {
-#if NOTIFICATION_ENABLED
-    if (mUpdateNotifier)
-    {
-        mUpdateNotifier->DisplayUpdateDialog();
-        NS_RELEASE(mUpdateNotifier);
-    }
-#endif
+    nsresult rv;
 
-    // nothing to do here. Should we UnregisterService?
-    return NS_OK;
+    rv = nsServiceManager::ReleaseService( NS_IXPINSTALLCOMPONENT_PROGID, ( (nsISupports*) (nsISoftwareUpdate*) this ) );
+    
+    return rv;
 }
 
 
 NS_IMETHODIMP 
-nsSoftwareUpdate::RegisterNotifier(nsIXPINotifier *notifier)
+nsSoftwareUpdate::RegisterNotifier(nsIXPInstallProgress *notifier)
 {
     // we are going to ignore the returned ID and enforce that once you 
     // register a notifier, you can not remove it.  This should at some
     // point be fixed.
 
-    (void) mMasterNotifier.RegisterNotifier(notifier);
+    (void) mTopLevelObserver->RegisterNotifier(notifier);
     
     return NS_OK;
 }
 
 NS_IMETHODIMP
-nsSoftwareUpdate::GetMasterNotifier(nsIXPINotifier **notifier)
+nsSoftwareUpdate::GetTopLevelNotifier(nsIXPInstallProgress **notifier)
 {
-    NS_ASSERTION(notifier, "getter has invalid return pointer");
-    if (!notifier)
-        return NS_ERROR_NULL_POINTER;
-
-    *notifier = &mMasterNotifier;
+    *notifier = mTopLevelObserver;
     return NS_OK;
 }
 
 
 NS_IMETHODIMP
-nsSoftwareUpdate::SetActiveNotifier(nsIXPINotifier *notifier)
+nsSoftwareUpdate::InstallJar(  const nsString& fromURL,
+                               const nsString& localFile, 
+                               long flags)
 {
-    mMasterNotifier.SetActiveNotifier(notifier);
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsSoftwareUpdate::InstallJar(  nsIFileSpec* aLocalFile,
-                               const PRUnichar* aURL,
-                               const PRUnichar* aArguments,
-                               long flags,
-                               nsIXPINotifier* aNotifier)
-{
-    if ( !aLocalFile )
-        return NS_ERROR_NULL_POINTER;
-
-    nsInstallInfo *info =
-        new nsInstallInfo( aLocalFile, aURL, aArguments, flags, aNotifier );
+    nsInstallInfo *installInfo = new nsInstallInfo(fromURL, localFile, flags);
+    
+    mJarInstallQueue->Add( installInfo );
     
-    if (!info)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    PR_Lock(mLock);
-    mJarInstallQueue.AppendElement( info );
-    PR_Unlock(mLock);
     RunNextInstall();
 
     return NS_OK;
 }
 
+NS_IMETHODIMP
+nsSoftwareUpdate::InstallPending(void)
+{
+    if (mInstalling || mJarInstallQueue->GetSize() > 0)
+    {
+        return 1;
+    }
+    else
+    {
+        return 0;
+    }
+}
 
 NS_IMETHODIMP
 nsSoftwareUpdate::InstallJarCallBack()
 {
-    PR_Lock(mLock);
-
-    nsInstallInfo *nextInstall = (nsInstallInfo*)mJarInstallQueue.ElementAt(0);
+    nsInstallInfo *nextInstall = (nsInstallInfo*)mJarInstallQueue->Get(0);
+    
     if (nextInstall != nsnull)
         delete nextInstall;
-
-    mJarInstallQueue.RemoveElementAt(0);
+    
+    mJarInstallQueue->Remove(0);
+    
     mInstalling = PR_FALSE;
 
-    PR_Unlock(mLock);
-
     return RunNextInstall();
-}
 
-
-NS_IMETHODIMP
-nsSoftwareUpdate::StartupTasks( PRBool *needAutoreg )
-{
-    PRBool  autoReg = PR_FALSE;
-    RKEY    xpiRoot;
-    REGERR  err;
-
-    *needAutoreg = PR_TRUE;
-
-    // First do any left-over file replacements and deletes
-
-    // NOTE: we leave the registry open until later to prevent
-    // having to load and unload it many times at startup
-
-    if ( REGERR_OK == NR_RegOpen("", &mReg) )
-    {
-        // XXX get a return val and if not all replaced autoreg again later
-        PerformScheduledTasks(mReg);
-
-        // now look for an autoreg flag left behind by XPInstall
-        err = NR_RegGetKey( mReg, ROOTKEY_COMMON, XPI_ROOT_KEY, &xpiRoot);
-        if ( err == REGERR_OK )
-        {
-            char buf[8];
-            err = NR_RegGetEntryString( mReg, xpiRoot, XPI_AUTOREG_VAL,
-                                        buf, sizeof(buf) );
-
-            if ( err == REGERR_OK && !strcmp( buf, "yes" ) )
-                autoReg = PR_TRUE;
-        }
-    }
-
-    // Also check for build number changes
-    nsresult rv;
-    PRInt32 buildID = 0;
-    nsRegistryKey idKey = 0;
-    nsCOMPtr<nsIRegistry> reg = do_GetService(knsRegistryCID,&rv);
-    if (NS_SUCCEEDED(rv))
-    {
-        rv = reg->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry);
-        if (NS_SUCCEEDED(rv))
-        {
-            rv = reg->GetSubtree(nsIRegistry::Common,XPCOM_KEY,&idKey);
-            if (NS_SUCCEEDED(rv))
-            {
-                rv = reg->GetInt( idKey, XPI_AUTOREG_VAL, &buildID );
-            }
-        }
-    }
-
-    // Autoregister if we found the XPInstall flag, the stored BuildID
-    // is not the actual BuildID, or if we couldn't get the BuildID
-    if ( autoReg || NS_FAILED(rv) || buildID != NS_BUILD_ID )
-    {
-        rv = nsComponentManager::AutoRegister(nsIComponentManager::NS_Startup,0);
-
-        if (NS_SUCCEEDED(rv))
-        {
-            *needAutoreg = PR_FALSE;
-
-            // Now store back into the registries so we don't do this again
-            if ( autoReg )
-                NR_RegSetEntryString( mReg, xpiRoot, XPI_AUTOREG_VAL, "no" );
-
-            if ( buildID != NS_BUILD_ID && idKey != 0 )
-                reg->SetInt( idKey, XPI_AUTOREG_VAL, NS_BUILD_ID );
-        }
-    }
-    else
-    {
-        //We don't need to autoreg, we're up to date
-        *needAutoreg = PR_FALSE;
-#ifdef DEBUG
-        // debug (developer) builds should always autoreg
-        *needAutoreg = PR_TRUE;
-#endif
-    }
-
-    return rv;
 }
 
 
 nsresult
 nsSoftwareUpdate::RunNextInstall()
 {
-    nsresult        rv = NS_OK;
-    nsInstallInfo*  info = nsnull;
+    if (mInstalling == PR_TRUE)
+        return NS_OK;
 
-    PR_Lock(mLock);
-    if (!mInstalling) 
+    mInstalling = PR_TRUE;
+
+    //  check to see if there is anything in our queue
+    if (mJarInstallQueue->GetSize() <= 0)
     {
-        if ( mJarInstallQueue.Count() > 0 )
-        {
-            info = (nsInstallInfo*)mJarInstallQueue.ElementAt(0);
-
-            if ( info )
-                mInstalling = PR_TRUE;
-            else 
-            {
-                // bogus elements got into the queue
-                NS_ERROR("leaks remaining nsInstallInfos, please file bug!");
-                rv = NS_ERROR_NULL_POINTER;
-                VR_Close();
-            }
-        }
-        else
-        {
-            // nothing more to do
-            VR_Close();
-        }
+        mInstalling = PR_FALSE;
+        return NS_OK;
     }
-    PR_Unlock(mLock);
-
-    // make sure to RunInstall() outside of locked section due to callbacks
-    if (info)
-        RunInstall( info );
-
-    return rv;
+    
+    nsInstallInfo *nextInstall = (nsInstallInfo*)mJarInstallQueue->Get(0);
+        
+    if (nextInstall->IsMultipleTrigger() == PR_FALSE)
+    {
+        RunInstall( nextInstall );
+    }
+    else
+    {
+        ; // should we do something different?! 
+    }
+    
+    return NS_OK;
 }
 
 
-nsresult
-nsSoftwareUpdate::RegisterNameset()
+/////////////////////////////////////////////////////////////////////////
+// 
+/////////////////////////////////////////////////////////////////////////
+static PRInt32 gSoftwareUpdateLock        = 0;
+
+nsSoftwareUpdateFactory::nsSoftwareUpdateFactory(void)
 {
-    nsresult rv;
-    nsCOMPtr<nsIScriptNameSetRegistry> namesetService = 
-        do_GetService( kCScriptNameSetRegistryCID, &rv );
-
-    if (NS_SUCCEEDED(rv))
-    {
-        nsSoftwareUpdateNameSet* nameset = new nsSoftwareUpdateNameSet();
-        // the NameSet service will AddRef this one
-        namesetService->AddExternalNameSet( nameset );
-    }
-
-    return rv;
+    NS_INIT_ISUPPORTS();
 }
 
+nsSoftwareUpdateFactory::~nsSoftwareUpdateFactory(void)
+{
+}
+
+NS_IMPL_ISUPPORTS(nsSoftwareUpdateFactory,kIFactoryIID)
 
 NS_IMETHODIMP
-nsSoftwareUpdate::StubInitialize(nsIFileSpec *aDir)
+nsSoftwareUpdateFactory::CreateInstance(nsISupports *aOuter, REFNSIID aIID, void **aResult)
 {
-    if (mStubLockout)
-        return NS_ERROR_ABORT;
-    else if ( !aDir )
-        return NS_ERROR_NULL_POINTER;
-
-    // only allow once, it could be a mess if we've already started installing
-    mStubLockout = PR_TRUE;
-
-    // fix GetFolder return path
-    mProgramDir = aDir;
-    NS_ADDREF(mProgramDir);
-
-    // make sure registry updates go to the right place
-    nsFileSpec instDir;
-    if (NS_SUCCEEDED( aDir->GetFileSpec( &instDir ) ) )
-        VR_SetRegDirectory( instDir.GetNativePathCString() );
-
-    // Create the logfile observer
-    nsLoggingProgressNotifier *logger = new nsLoggingProgressNotifier();
-    RegisterNotifier(logger);
-
-    // setup version registry path
-    char*    path;
-    nsresult rv = aDir->GetNativePath( &path );
-    if (NS_SUCCEEDED(rv))
+    if (aResult == NULL)
     {
-        VR_SetRegDirectory( path );
-        nsCRT::free( path );
+        return NS_ERROR_NULL_POINTER;
     }
 
-    return rv;
+    *aResult = NULL;
+
+    nsSoftwareUpdate *inst = new nsSoftwareUpdate();
+
+    if (inst == NULL)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    nsresult result =  inst->QueryInterface(aIID, aResult);
+
+    if (NS_FAILED(result)) 
+    {
+        *aResult = NULL;
+    }
+
+    NS_ADDREF(inst);  // Are we sure that we need to addref???
+
+    return result;
 }
 
+NS_IMETHODIMP
+nsSoftwareUpdateFactory::LockFactory(PRBool aLock)
+{
+    if (aLock)
+        PR_AtomicIncrement(&gSoftwareUpdateLock);
+    else
+        PR_AtomicDecrement(&gSoftwareUpdateLock);
+
+    return NS_OK;
+}
+
+
 
 ////////////////////////////////////////////////////////////////////////////////
 // nsSoftwareUpdateNameSet
@@ -520,7 +447,17 @@ nsSoftwareUpdate::StubInitialize(nsIFileSpec *aDir)
 
 nsSoftwareUpdateNameSet::nsSoftwareUpdateNameSet()
 {
-    NS_INIT_ISUPPORTS();
+  NS_INIT_REFCNT();
+
+  nsIScriptNameSetRegistry *scriptNameSet;
+  nsresult result = nsServiceManager::GetService(kCScriptNameSetRegistryCID,
+                                                 kIScriptNameSetRegistryIID,
+                                                (nsISupports **)&scriptNameSet);
+    if (NS_SUCCEEDED(result)) 
+    {
+        scriptNameSet->AddExternalNameSet(this);
+    }
+
 }
 
 nsSoftwareUpdateNameSet::~nsSoftwareUpdateNameSet()
@@ -570,33 +507,52 @@ nsSoftwareUpdateNameSet::AddNameSet(nsIScriptContext* aScriptContext)
 
     return result;
 }
-            
-//----------------------------------------------------------------------
 
-// Functions used to create new instances of a given object by the
-// generic factory.
+////////////////////////////////////////////////////////////////////////////////
+// DLL Entry Points:
+////////////////////////////////////////////////////////////////////////////////
 
-NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsSoftwareUpdate,nsSoftwareUpdate::GetInstance);
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsInstallTrigger);
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsInstallVersion);
-//----------------------------------------------------------------------
-
-
-
-static NS_METHOD 
-RegisterSoftwareUpdate( nsIComponentManager *aCompMgr,
-                        nsIFile *aPath,
-                        const char *registryLocation,
-                        const char *componentType)
+extern "C" NS_EXPORT PRBool
+NSCanUnload(nsISupports* aServMgr)
 {
-    // get the registry
-    nsIRegistry* registry;
-    nsresult rv = nsServiceManager::GetService(NS_REGISTRY_PROGID,
-                                               NS_GET_IID(nsIRegistry),
-                                               (nsISupports**)&registry);
+    return PR_FALSE;
+}
+
+extern "C" NS_EXPORT nsresult
+NSRegisterSelf(nsISupports* aServMgr, const char *path)
+{
+    nsresult rv;
+
+    nsCOMPtr<nsIServiceManager> servMgr(do_QueryInterface(aServMgr, &rv));
+    if (NS_FAILED(rv)) return rv;
+
+    nsIComponentManager* compMgr;
+    rv = servMgr->GetService(kComponentManagerCID, 
+                             nsIComponentManager::GetIID(), 
+                             (nsISupports**)&compMgr);
+    if (NS_FAILED(rv)) return rv;
+
+#ifdef NS_DEBUG
+    printf("*** XPInstall is being registered\n");
+#endif
+
+    rv = compMgr->RegisterComponent( kSoftwareUpdate_CID,
+                                     NS_IXPINSTALLCOMPONENT_CLASSNAME,
+                                     NS_IXPINSTALLCOMPONENT_PROGID,
+                                     path,
+                                     PR_TRUE,
+                                     PR_TRUE );
+
+    if (NS_FAILED(rv)) goto done;
+    
+    nsIRegistry *registry; 
+    rv = servMgr->GetService( NS_REGISTRY_PROGID, 
+                              nsIRegistry::GetIID(), 
+                              (nsISupports**)&registry );
+
     if ( NS_SUCCEEDED( rv ) ) 
     {
-        registry->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry);
+        registry->Open();
         char buffer[256];
         char *cid = nsSoftwareUpdate::GetCID().ToString();
         PR_snprintf( buffer,
@@ -604,52 +560,107 @@ RegisterSoftwareUpdate( nsIComponentManager *aCompMgr,
                      "%s/%s",
                      NS_IAPPSHELLCOMPONENT_KEY,
                      cid ? cid : "unknown" );
-        nsCRT::free(cid);
+        delete [] cid;
 
-        nsRegistryKey key;
+        nsIRegistry::Key key;
         rv = registry->AddSubtree( nsIRegistry::Common,
                                    buffer,
                                    &key );
-        nsServiceManager::ReleaseService(NS_REGISTRY_PROGID, registry);
+        servMgr->ReleaseService( NS_REGISTRY_PROGID, registry );
     }
+
+    rv = compMgr->RegisterComponent(kInstallTrigger_CID, NULL, NULL, path, PR_TRUE, PR_TRUE);
+    if (NS_FAILED(rv)) goto done;
+    
+    rv = compMgr->RegisterComponent(kInstallVersion_CID, NULL, NULL, path, PR_TRUE, PR_TRUE);
+  
+done:
+    (void)servMgr->ReleaseService(kComponentManagerCID, compMgr);
     return rv;
+}
+
+
+extern "C" NS_EXPORT nsresult
+NSUnregisterSelf(nsISupports* aServMgr, const char *path)
+{
+nsresult rv;
+
+    nsCOMPtr<nsIServiceManager> servMgr(do_QueryInterface(aServMgr, &rv));
+    if (NS_FAILED(rv)) return rv;
+
+    nsIComponentManager* compMgr;
+    rv = servMgr->GetService(kComponentManagerCID, 
+                             nsIComponentManager::GetIID(), 
+                             (nsISupports**)&compMgr);
+    if (NS_FAILED(rv)) return rv;
+
+#ifdef NS_DEBUG
+    printf("*** XPInstall is being unregistered\n");
+#endif
+    
+    rv = compMgr->UnregisterComponent(kSoftwareUpdate_CID, path);
+    if (NS_FAILED(rv)) goto done;
+    rv = compMgr->UnregisterComponent(kInstallTrigger_CID, path);
+    if (NS_FAILED(rv)) goto done;
+    rv = compMgr->UnregisterComponent(kInstallVersion_CID, path);
+
+  done:
+    (void)servMgr->ReleaseService(kComponentManagerCID, compMgr);
+    return rv;
+}
+
+
+
+extern "C" NS_EXPORT nsresult
+NSGetFactory(nsISupports* serviceMgr,
+             const nsCID &aClass,
+             const char *aClassName,
+             const char *aProgID,
+             nsIFactory **aFactory)
+{
+
+    if (aFactory == NULL)
+    {
+        return NS_ERROR_NULL_POINTER;
+    }
+
+    *aFactory = NULL;
+    nsISupports *inst;
+
+    
+    if (aClass.Equals(kInstallTrigger_CID) )
+    {
+        inst = new nsInstallTriggerFactory();
+    }
+    else if (aClass.Equals(kInstallVersion_CID) )
+    {
+        inst = new nsInstallVersionFactory();
+    }
+    else if (aClass.Equals(kSoftwareUpdate_CID) )
+    {
+        inst = new nsSoftwareUpdateFactory();
+    }
+    else
+    {
+        return NS_ERROR_ILLEGAL_VALUE;
+    }
+
+
+    if (inst == NULL)
+    {   
+        return NS_ERROR_OUT_OF_MEMORY;
+    }
+
+
+    nsresult res = inst->QueryInterface(kIFactoryIID, (void**) aFactory);
+
+    if (NS_FAILED(res)) 
+    {   
+        delete inst;
+    }
+
+    return res;
 
 }
 
 
-// The list of components we register
-static nsModuleComponentInfo components[] = 
-{
-    { "SoftwareUpdate Component", 
-       NS_SoftwareUpdate_CID,
-       NS_IXPINSTALLCOMPONENT_PROGID,
-       nsSoftwareUpdateConstructor,
-       RegisterSoftwareUpdate
-    },
-	   
-    { "InstallTrigger Component", 
-       NS_SoftwareUpdateInstallTrigger_CID,
-       NS_INSTALLTRIGGERCOMPONENT_PROGID, 
-       nsInstallTriggerConstructor
-    },
-    
-    { "InstallVersion Component", 
-       NS_SoftwareUpdateInstallVersion_CID,
-       NS_INSTALLVERSIONCOMPONENT_PROGID,
-       nsInstallVersionConstructor 
-    },
-
-#if NOTIFICATION_ENABLED 
-    { "XPInstall Update Notifier", 
-      NS_XPI_UPDATE_NOTIFIER_CID,
-      NS_XPI_UPDATE_NOTIFIER_PROGID, 
-      nsXPINotifierImpl::New
-    },
-#endif
-
-};
-
-
-
-NS_IMPL_NSGETMODULE("nsSoftwareUpdate", components)
-

mozilla/xpinstall/src/nsSoftwareUpdate.h

@@ -9,92 +9,47 @@
 #include "nsIFactory.h"
 #include "nsISupports.h"
 #include "nsString.h"
-#include "nsVoidArray.h"
-#include "prlock.h"
-//#include "mozreg.h"
-#include "NSReg.h"
+#include "nsVector.h"
 
 class nsInstallInfo;
 
 #include "nsIScriptExternalNameSet.h"
 #include "nsIAppShellComponent.h"
-#include "nsIXPINotifier.h"
-#include "nsPIXPIStubHook.h"
+#include "nsIXPInstallProgress.h"
 #include "nsTopProgressNotifier.h"
 
-#if NOTIFICATION_ENABLE
-#include "nsIUpdateNotification.h"
-#endif
-
-
-#define XPI_ROOT_KEY    "software/mozilla/xpinstall"
-#define XPI_AUTOREG_VAL "Autoreg"
-#define XPCOM_KEY       "software/mozilla/XPCOM"
-
-class nsSoftwareUpdate: public nsIAppShellComponent, 
-                        public nsISoftwareUpdate, 
-                        public nsPIXPIStubHook
+class nsSoftwareUpdate:  public nsIAppShellComponent, public nsISoftwareUpdate
 {
     public:
         
         NS_DEFINE_STATIC_CID_ACCESSOR( NS_SoftwareUpdate_CID );
 
-        static nsSoftwareUpdate *GetInstance();
-
-        /** GetProgramDirectory
-         *  information used within the XPI module -- not
-         *  available through any interface
-         */
-        static nsIFileSpec* GetProgramDirectory() { return mProgramDir; }
-
-        NS_DECL_ISUPPORTS
-        NS_DECL_NSIAPPSHELLCOMPONENT
-        
-        NS_IMETHOD InstallJar( nsIFileSpec* localFile,
-                               const PRUnichar* URL,
-                               const PRUnichar* arguments,
-                               long flags = 0,
-                               nsIXPINotifier* notifier = 0);  
-
-        NS_IMETHOD RegisterNotifier(nsIXPINotifier *notifier);
-        
-        NS_IMETHOD InstallJarCallBack();
-        NS_IMETHOD GetMasterNotifier(nsIXPINotifier **notifier);
-        NS_IMETHOD SetActiveNotifier(nsIXPINotifier *notifier);
-        NS_IMETHOD StartupTasks( PRBool* needAutoreg );
-
-        /** StubInitialize() is private for the Install Wizard.
-         *  The mStubLockout property makes sure this is only called
-         *  once, and is also set by the AppShellComponent initialize
-         *  so it can't be called during a normal Mozilla run
-         */
-        NS_IMETHOD StubInitialize(nsIFileSpec *dir);
-
         nsSoftwareUpdate();
         virtual ~nsSoftwareUpdate();
 
+        NS_DECL_ISUPPORTS
+        NS_DECL_IAPPSHELLCOMPONENT
+        
+        NS_IMETHOD InstallJar(const nsString& fromURL,
+                              const nsString& localFile, 
+                              long flags);  
+
+        NS_IMETHOD RegisterNotifier(nsIXPInstallProgress *notifier);
+        
+        NS_IMETHOD InstallPending(void);
+
+        NS_IMETHOD InstallJarCallBack();
+        NS_IMETHOD GetTopLevelNotifier(nsIXPInstallProgress **notifier);
+
 
     private:
-        static   nsSoftwareUpdate* mInstance;
-        static   nsIFileSpec*      mProgramDir;
-
-#if NOTIFICATION_ENABLE
-        static   nsIUpdateNotification *mUpdateNotifier;
-#endif
         
         nsresult RunNextInstall();
-        nsresult RegisterNameset();
+        nsresult DeleteScheduledNodes();
         
-        PRLock*           mLock;
         PRBool            mInstalling;
-        PRBool            mStubLockout;
-        nsVoidArray       mJarInstallQueue;
-        nsTopProgressNotifier   mMasterNotifier;
-
-        HREG              mReg;
-        
-        
-
+        nsVector*         mJarInstallQueue;
+        nsTopProgressNotifier   *mTopLevelObserver;
 };
 
 
@@ -104,11 +59,19 @@ class nsSoftwareUpdateNameSet : public nsIScriptExternalNameSet
         nsSoftwareUpdateNameSet();
         virtual ~nsSoftwareUpdateNameSet();
 
-        // nsISupports
         NS_DECL_ISUPPORTS
-
-        // nsIScriptExternalNameSet
-        NS_IMETHOD InitializeClasses(nsIScriptContext* aScriptContext);
-        NS_IMETHOD AddNameSet(nsIScriptContext* aScriptContext);
+            NS_IMETHOD InitializeClasses(nsIScriptContext* aScriptContext);
+            NS_IMETHOD AddNameSet(nsIScriptContext* aScriptContext);
 };
-#endif
+
+#define AUTOUPDATE_ENABLE_PREF     "autoupdate.enabled"
+#define AUTOUPDATE_CONFIRM_PREF    "autoupdate.confirm_install"
+#define CHARSET_HEADER             "Charset"
+#define CONTENT_ENCODING_HEADER    "Content-encoding"
+#define INSTALLER_HEADER           "Install-Script"
+#define MOCHA_CONTEXT_PREFIX       "autoinstall:"
+#define REG_SOFTUPDT_DIR           "Netscape/Communicator/SoftwareUpdate/"
+#define LAST_REGPACK_TIME          "LastRegPackTime"
+
+
+#endif

mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp

@@ -1,24 +1,24 @@
 /* -*- 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/
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "License"); you 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.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY 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 client code, 
  * released March 31, 1998. 
  *
  * 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.
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  *
- * Contributor(s): 
+ * Contributors:
  *     Daniel Veditz <dveditz@netscape.com>
  *     Douglas Turner <dougt@netscape.com>
  */
@@ -28,6 +28,7 @@
 #include "nsSoftwareUpdateIIDs.h"
 
 #include "nsInstall.h"
+#include "zipfile.h"
 
 #include "nsRepository.h"
 #include "nsIServiceManager.h"
@@ -39,33 +40,35 @@
 #include "jsapi.h"
 
 #include "nsIEventQueueService.h"
-#include "nsIEnumerator.h"
-#include "nsIZipReader.h"
-#include "nsIJSRuntimeService.h"
-#include "nsCOMPtr.h"
 
-#include "nsIEventQueueService.h"
-#include "nsILocalFile.h"
 
-static NS_DEFINE_CID(kSoftwareUpdateCID,  NS_SoftwareUpdate_CID);
-static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
+static NS_DEFINE_IID(kISoftwareUpdateIID, NS_ISOFTWAREUPDATE_IID);
+static NS_DEFINE_IID(kSoftwareUpdateCID,  NS_SoftwareUpdate_CID);
 
-extern JSObject *InitXPInstallObjects(JSContext *jscontext, JSObject *global, const nsFileSpec& jarfile, const PRUnichar* url, const PRUnichar* args, nsIZipReader* hZip);
-extern nsresult InitInstallVersionClass(JSContext *jscontext, JSObject *global, void** prototype);
-extern nsresult InitInstallTriggerGlobalClass(JSContext *jscontext, JSObject *global, void** prototype);
+
+
+
+static JSClass global_class = 
+{
+    "global", JSCLASS_HAS_PRIVATE,
+    JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,  JS_PropertyStub,
+    JS_EnumerateStub, JS_ResolveStub,   JS_ConvertStub,   JS_FinalizeStub
+};
+
+
+extern PRInt32 InitXPInstallObjects(JSContext *jscontext, JSObject *global, const char* jarfile, const char* args);
 
 // Defined in this file:
 static void     XPInstallErrorReporter(JSContext *cx, const char *message, JSErrorReport *report);
-static PRInt32  GetInstallScriptFromJarfile(nsIZipReader* hZip, nsFileSpec& jarFile, char** scriptBuffer, PRUint32 *scriptLength);
-static nsresult SetupInstallContext(nsIZipReader* hZip, const nsFileSpec& jarFile, const PRUnichar* url, const PRUnichar* args, JSRuntime *jsRT, JSContext **jsCX, JSObject **jsGlob);
+static nsresult GetInstallScriptFromJarfile(const char* jarFile, char** scriptBuffer, PRUint32 *scriptLength);
+static nsresult SetupInstallContext(const char* jarFile, const char* args, JSRuntime **jsRT, JSContext **jsCX, JSObject **jsGlob);
 
 extern "C" void RunInstallOnThread(void *data);
 
-
 ///////////////////////////////////////////////////////////////////////////////////////////////
-// Function name    : XPInstallErrorReporter
-// Description      : Prints error message to stdout
-// Return type      : void
+// Function name	: XPInstallErrorReporter
+// Description	    : Prints error message to stdout
+// Return type		: void
 // Argument         : JSContext *cx
 // Argument         : const char *message
 // Argument         : JSErrorReport *report
@@ -78,31 +81,31 @@ XPInstallErrorReporter(JSContext *cx, const char *message, JSErrorReport *report
     fputs("xpinstall: ", stderr);
     if (!report) 
     {
-        fprintf(stderr, "%s\n", message);
-        return;
+		fprintf(stderr, "%s\n", message);
+		return;
     }
 
     if (report->filename)
-        fprintf(stderr, "%s, ", report->filename);
+		fprintf(stderr, "%s, ", report->filename);
     if (report->lineno)
-        fprintf(stderr, "line %u: ", report->lineno);
+		fprintf(stderr, "line %u: ", report->lineno);
     fputs(message, stderr);
     if (!report->linebuf) 
     {
-        putc('\n', stderr);
-        return;
+		putc('\n', stderr);
+		return;
     }
 
     fprintf(stderr, ":\n%s\n", report->linebuf);
     n = report->tokenptr - report->linebuf;
     for (i = j = 0; i < n; i++) {
-        if (report->linebuf[i] == '\t') {
-            for (k = (j + 8) & ~7; j < k; j++)
-                putc('.', stderr);
-            continue;
-        }
-        putc('.', stderr);
-        j++;
+		if (report->linebuf[i] == '\t') {
+			for (k = (j + 8) & ~7; j < k; j++)
+				putc('.', stderr);
+			continue;
+		}
+		putc('.', stderr);
+		j++;
     }
     fputs("^\n", stderr);
 }
@@ -112,135 +115,126 @@ XPInstallErrorReporter(JSContext *cx, const char *message, JSErrorReport *report
 
 
 ///////////////////////////////////////////////////////////////////////////////////////////////
-// Function name    : GetInstallScriptFromJarfile
-// Description      : Extracts and reads in a install.js file from a passed jar file.
-// Return type      : static PRInt32 
-// Argument         : const char* jarFile     - **NSPR** filepath
+// Function name	: GetInstallScriptFromJarfile
+// Description	    : Extracts and reads in a install.js file from a passed jar file.
+// Return type		: static nsresult 
+// Argument         : const char* jarFile     - native filepath
 // Argument         : char** scriptBuffer     - must be deleted via delete []
 // Argument         : PRUint32 *scriptLength
 ///////////////////////////////////////////////////////////////////////////////////////////////
 
-static PRInt32
-GetInstallScriptFromJarfile(nsIZipReader* hZip, nsFileSpec& jarFile, char** scriptBuffer, PRUint32 *scriptLength)
+static nsresult 
+GetInstallScriptFromJarfile(const char* jarFile, char** scriptBuffer, PRUint32 *scriptLength)
 {
-    PRInt32 result = NS_OK;
+    // Open the jarfile.
+    void* hZip;
     
     *scriptBuffer = nsnull;
     *scriptLength = 0;
 
-    nsCOMPtr<nsILocalFile> jFile;
-    nsresult rv = NS_NewLocalFile(jarFile, getter_AddRefs(jFile));
-    if (NS_SUCCEEDED(rv))
-      rv = hZip->Init(jFile);
+    nsresult rv = ZIP_OpenArchive(jarFile ,  &hZip);
+    
+    if (rv != ZIP_OK)
+        return rv;
 
-    if (NS_FAILED(rv))
-        return nsInstall::CANT_READ_ARCHIVE;
-
-    rv = hZip->Open();
-    if (NS_FAILED(rv))
-        return nsInstall::CANT_READ_ARCHIVE;
 
+    // Read manifest file for Install Script filename.
+    //FIX:  need to do.
+    
     // Extract the install.js file to the temporary directory
     nsSpecialSystemDirectory installJSFileSpec(nsSpecialSystemDirectory::OS_TemporaryDirectory);
     installJSFileSpec += "install.js";
     installJSFileSpec.MakeUnique();
 
     // Extract the install.js file.
-    nsCOMPtr<nsILocalFile> iFile;
-    rv = NS_NewLocalFile(installJSFileSpec, getter_AddRefs(iFile));
-    if (NS_SUCCEEDED(rv))
-      rv = hZip->Extract("install.js", iFile);
-    if ( NS_SUCCEEDED(rv) )
+    rv  = ZIP_ExtractFile( hZip, "install.js", nsNSPRPath(installJSFileSpec) );
+    if (rv != ZIP_OK)
     {
-        // Read it into a buffer
-        char* buffer;
-        PRUint32 bufferLength;
-        PRUint32 readLength;
-        result = nsInstall::CANT_READ_ARCHIVE;
+        ZIP_CloseArchive(&hZip);
+        return rv;
+    }
+    
+    // Read it into a buffer
+    char* buffer;
+    PRUint32 bufferLength;
+    PRUint32 readLength;
 
-        nsInputFileStream fileStream(installJSFileSpec);
-        nsCOMPtr<nsIInputStream> instream = fileStream.GetIStream();
+    nsInputFileStream fileStream(installJSFileSpec);
+    (fileStream.GetIStream())->GetLength(&bufferLength);
+    buffer = new char[bufferLength + 1];
 
-        if ( instream )
-        {
-            instream->Available(&bufferLength);
-            buffer = new char[bufferLength + 1];
+    rv = (fileStream.GetIStream())->Read(buffer, bufferLength, &readLength);
 
-            if (buffer != nsnull)
-            {
-                rv = instream->Read(buffer, bufferLength, &readLength);
-
-                if (NS_SUCCEEDED(rv) && readLength > 0)
-                {
-                    *scriptBuffer = buffer;
-                    *scriptLength = readLength;
-                    result = NS_OK;
-                }
-                else
-                {
-                    delete [] buffer;
-                }
-            }
-
-            fileStream.close();
-        }
-
-        installJSFileSpec.Delete(PR_FALSE);
+    if (NS_SUCCEEDED(rv))
+    {
+        *scriptBuffer = buffer;
+        *scriptLength = readLength;
     }
     else
     {
-        result = nsInstall::NO_INSTALL_SCRIPT;
+        delete [] buffer;
     }
 
-    return result;   
+    ZIP_CloseArchive(&hZip);
+    fileStream.close();
+    installJSFileSpec.Delete(PR_FALSE);
+        
+    return rv;   
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////
-// Function name    : SetupInstallContext
-// Description      : Creates a Javascript context and adds our xpinstall objects to it.
-// Return type      : static nsresult
-// Argument         : nsIZipReader hZip - the handle to the open archive file
+// Function name	: SetupInstallContext
+// Description	    : Creates a Javascript runtime and adds our xpinstall objects to it.
+// Return type		: static nsresult
 // Argument         : const char* jarFile - native filepath to where jar exists on disk 
-// Argument         : const PRUnichar* url  - URL of where this package came from
-// Argument         : const PRUnichar* args    - any arguments passed into the javascript context
-// Argument         : JSRuntime *jsRT    - A valid JS Runtime
-// Argument         : JSContext **jsCX   - Created context, destroy via JS_DestroyContext
-// Argument         : JSObject **jsGlob  - created global object
+// Argument         : const char* args    - any arguments passed into the javascript context
+// Argument         : JSRuntime **jsRT   - Must be deleted via JS_DestroyRuntime
+// Argument         : JSContext **jsCX   - Must be deleted via JS_DestroyContext
+// Argument         : JSObject **jsGlob
 ///////////////////////////////////////////////////////////////////////////////////////////////
-static nsresult SetupInstallContext(nsIZipReader* hZip,
-                                    const nsFileSpec& jarFile,
-                                    const PRUnichar* url,
-                                    const PRUnichar* args, 
-                                    JSRuntime *rt, 
+static nsresult SetupInstallContext(const char* jarFile, 
+                                    const char* args, 
+                                    JSRuntime **jsRT, 
                                     JSContext **jsCX, 
                                     JSObject **jsGlob)
 {
-    JSContext   *cx;
+    JSRuntime   *rt;
+	JSContext   *cx;
     JSObject    *glob;
     
+    *jsRT   = nsnull;
     *jsCX   = nsnull;
     *jsGlob = nsnull;
 
-    if (!rt) 
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    cx = JS_NewContext(rt, 8192);
-    if (!cx)
+    // JS init
+	rt = JS_Init(8L * 1024L * 1024L);
+	if (!rt)
     {
-        return NS_ERROR_OUT_OF_MEMORY;
+        return -1;
+    }
+
+    // new context
+    cx = JS_NewContext(rt, 8192);
+	if (!rt)
+    {
+        return -1;
     }
 
     JS_SetErrorReporter(cx, XPInstallErrorReporter);
 
-
-    glob = InitXPInstallObjects(cx, nsnull, jarFile, url, args, hZip);
+    // new global object
+    glob = JS_NewObject(cx, &global_class, nsnull, nsnull);
+	
     // Init standard classes
     JS_InitStandardClasses(cx, glob);
 
     // Add our Install class to this context
-    InitInstallVersionClass(cx, glob, nsnull);
-    InitInstallTriggerGlobalClass(cx, glob, nsnull);
+    InitXPInstallObjects(cx, glob, jarFile, args);
 
+    // Fix:  We have to add Version and Trigger to this context!!
+    
+    
+    *jsRT   = rt;
     *jsCX   = cx;
     *jsGlob = glob;
 
@@ -258,7 +252,7 @@ static nsresult SetupInstallContext(nsIZipReader* hZip,
 ///////////////////////////////////////////////////////////////////////////////////////////////
 PRInt32 RunInstall(nsInstallInfo *installInfo)
 {   
-    if (installInfo->GetFlags() & XPI_NO_NEW_THREAD)
+    if (installInfo->GetFlags() == 0x00000001)
     {
         RunInstallOnThread((void *)installInfo);
     }
@@ -288,161 +282,81 @@ extern "C" void RunInstallOnThread(void *data)
 {
     nsInstallInfo *installInfo = (nsInstallInfo*)data;
     
-    char        *scriptBuffer = nsnull;
+    char        *scriptBuffer;
     PRUint32    scriptLength;
 
     JSRuntime   *rt;
-    JSContext   *cx;
+	JSContext   *cx;
     JSObject    *glob;
-
-    nsCOMPtr<nsIZipReader> hZip;
-
-    static NS_DEFINE_IID(kIZipReaderIID, NS_IZIPREADER_IID);
-    static NS_DEFINE_IID(kZipReaderCID,  NS_ZIPREADER_CID);
-    nsresult rv = nsComponentManager::CreateInstance(kZipReaderCID, nsnull, kIZipReaderIID, 
-                                                     getter_AddRefs(hZip));
-
-    if (NS_FAILED(rv))
-        return;
-
-    // we will plan on sending a failure status back from here unless we
-    // find positive acknowledgement that the script sent the status
-    PRInt32     finalStatus;
-    PRBool      sendStatus = PR_TRUE;
-
-    nsIXPINotifier *notifier;
-
-    // lets set up an eventQ so that our xpcom/proxies will not have to:
-    nsCOMPtr<nsIEventQueue> eventQ;
-    NS_WITH_SERVICE(nsIEventQueueService, eventQService, kEventQueueServiceCID, &rv);
-    if (NS_SUCCEEDED(rv)) 
-    {   
-        eventQService->CreateThreadEventQueue();
-        eventQService->GetThreadEventQueue(NS_CURRENT_THREAD, getter_AddRefs(eventQ));
-    }
-
-    NS_WITH_SERVICE(nsISoftwareUpdate, softwareUpdate, kSoftwareUpdateCID, &rv );
-
-    if (!NS_SUCCEEDED(rv))
-    {
-        NS_WARNING("shouldn't have RunInstall() if we can't get SoftwareUpdate");
-        return;
-    }
-
-    softwareUpdate->SetActiveNotifier( installInfo->GetNotifier() );
-    softwareUpdate->GetMasterNotifier(&notifier);
     
-    nsString url;
-    installInfo->GetURL(url);
+    nsISoftwareUpdate *softwareUpdate;
 
+    nsresult rv = nsServiceManager::GetService( kSoftwareUpdateCID, 
+                                                kISoftwareUpdateIID,
+                                                (nsISupports**)&softwareUpdate);
+    
+    nsIXPInstallProgress *notifier;
+
+    if (NS_SUCCEEDED(rv))
+    {
+        softwareUpdate->GetTopLevelNotifier(&notifier);
+    }
+    else
+    {
+        return;
+    }
+    
     if(notifier)
-        notifier->BeforeJavascriptEvaluation( url.GetUnicode() );
+        notifier->BeforeJavascriptEvaluation();
+    
     
     nsString args;
     installInfo->GetArguments(args);
 
-    nsFileSpec jarpath;
-    rv = installInfo->GetLocalFile(jarpath);
-    if (NS_SUCCEEDED(rv))
-	{
-        finalStatus = GetInstallScriptFromJarfile( hZip,
-                                                   jarpath,
-                                                   &scriptBuffer, 
-                                                   &scriptLength);
 
-        if ( finalStatus == NS_OK && scriptBuffer )
-        {
-            PRBool ownRuntime = PR_FALSE;
-
-            NS_WITH_SERVICE(nsIJSRuntimeService, rtsvc, "nsJSRuntimeService", &rv);
-            if(NS_FAILED(rv) || NS_FAILED(rtsvc->GetRuntime(&rt)))
-            {
-                // service not available (wizard context?)
-                // create our own runtime
-                ownRuntime = PR_TRUE;
-	            rt = JS_Init(4L * 1024L * 1024L);
-            }
-
-            rv = SetupInstallContext( hZip, jarpath, 
-                                      url.GetUnicode(),
-                                      args.GetUnicode(), 
-                                      rt, &cx, &glob);
-
-            if (NS_SUCCEEDED(rv))
-            {
-                // Go ahead and run!!
-                jsval rval;
-                jsval installedFiles;
-
-                PRBool ok = JS_EvaluateScript(  cx, 
-                                                glob,
-                                                scriptBuffer, 
-                                                scriptLength,
-                                                nsnull,
-                                                0,
-                                                &rval);
-
-
-                if(!ok)
-                {
-                    // problem compiling or running script
-                    if(JS_GetProperty(cx, glob, "_installedFiles", &installedFiles) &&
-                       JSVAL_TO_BOOLEAN(installedFiles))
-                    {
-                        nsInstall *a = (nsInstall*)JS_GetPrivate(cx, glob);
-                        a->InternalAbort(nsInstall::SCRIPT_ERROR);
-                    }
-
-                    finalStatus = nsInstall::SCRIPT_ERROR;
-                }
-                else
-                {
-                    // check to make sure the script sent back a status
-                    jsval sent;
-
-                    if(JS_GetProperty(cx, glob, "_installedFiles", &installedFiles) &&
-                       JSVAL_TO_BOOLEAN(installedFiles))
-                    {
-                      nsInstall *a = (nsInstall*)JS_GetPrivate(cx, glob);
-                      a->InternalAbort(nsInstall::SCRIPT_ERROR);
-                    }
-
-                    if ( JS_GetProperty( cx, glob, "_statusSent", &sent ) &&
-                         JSVAL_TO_BOOLEAN(sent) )
-                        sendStatus = PR_FALSE;
-                    else
-                        finalStatus = nsInstall::SCRIPT_ERROR;
-                }
-
-                JS_DestroyContext(cx);
-            }
-            else
-            {
-                // couldn't initialize install context
-                finalStatus = nsInstall::UNEXPECTED_ERROR;
-            }
-
-            // clean up Runtime if we created it ourselves
-            if ( ownRuntime ) 
-                JS_DestroyRuntime(rt);
-        }
-    }
-    else 
+    rv = GetInstallScriptFromJarfile( nsAutoCString( installInfo->GetLocalFile() ), 
+                                      &scriptBuffer, 
+                                      &scriptLength);
+    
+    if (NS_FAILED(rv) || scriptBuffer == nsnull)
     {
-        // no path to local jar archive
-        finalStatus = nsInstall::DOWNLOAD_ERROR;
+        goto bail;
     }
 
-    if(notifier) 
+    
+
+    rv = SetupInstallContext(   nsAutoCString( installInfo->GetLocalFile() ), 
+                                nsAutoCString( args ), 
+                                &rt, &cx, &glob);
+    if (NS_FAILED(rv))
     {
-        if ( sendStatus )
-            notifier->FinalStatus( url.GetUnicode(), finalStatus );
-
-        notifier->AfterJavascriptEvaluation( url.GetUnicode() );
+        delete [] scriptBuffer;
+        goto bail;
     }
+    
+    // Go ahead and run!!
+    jsval rval;
 
-    if (scriptBuffer) delete [] scriptBuffer;
+    JS_EvaluateScript(cx, 
+                      glob,
+		              scriptBuffer, 
+                      scriptLength,
+                      nsnull,
+                      0,
+		              &rval);
+        
+    
+    
+    delete [] scriptBuffer;
+    
+    JS_DestroyContext(cx);
+	JS_DestroyRuntime(rt);
+	          
 
-    softwareUpdate->SetActiveNotifier(0);
+    if(notifier)
+        notifier->AfterJavascriptEvaluation();
+
+
+bail:
     softwareUpdate->InstallJarCallBack();
 }

mozilla/xpinstall/src/nsSoftwareUpdateStream.cpp

@@ -0,0 +1,162 @@
+/* -*- 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 "License"); you 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 Communicator client 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.
+ */
+
+#include "nsSoftwareUpdateStream.h"
+#include "nscore.h"
+#include "nsFileSpec.h"
+#include "nsVector.h"
+
+#include "nsISupports.h"
+#include "nsIServiceManager.h"
+
+#include "nsIURL.h"
+#include "nsINetlibURL.h"
+#include "nsINetService.h"
+#include "nsIInputStream.h"
+#include "nsIStreamListener.h"
+
+#include "nsISoftwareUpdate.h"
+#include "nsSoftwareUpdateIIDs.h"
+
+
+static NS_DEFINE_IID(kISoftwareUpdateIID, NS_ISOFTWAREUPDATE_IID);
+static NS_DEFINE_IID(kSoftwareUpdateCID,  NS_SoftwareUpdate_CID);
+
+
+nsSoftwareUpdateListener::nsSoftwareUpdateListener(const nsString& fromURL, const nsString& localFile, long flags)
+{
+    NS_INIT_REFCNT();
+    
+    mFromURL    = fromURL;
+    mLocalFile  = localFile;
+    mFlags      = flags;
+
+    mOutFileDesc = PR_Open(nsAutoCString(localFile),  PR_CREATE_FILE | PR_RDWR, 0744);
+    
+    if(mOutFileDesc == NULL)
+    {
+        mResult = -1;
+    };
+
+    mResult = nsServiceManager::GetService(  kSoftwareUpdateCID, 
+                                             kISoftwareUpdateIID,
+                                             (nsISupports**)&mSoftwareUpdate);
+    
+    if (NS_FAILED(mResult))
+        return;
+
+    nsIURL  *pURL  = nsnull;
+    mResult = NS_NewURL(&pURL, fromURL);
+
+    if (NS_FAILED(mResult)) 
+        return;
+ 
+    mResult = NS_OpenURL(pURL, this);
+}
+
+nsSoftwareUpdateListener::~nsSoftwareUpdateListener()
+{    
+    mSoftwareUpdate->Release();
+}
+
+
+NS_IMPL_ISUPPORTS( nsSoftwareUpdateListener, kIStreamListenerIID )
+
+NS_IMETHODIMP
+nsSoftwareUpdateListener::GetBindInfo(nsIURL* aURL, nsStreamBindingInfo* info)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSoftwareUpdateListener::OnProgress( nsIURL* aURL,
+                          PRUint32 Progress,
+                          PRUint32 ProgressMax)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSoftwareUpdateListener::OnStatus(nsIURL* aURL, 
+                       const PRUnichar* aMsg)
+{ 
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSoftwareUpdateListener::OnStartBinding(nsIURL* aURL, 
+                             const char *aContentType)
+{
+  return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSoftwareUpdateListener::OnStopBinding(nsIURL* aURL,
+                                        nsresult status,
+                                        const PRUnichar* aMsg)
+{
+    switch( status ) 
+    {
+
+        case NS_BINDING_SUCCEEDED:
+                PR_Close(mOutFileDesc);
+                mSoftwareUpdate->InstallJar(mFromURL,
+                                            mLocalFile,
+                                            mFlags );
+            break;
+
+        case NS_BINDING_FAILED:
+        case NS_BINDING_ABORTED:
+            mResult = status;
+            PR_Close(mOutFileDesc);
+            break;
+
+        default:
+            mResult = NS_ERROR_ILLEGAL_VALUE;
+    }
+
+    return mResult;
+}
+
+#define BUF_SIZE 1024
+
+NS_IMETHODIMP
+nsSoftwareUpdateListener::OnDataAvailable(nsIURL* aURL, nsIInputStream *pIStream, PRUint32 length)
+{
+    PRUint32 len;
+    nsresult err;
+    char buffer[BUF_SIZE];
+    
+    do 
+    {
+        err = pIStream->Read(buffer, BUF_SIZE, &len);
+        
+        if (mResult == 0 && err == 0)
+        {
+            if ( PR_Write(mOutFileDesc, buffer, len) == -1 )
+            {
+                /* Error */ 
+                return -1;
+            }
+        }
+
+    } while (len > 0 && err == NS_OK);
+
+    return 0;
+}

mozilla/xpinstall/src/nsSoftwareUpdateStream.h

@@ -0,0 +1,74 @@
+/* -*- 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.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.
+ */
+
+#ifndef _NS_SOFTWAREUPDATESTREAM_H__
+#define _NS_SOFTWAREUPDATESTREAM_H__
+
+#include "nsInstall.h"
+
+#include "nscore.h"
+#include "nsISupports.h"
+#include "nsString.h"
+
+#include "nsIURL.h"
+#include "nsINetlibURL.h"
+#include "nsINetService.h"
+#include "nsIInputStream.h"
+#include "nsIStreamListener.h"
+
+#include "nsISoftwareUpdate.h"
+
+static NS_DEFINE_IID(kInetServiceIID, NS_INETSERVICE_IID);
+static NS_DEFINE_IID(kInetServiceCID, NS_NETSERVICE_CID);
+static NS_DEFINE_IID(kInetLibURLIID, NS_INETLIBURL_IID);
+static NS_DEFINE_IID(kIStreamListenerIID, NS_ISTREAMLISTENER_IID);
+
+class nsSoftwareUpdateListener : public nsIStreamListener
+{
+    public:
+        NS_DECL_ISUPPORTS
+    
+        nsSoftwareUpdateListener(const nsString& fromURL, const nsString& localFile, long flags);
+
+        NS_IMETHOD GetBindInfo(nsIURL* aURL, nsStreamBindingInfo* info);
+        NS_IMETHOD OnProgress(nsIURL* aURL, PRUint32 Progress, PRUint32 ProgressMax);
+        NS_IMETHOD OnStatus(nsIURL* aURL, const PRUnichar* aMsg);
+        NS_IMETHOD OnStartBinding(nsIURL* aURL, const char *aContentType);
+        NS_IMETHOD OnDataAvailable(nsIURL* aURL, nsIInputStream *pIStream, PRUint32 length);
+        NS_IMETHOD OnStopBinding(nsIURL* aURL, nsresult status, const PRUnichar* aMsg);
+        
+        
+
+
+    protected:
+        virtual ~nsSoftwareUpdateListener();
+
+
+    private:
+
+          nsISoftwareUpdate *mSoftwareUpdate;
+          PRFileDesc        *mOutFileDesc;
+          
+          nsString           mFromURL;
+          nsString           mLocalFile;
+          long               mFlags;
+
+          PRInt32            mResult;
+};
+
+#endif

mozilla/xpinstall/src/nsTopProgressNotifier.cpp

@@ -1,91 +1,81 @@
 /* -*- 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/
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "License"); you 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.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY 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 client code, 
  * released March 31, 1998. 
  *
  * 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.
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  *
- * Contributor(s): 
+ * Contributors:
  *     Douglas Turner <dougt@netscape.com>
- *     Daniel Veditz <dveditz@netscape.com>
- *     Pierre Phaneuf <pp@ludusdesign.com>
  */
 
-#include "nsIXPINotifier.h"
+#include "nsIXPInstallProgress.h"
 #include "nsTopProgressNotifier.h"
 
 nsTopProgressNotifier::nsTopProgressNotifier()
 {
-    NS_INIT_ISUPPORTS();
-    mNotifiers = new nsVoidArray();
-    mActive = 0;
+    mNotifiers = new nsVector();
 }
 
 nsTopProgressNotifier::~nsTopProgressNotifier()
 {
     if (mNotifiers)
     {
-        PRInt32 i=0;
-        for (; i < mNotifiers->Count(); i++) 
+        PRUint32 i=0;
+        for (; i < mNotifiers->GetSize(); i++) 
         {
-            nsIXPINotifier* element = (nsIXPINotifier*)mNotifiers->ElementAt(i);
-            NS_IF_RELEASE(element);
+            nsIXPInstallProgress* element = (nsIXPInstallProgress*)mNotifiers->Get(i);
+            delete element;
         }
 
-        mNotifiers->Clear();
+        mNotifiers->RemoveAll();
         delete (mNotifiers);
     }
 }
 
 
-NS_IMPL_ISUPPORTS(nsTopProgressNotifier, NS_GET_IID(nsIXPINotifier));
+NS_IMPL_ISUPPORTS(nsTopProgressNotifier, nsIXPInstallProgress::GetIID());
 
 
 long
-nsTopProgressNotifier::RegisterNotifier(nsIXPINotifier * newNotifier)
+nsTopProgressNotifier::RegisterNotifier(nsIXPInstallProgress * newNotifier)
 {
-    NS_IF_ADDREF( newNotifier );
-    return mNotifiers->AppendElement( newNotifier );
+     return mNotifiers->Add( newNotifier );
 }
 
 
 void
 nsTopProgressNotifier::UnregisterNotifier(long id)
 {
-    nsIXPINotifier *item = (nsIXPINotifier*)mNotifiers->ElementAt(id);
-    NS_IF_RELEASE(item);
-    mNotifiers->ReplaceElementAt(nsnull, id);
+     mNotifiers->Set(id, NULL);
 }
 
 
 
 NS_IMETHODIMP
-nsTopProgressNotifier::BeforeJavascriptEvaluation(const PRUnichar *URL)
+nsTopProgressNotifier::BeforeJavascriptEvaluation()
 {
-    if (mActive)
-        mActive->BeforeJavascriptEvaluation(URL);
-
     if (mNotifiers)
     {
-        PRInt32 i=0;
-        for (; i < mNotifiers->Count(); i++) 
+        PRUint32 i=0;
+        for (; i < mNotifiers->GetSize(); i++) 
         {
-            nsIXPINotifier* element = (nsIXPINotifier*)mNotifiers->ElementAt(i);
+            nsIXPInstallProgress* element = (nsIXPInstallProgress*)mNotifiers->Get(i);
             if (element != NULL)
-                element->BeforeJavascriptEvaluation(URL);
+                element->BeforeJavascriptEvaluation();
         }
     }
     
@@ -93,59 +83,51 @@ nsTopProgressNotifier::BeforeJavascriptEvaluation(const PRUnichar *URL)
 }
 
 NS_IMETHODIMP
-nsTopProgressNotifier::AfterJavascriptEvaluation(const PRUnichar *URL)
+nsTopProgressNotifier::AfterJavascriptEvaluation(void)
 {
-    if (mActive)
-        mActive->AfterJavascriptEvaluation(URL);
-
     if (mNotifiers)
     {
-        PRInt32 i=0;
-        for (; i < mNotifiers->Count(); i++) 
+        PRUint32 i=0;
+        for (; i < mNotifiers->GetSize(); i++) 
         {
-            nsIXPINotifier* element = (nsIXPINotifier*)mNotifiers->ElementAt(i);
+            nsIXPInstallProgress* element = (nsIXPInstallProgress*)mNotifiers->Get(i);
             if (element != NULL)
-                element->AfterJavascriptEvaluation(URL);
+                element->AfterJavascriptEvaluation();
         }
     }
     return NS_OK;
 }
 
 NS_IMETHODIMP
-nsTopProgressNotifier::InstallStarted(const PRUnichar *URL, const PRUnichar* UIPackageName)
+nsTopProgressNotifier::InstallStarted(const char* UIPackageName)
 {
-    if (mActive)
-        mActive->InstallStarted(URL, UIPackageName);
-
     if (mNotifiers)
     {
-        PRInt32 i=0;
-        for (; i < mNotifiers->Count(); i++) 
+        PRUint32 i=0;
+        for (; i < mNotifiers->GetSize(); i++) 
         {
-            nsIXPINotifier* element = (nsIXPINotifier*)mNotifiers->ElementAt(i);
+            nsIXPInstallProgress* element = (nsIXPInstallProgress*)mNotifiers->Get(i);
             if (element != NULL)
-                element->InstallStarted(URL, UIPackageName);
+                element->InstallStarted(UIPackageName);
         }
     }
     return NS_OK;
 }
 
 NS_IMETHODIMP
-nsTopProgressNotifier::ItemScheduled( const PRUnichar* message )
+nsTopProgressNotifier::ItemScheduled( const char* message )
 {
     long rv = 0;
 
-    if (mActive)
-        mActive->ItemScheduled( message );
-
     if (mNotifiers)
     {
-        PRInt32 i=0;
-        for (; i < mNotifiers->Count(); i++) 
+        PRUint32 i=0;
+        for (; i < mNotifiers->GetSize(); i++) 
         {
-            nsIXPINotifier* element = (nsIXPINotifier*)mNotifiers->ElementAt(i);
+            nsIXPInstallProgress* element = (nsIXPInstallProgress*)mNotifiers->Get(i);
             if (element != NULL)
-                element->ItemScheduled( message );
+                if (element->ItemScheduled( message ) != 0)
+                    rv = -1;
         }
     }
 
@@ -153,59 +135,35 @@ nsTopProgressNotifier::ItemScheduled( const PRUnichar* message )
 }
 
 NS_IMETHODIMP
-nsTopProgressNotifier::FinalizeProgress( const PRUnichar* message, PRInt32 itemNum, PRInt32 totNum )
+nsTopProgressNotifier::InstallFinalization( const char* message, PRInt32 itemNum, PRInt32 totNum )
 {
-    if (mActive)
-        mActive->FinalizeProgress( message, itemNum, totNum );
-
     if (mNotifiers)
     {
-        PRInt32 i=0;
-        for (; i < mNotifiers->Count(); i++) 
+        PRUint32 i=0;
+        for (; i < mNotifiers->GetSize(); i++) 
         {
-            nsIXPINotifier* element = (nsIXPINotifier*)mNotifiers->ElementAt(i);
+            nsIXPInstallProgress* element = (nsIXPInstallProgress*)mNotifiers->Get(i);
             if (element != NULL)
-                element->FinalizeProgress( message, itemNum, totNum );
+                element->InstallFinalization( message, itemNum, totNum );
         }
     }
     return NS_OK;
 }
 
 NS_IMETHODIMP
-nsTopProgressNotifier::FinalStatus(const PRUnichar *URL, PRInt32 status)
+nsTopProgressNotifier::InstallAborted(void)
 {
-    if (mActive)
-        mActive->FinalStatus(URL, status);
-
-    if (mNotifiers)
-    {
-        PRInt32 i=0;
-        for (; i < mNotifiers->Count(); i++) 
-        {
-            nsIXPINotifier* element = (nsIXPINotifier*)mNotifiers->ElementAt(i);
-            if (element != NULL)
-                element->FinalStatus(URL,status);
-        }
-    }
-   return NS_OK;
-}
-
-NS_IMETHODIMP
-nsTopProgressNotifier::LogComment(const PRUnichar* comment)
-{
-    if (mActive)
-        mActive->LogComment(comment);
-
    if (mNotifiers)
     {
-        PRInt32 i=0;
-        for (; i < mNotifiers->Count(); i++) 
+        PRUint32 i=0;
+        for (; i < mNotifiers->GetSize(); i++) 
         {
-            nsIXPINotifier* element = (nsIXPINotifier*)mNotifiers->ElementAt(i);
+            nsIXPInstallProgress* element = (nsIXPInstallProgress*)mNotifiers->Get(i);
             if (element != NULL)
-                element->LogComment(comment);
+                element->InstallAborted();
         }
     }
    return NS_OK;
 }
 
+

mozilla/xpinstall/src/nsTopProgressNotifier.h

@@ -1,56 +1,56 @@
 /* -*- 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/
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "License"); you 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.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY 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 client code, 
  * released March 31, 1998. 
  *
  * 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.
+ * Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  *
- * Contributor(s): 
+ * Contributors:
  *     Douglas Turner <dougt@netscape.com>
- *     Daniel Veditz <dveditz@netscape.com>
  */
 
 #ifndef nsTopProgressNotifier_h__
 #define nsTopProgressNotifier_h__
 
-#include "nsCOMPtr.h"
-#include "nsIXPINotifier.h"
-#include "nsVoidArray.h"
+#include "nsIXPInstallProgress.h"
+#include "nsVector.h"
 
 
-class nsTopProgressNotifier : public nsIXPINotifier
+class nsTopProgressNotifier : public nsIXPInstallProgress
 {
     public:
 
         nsTopProgressNotifier();
         virtual ~nsTopProgressNotifier();
 
-        long RegisterNotifier(nsIXPINotifier * newNotifier);
+        long RegisterNotifier(nsIXPInstallProgress * newNotifier);
         void UnregisterNotifier(long id);
-        void SetActiveNotifier(nsIXPINotifier *aNotifier) 
-            { mActive = aNotifier; }
 
         NS_DECL_ISUPPORTS
 
-        // implements nsIXPINotifier
-        NS_DECL_NSIXPINOTIFIER
+
+        NS_IMETHOD BeforeJavascriptEvaluation();
+        NS_IMETHOD AfterJavascriptEvaluation();
+        NS_IMETHOD InstallStarted(const char* UIPackageName);
+        NS_IMETHOD ItemScheduled(const  char* message );
+        NS_IMETHOD InstallFinalization(const char* message, PRInt32 itemNum, PRInt32 totNum );
+        NS_IMETHOD InstallAborted();
    
    private:
-        nsVoidArray     *mNotifiers;
-        nsCOMPtr<nsIXPINotifier>  mActive;
+        nsVector *mNotifiers;
 
 };
 

mozilla/xpinstall/src/nsUpdateNotification.cpp

@@ -1,645 +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 Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998-1999 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- *   Doug Turner <dougt@netscape.com>
- *   Pierre Phaneuf <pp@ludusdesign.com>
- */
-
-
-#include "nsUpdateNotification.h"
-
-#include "nsISupports.h"
-#include "nsIServiceManager.h"
-#include "nsCOMPtr.h"
-#include "nsIComponentManager.h"
-#include "nsIGenericFactory.h"
-#include "nsIRDFContainer.h"
-#include "nsIRDFDataSource.h"
-#include "nsIRDFService.h"
-#include "nsIRDFRemoteDataSource.h"
-#include "nsRDFCID.h"
-#include "nsIRDFXMLSink.h"
-
-#include "nsIPref.h"
-#include "nsISoftwareUpdate.h"
-
-#define NC_RDF_NAME	         	"http://home.netscape.com/NC-rdf#name"
-#define NC_RDF_SOURCE			"http://home.netscape.com/NC-rdf#source"
-#define NC_RDF_URL				"http://home.netscape.com/NC-rdf#url"
-#define NC_RDF_CHILD			"http://home.netscape.com/NC-rdf#child"
-
-#define NC_RDF_NOTIFICATION_ROOT	"http://home.netscape.com/NC-rdf#SoftwareNotificationRoot"
-#define NC_XPI_SOURCES              "http://home.netscape.com/NC-rdf#SoftwareUpdateDataSources"
-#define NC_XPI_PACKAGES             "http://home.netscape.com/NC-rdf#SoftwarePackages"
-
-#define NC_XPI_TITLE        "http://home.netscape.com/NC-rdf#title"
-#define NC_XPI_REGKEY       "http://home.netscape.com/NC-rdf#registryKey"
-#define NC_XPI_VERSION      "http://home.netscape.com/NC-rdf#version"
-#define NC_XPI_DESCRIPTION	"http://home.netscape.com/NC-rdf#description"
-
-static NS_DEFINE_CID(kRDFServiceCID,   NS_RDFSERVICE_CID);
-static NS_DEFINE_CID(kRDFContainerCID, NS_RDFCONTAINER_CID);
-static NS_DEFINE_IID(kPrefsIID, NS_IPREF_IID);
-static NS_DEFINE_IID(kPrefsCID,  NS_PREF_CID);
-
-
-nsIRDFResource* nsXPINotifierImpl::kXPI_NotifierSources = nsnull;
-nsIRDFResource* nsXPINotifierImpl::kXPI_NotifierPackages = nsnull;
-nsIRDFResource* nsXPINotifierImpl::kXPI_NotifierPackage_Title = nsnull;
-nsIRDFResource* nsXPINotifierImpl::kXPI_NotifierPackage_Version = nsnull;
-nsIRDFResource* nsXPINotifierImpl::kXPI_NotifierPackage_Description = nsnull;
-nsIRDFResource* nsXPINotifierImpl::kXPI_NotifierPackage_RegKey = nsnull;
-
-nsIRDFResource* nsXPINotifierImpl::kNC_NotificationRoot = nsnull;
-nsIRDFResource* nsXPINotifierImpl::kNC_Source = nsnull;
-nsIRDFResource* nsXPINotifierImpl::kNC_Name = nsnull;
-nsIRDFResource* nsXPINotifierImpl::kNC_URL = nsnull;
-nsIRDFResource* nsXPINotifierImpl::kNC_Child = nsnull;
-
-
-nsXPINotifierImpl::nsXPINotifierImpl()
-    : mRDF(nsnull)
-{
-    NS_INIT_REFCNT();
-
-    mPendingRefreshes = 0;
-
-    static NS_DEFINE_CID(kRDFInMemoryDataSourceCID, NS_RDFINMEMORYDATASOURCE_CID);
-    
-    nsComponentManager::CreateInstance(kRDFInMemoryDataSourceCID,
-                                       nsnull,
-                                       NS_GET_IID(nsISupports),
-                                       getter_AddRefs(mNotifications));
-}
-
-
-nsXPINotifierImpl::~nsXPINotifierImpl()
-{
-    if (mRDF) 
-    {
-        nsServiceManager::ReleaseService(kRDFServiceCID, mRDF);
-        mRDF = nsnull;
-    }
-
-    NS_IF_RELEASE(kXPI_NotifierSources);
-    NS_IF_RELEASE(kXPI_NotifierPackages);
-    NS_IF_RELEASE(kXPI_NotifierPackage_Title);
-    NS_IF_RELEASE(kXPI_NotifierPackage_Version);
-    NS_IF_RELEASE(kXPI_NotifierPackage_Description);
-    NS_IF_RELEASE(kXPI_NotifierPackage_RegKey);
-
-   	NS_IF_RELEASE(kNC_NotificationRoot);
-    NS_IF_RELEASE(kNC_Source);
-	NS_IF_RELEASE(kNC_Name);
-	NS_IF_RELEASE(kNC_URL);
-	NS_IF_RELEASE(kNC_Child);
-}
-
-
-NS_IMPL_ISUPPORTS2(nsXPINotifierImpl, nsIRDFXMLSinkObserver, nsIUpdateNotification);
-
-
-nsresult
-nsXPINotifierImpl::NotificationEnabled(PRBool* aReturn)
-{
-    *aReturn = PR_FALSE;
-
-
-    nsIPref * prefs;
-    nsresult rv = nsServiceManager::GetService(kPrefsCID, 
-                                               kPrefsIID,
-                                               (nsISupports**) &prefs);
-
-    
-    
-    if ( NS_SUCCEEDED(rv) )
-    {
-        PRBool value;
-        // check to see if we are on.
-        rv = prefs->GetBoolPref( (const char*) XPINSTALL_NOTIFICATIONS_ENABLE, &value);
-
-        if (NS_SUCCEEDED(rv) && value)
-        {
-            // check to see the last time we did anything.  Since flash does not have a persistant
-            // way to do poll invervals longer than a session, we will implemented that here by using the
-            // preferences.  
-
-            PRInt32 intervalHours = 0;
-            
-            PRTime now            = 0;
-            PRInt32 nowSec        = 0;
-
-            PRInt32 lastTime      = 0;
-            
-            rv = prefs->GetIntPref(XPINSTALL_NOTIFICATIONS_INTERVAL, &intervalHours);
-
-            if (NS_FAILED(rv))
-            {
-                intervalHours = 7*24;  // default at once a week
-                rv = prefs->SetIntPref(XPINSTALL_NOTIFICATIONS_INTERVAL, intervalHours);
-            }
-
-            rv = prefs->GetIntPref(XPINSTALL_NOTIFICATIONS_LASTDATE, &lastTime);
-    
-            now = PR_Now();
-
-            // nowSec = now / 1000000
-            LL_DIV(nowSec, now, 1000000);
-
-            if (NS_FAILED(rv) || lastTime == 0)
-            {
-                rv = prefs->SetIntPref(XPINSTALL_NOTIFICATIONS_LASTDATE, nowSec);
-                return NS_OK;
-            }
-            
-            if ((lastTime + (intervalHours*60*24)) <= nowSec)
-            {
-                *aReturn = PR_TRUE;
-            }
-
-            NS_RELEASE(prefs);
-        }
-    }
-    
-    return NS_OK;
-}
-
-nsresult
-nsXPINotifierImpl::Init()
-{
-    PRBool enabled;
-
-    NotificationEnabled(&enabled);
-
-    if (!enabled)
-        return NS_ERROR_FAILURE;
-    
-    if (mNotifications == nsnull)
-        return NS_ERROR_FAILURE;
-
-    nsresult rv;
-    nsCOMPtr<nsIRDFDataSource> distributors;
-    nsCOMPtr<nsIRDFContainer> distributorsContainer;
-    nsCOMPtr <nsISimpleEnumerator> distributorEnumerator;
-    PRBool moreElements;
-    
-    // Read the distributor registry
-    rv = nsServiceManager::GetService(kRDFServiceCID, NS_GET_IID(nsIRDFService), (nsISupports**) &mRDF);
-    if (NS_FAILED(rv)) return rv;
-    
-    if (! kXPI_NotifierSources)
-	{
-	   mRDF->GetResource(NC_XPI_SOURCES,       &kXPI_NotifierSources);
-       mRDF->GetResource(NC_XPI_PACKAGES,      &kXPI_NotifierPackages);
-       mRDF->GetResource(NC_XPI_TITLE,         &kXPI_NotifierPackage_Title);
-       mRDF->GetResource(NC_XPI_VERSION,       &kXPI_NotifierPackage_Version);
-       mRDF->GetResource(NC_XPI_DESCRIPTION,   &kXPI_NotifierPackage_Description);
-       mRDF->GetResource(NC_XPI_REGKEY,        &kXPI_NotifierPackage_RegKey);
-
-       mRDF->GetResource(NC_RDF_NOTIFICATION_ROOT,  &kNC_NotificationRoot);
-       
-       mRDF->GetResource(NC_RDF_SOURCE,             &kNC_Source);
-	   mRDF->GetResource(NC_RDF_NAME,               &kNC_Name);
-	   mRDF->GetResource(NC_RDF_URL,                &kNC_URL);
-	   mRDF->GetResource(NC_RDF_CHILD,              &kNC_Child);
-
-	}
-
-    rv = OpenRemoteDataSource(BASE_DATASOURCE_URL, PR_TRUE, getter_AddRefs(distributors));
-    if (NS_FAILED(rv)) return rv;
-
-    rv = nsComponentManager::CreateInstance(kRDFContainerCID,
-                                            nsnull,
-                                            NS_GET_IID(nsIRDFContainer),
-                                            getter_AddRefs(distributorsContainer));
-
-    if (NS_SUCCEEDED(rv))
-    {
-        rv = distributorsContainer->Init(distributors, kXPI_NotifierSources);
-        
-        if (NS_SUCCEEDED(rv))
-        {
-            rv = distributorsContainer->GetElements(getter_AddRefs(distributorEnumerator));
-
-            if (NS_SUCCEEDED(rv))
-            {
-                distributorEnumerator->HasMoreElements(&moreElements);
-                while (moreElements) 
-                {
-                    nsCOMPtr<nsISupports> i;
-                    rv = distributorEnumerator->GetNext(getter_AddRefs(i));
-                    if (NS_FAILED(rv)) break;
-
-                    nsCOMPtr<nsIRDFResource> aDistributor(do_QueryInterface(i, &rv));
-                    if (NS_FAILED(rv)) break;
-
-                    char* uri;
-                    nsCOMPtr<nsIRDFDataSource> remoteDatasource;
-                    aDistributor->GetValue(&uri);
-
-                    rv = OpenRemoteDataSource(uri, PR_FALSE, getter_AddRefs(remoteDatasource));
-					nsAllocator::Free(uri);
-                    if (NS_FAILED(rv)) break;
-                    
-                    distributorEnumerator->HasMoreElements(&moreElements);
-                }
-            }
-        }
-    }
-    return NS_OK;
-}
-
-
-PRBool 
-nsXPINotifierImpl::IsNewerOrUninstalled(const char* regKey, const char* versionString)
-{
-    PRBool needJar = PR_FALSE;
-
-    REGERR status = VR_ValidateComponent( (char*) regKey );
-
-    if ( status == REGERR_NOFIND || status == REGERR_NOFILE )
-    {
-        // either component is not in the registry or it's a file
-        // node and the physical file is missing
-        needJar = PR_TRUE;
-    }
-    else
-    {
-        VERSION oldVersion;
-
-        status = VR_GetVersion( (char*)regKey, &oldVersion );
-        
-        if ( status != REGERR_OK )
-        {
-            needJar = PR_TRUE;
-        }
-        else 
-        {
-            VERSION newVersion;
-
-            StringToVersionNumbers(versionString, &(newVersion).major, &(newVersion).minor, &(newVersion).release, &(newVersion).build);
-            
-            if ( CompareVersions(&oldVersion, &newVersion) < 0 )
-                needJar = PR_TRUE;
-        }
-    }
-    return needJar;
-}
-
-
-PRInt32
-nsXPINotifierImpl::CompareVersions(VERSION *oldversion, VERSION *newVersion)
-{
-    PRInt32 diff;
-    
-    if ( oldversion->major == newVersion->major ) 
-    {
-        if ( oldversion->minor == newVersion->minor ) 
-        {
-            if ( oldversion->release == newVersion->release ) 
-            {
-                if ( oldversion->build == newVersion->build )
-                    diff = 0;
-                else if ( oldversion->build > newVersion->build )
-                    diff = 1;
-                else
-                    diff = -1;
-            }
-            else if ( oldversion->release > newVersion->release )
-                diff = 1;
-            else
-                diff = -1;
-        }
-        else if (  oldversion->minor > newVersion->minor )
-            diff = 1;
-        else
-            diff = -1;
-    }
-    else if ( oldversion->major > newVersion->major )
-        diff = 1;
-    else
-        diff = -1;
-
-    return diff;
-}
-
-
-void
-nsXPINotifierImpl::StringToVersionNumbers(const nsString& version, int32 *aMajor, int32 *aMinor, int32 *aRelease, int32 *aBuild)    
-{
-    PRInt32 errorCode;
-
-    int dot = version.FindChar('.', PR_FALSE,0);
-    
-    if ( dot == -1 ) 
-    {
-        *aMajor = version.ToInteger(&errorCode);
-    }
-    else  
-    {
-        nsString majorStr;
-        version.Mid(majorStr, 0, dot);
-        *aMajor  = majorStr.ToInteger(&errorCode);
-
-        int prev = dot+1;
-        dot = version.FindChar('.',PR_FALSE,prev);
-        if ( dot == -1 ) 
-        {
-            nsString minorStr;
-            version.Mid(minorStr, prev, version.Length() - prev);
-            *aMinor = minorStr.ToInteger(&errorCode);
-        }
-        else 
-        {
-            nsString minorStr;
-            version.Mid(minorStr, prev, dot - prev);
-            *aMinor = minorStr.ToInteger(&errorCode);
-
-            prev = dot+1;
-            dot = version.FindChar('.',PR_FALSE,prev);
-            if ( dot == -1 ) 
-            {
-                nsString releaseStr;
-                version.Mid(releaseStr, prev, version.Length() - prev);
-                *aRelease = releaseStr.ToInteger(&errorCode);
-            }
-            else 
-            {
-                nsString releaseStr;
-                version.Mid(releaseStr, prev, dot - prev);
-                *aRelease = releaseStr.ToInteger(&errorCode);
-    
-                prev = dot+1;
-                if ( version.Length() > dot ) 
-                {
-                    nsString buildStr;
-                    version.Mid(buildStr, prev, version.Length() - prev);
-                    *aBuild = buildStr.ToInteger(&errorCode);
-               }
-            }
-        }
-    }
-}
-
-nsresult
-nsXPINotifierImpl::OpenRemoteDataSource(const char* aURL, PRBool blocking, nsIRDFDataSource** aResult)
-{
-    static NS_DEFINE_CID(kRDFXMLDataSourceCID, NS_RDFXMLDATASOURCE_CID);
-    nsresult rv;
-
-    nsCOMPtr<nsIRDFRemoteDataSource> remote;
-    rv = nsComponentManager::CreateInstance(kRDFXMLDataSourceCID,
-                                            nsnull,
-                                            NS_GET_IID(nsIRDFRemoteDataSource),
-                                            getter_AddRefs(remote));
-    if (NS_FAILED(rv)) return rv;
-
-    rv = remote->Init(aURL);
-    if (NS_SUCCEEDED(rv)) 
-    {
-        if (! blocking)
-        {
-            nsCOMPtr<nsIRDFXMLSink> sink = do_QueryInterface(remote, &rv);
-            if (NS_FAILED(rv)) return rv;
-
-            rv = sink->AddXMLSinkObserver(this);
-            if (NS_FAILED(rv)) return rv;
-        }
-
-        rv = remote->Refresh(blocking);
-        if (NS_FAILED(rv)) return rv;
-
-        nsCOMPtr<nsIRDFDataSource> result = do_QueryInterface(remote, &rv);
-        *aResult = result;
-        NS_IF_ADDREF(*aResult);
-        return rv;
-    }
-    else 
-    {
-        // we've already loaded this datasource. use cached copy
-        return mRDF->GetDataSource(aURL, aResult);
-    }
-}
-
-
-NS_IMETHODIMP
-nsXPINotifierImpl::New(nsISupports* aOuter, REFNSIID aIID, void** aResult)
-{
-    NS_PRECONDITION(aOuter == nsnull, "no aggregation");
-    if (aOuter)
-        return NS_ERROR_NO_AGGREGATION;
-
-    nsXPINotifierImpl* result = new nsXPINotifierImpl();
-    if (! result)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(result); // stabilize
-
-    nsresult rv;
-    rv = result->Init();
-    if (NS_SUCCEEDED(rv)) {
-        rv = result->QueryInterface(aIID, aResult);
-    }
-
-    NS_RELEASE(result);
-    return rv;
-}
-
-
-NS_IMETHODIMP
-nsXPINotifierImpl::OnBeginLoad(nsIRDFXMLSink *aSink)
-{
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXPINotifierImpl::OnInterrupt(nsIRDFXMLSink *aSink)
-{
-    return NS_OK;
-}
-NS_IMETHODIMP
-nsXPINotifierImpl::OnResume(nsIRDFXMLSink *aSink)
-{
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsXPINotifierImpl::OnEndLoad(nsIRDFXMLSink *aSink)
-{
-    nsresult rv;
-
-    (void) aSink->RemoveXMLSinkObserver(this);
-
-    nsCOMPtr<nsIRDFDataSource> distributorDataSource = do_QueryInterface(aSink, &rv);
-    if (NS_FAILED(rv)) return rv;
-
-    nsCOMPtr<nsIRDFContainer> distributorContainer;
-    nsCOMPtr <nsISimpleEnumerator> packageEnumerator;
-    PRBool moreElements;
-
-    rv = nsComponentManager::CreateInstance(kRDFContainerCID,
-                                            nsnull,
-                                            NS_GET_IID(nsIRDFContainer),
-                                            getter_AddRefs(distributorContainer));
-    if (NS_SUCCEEDED(rv))
-    {
-        rv = distributorContainer->Init(distributorDataSource, kXPI_NotifierPackages);
-        if (NS_SUCCEEDED(rv))
-        {
-            rv = distributorContainer->GetElements(getter_AddRefs(packageEnumerator));
-            if (NS_SUCCEEDED(rv))
-            {
-                packageEnumerator->HasMoreElements(&moreElements);
-                while (moreElements) 
-                {
-                    nsCOMPtr<nsISupports> i;
-
-                    rv = packageEnumerator->GetNext(getter_AddRefs(i));
-                    if (NS_FAILED(rv)) break;
-
-                    nsCOMPtr<nsIRDFResource> aPackage(do_QueryInterface(i, &rv));
-                    if (NS_FAILED(rv)) break;
-    
-                    
-                    // Get the version information
-                    nsCOMPtr<nsIRDFNode> versionNode;
-                    distributorDataSource->GetTarget(aPackage, 
-                                                     kXPI_NotifierPackage_Version, 
-                                                     PR_TRUE, 
-                                                     getter_AddRefs(versionNode));
-
-                    nsCOMPtr<nsIRDFLiteral> version(do_QueryInterface(versionNode, &rv));
-                    if (NS_FAILED(rv)) break;
-
-                    // Get the regkey information
-                    nsCOMPtr<nsIRDFNode> regkeyNode;
-                    distributorDataSource->GetTarget(aPackage, 
-                                                     kXPI_NotifierPackage_RegKey, 
-                                                     PR_TRUE, 
-                                                     getter_AddRefs(regkeyNode));
-
-                    nsCOMPtr<nsIRDFLiteral> regkey(do_QueryInterface(regkeyNode, &rv));
-                    if (NS_FAILED(rv)) break;
-
-                    // convert them into workable nsAutoStrings
-                    PRUnichar* regkeyCString;
-                    regkey->GetValue(&regkeyCString);
-                    nsString regKeyString(regkeyCString);
-                    
-                    PRUnichar* versionCString;
-                    version->GetValue(&versionCString);
-                    nsString versionString(versionCString);
-					nsAllocator::Free(versionCString);
-					nsAllocator::Free(regkeyCString);
-
-                    // check to see if this software title should be "flashed"
-                    if (IsNewerOrUninstalled(nsAutoCString(regKeyString), nsAutoCString(versionString)))
-                    {
-                        //assert into flash
-                        
-                        nsCOMPtr<nsIRDFNode> urlNode;
-                        distributorDataSource->GetTarget(kXPI_NotifierPackages, 
-                                                         kNC_URL, 
-                                                         PR_TRUE, 
-                                                         getter_AddRefs(urlNode));
-
-                        nsCOMPtr<nsIRDFLiteral> url(do_QueryInterface(urlNode, &rv));
-                        if (NS_FAILED(rv)) break;
-
-
-                        nsCOMPtr<nsIRDFNode> titleNode;
-                        distributorDataSource->GetTarget(kXPI_NotifierPackages, 
-                                                         kXPI_NotifierPackage_Title, 
-                                                         PR_TRUE, 
-                                                         getter_AddRefs(titleNode));
-
-                        nsCOMPtr<nsIRDFLiteral> title(do_QueryInterface(titleNode, &rv));
-                        if (NS_FAILED(rv)) break;
-
-                        nsCOMPtr<nsIRDFDataSource> ds = do_QueryInterface(mNotifications);
-
-                        ds->Assert(aPackage, kNC_Name, title, PR_TRUE);
-                        ds->Assert(aPackage, kNC_URL, url, PR_TRUE);
-
-                        ds->Assert(kNC_NotificationRoot, kNC_Child, aPackage, PR_TRUE);
-                        break;
-
-                    }
-                }
-            }
-        }
-    }
-	VR_Close();
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsXPINotifierImpl::OnError(nsIRDFXMLSink *aSink, nsresult aResult, const PRUnichar* aErrorMsg)
-{
-    (void) aSink->RemoveXMLSinkObserver(this);
-    return NS_OK;
-}
-
-
-NS_IMETHODIMP
-nsXPINotifierImpl::DisplayUpdateDialog(void)
-{
-    nsresult rv;
-    nsCOMPtr <nsISimpleEnumerator> packages;
-    PRBool moreElements;
-
-    nsCOMPtr<nsIRDFDataSource> ds = do_QueryInterface(mNotifications, &rv);
-
-    if (NS_SUCCEEDED(rv))
-    {
-        rv = ds->GetAllResources(getter_AddRefs(packages));
-        if (NS_SUCCEEDED(rv))
-        {
-            packages->HasMoreElements(&moreElements);
-            while (moreElements) 
-            {
-                nsCOMPtr<nsISupports> i;
-
-                rv = packages->GetNext(getter_AddRefs(i));
-                if (NS_FAILED(rv)) break;
-
-                nsCOMPtr<nsIRDFResource> aPackage(do_QueryInterface(i, &rv));
-                if (NS_FAILED(rv)) break;
-
-                
-                // Get the version information
-                nsCOMPtr<nsIRDFNode> name;
-                ds->GetTarget(aPackage, 
-                              nsXPINotifierImpl::kNC_Name, 
-                              PR_TRUE, 
-                              getter_AddRefs(name));
-
-                nsCOMPtr<nsIRDFLiteral> nameLiteral = do_QueryInterface(name, &rv);
-                if (NS_FAILED(rv)) break;
-            }
-        }
-    }
-    return rv;
-}
-
-
-

mozilla/xpinstall/src/nsUpdateNotification.h

@@ -1,92 +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 Communicator client code, 
- * released March 31, 1998. 
- *
- * The Initial Developer of the Original Code is Netscape Communications 
- * Corporation.  Portions created by Netscape are
- * Copyright (C) 1998-1999 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- *   Doug Turner <dougt@netscape.com>
- *   Pierre Phaneuf <pp@ludusdesign.com>
- */
-
-
-#include "nsCOMPtr.h"
-
-#include "nsIRDFDataSource.h"
-#include "nsRDFCID.h"
-#include "nsIRDFXMLSink.h"
-#include "nsIRDFResource.h"
-#include "nsIRDFService.h"
-
-#include "VerReg.h"
-
-#include "nsIUpdateNotification.h"
-
-#define NS_XPI_UPDATE_NOTIFIER_DATASOURCE_CID \
-{ 0x69fdc800, 0x4050, 0x11d3, { 0xbe, 0x2f, 0x0, 0x10, 0x4b, 0xde, 0x60, 0x48 } }
-
-#define NS_XPI_UPDATE_NOTIFIER_CID \
-{ 0x68a24e36, 0x042d, 0x11d4, { 0xac, 0x85, 0x0, 0xc0, 0x4f, 0xa0, 0xd2, 0x6b } }
-
-#define NS_XPI_UPDATE_NOTIFIER_PROGID "component://mozilla/xpinstall/notifier"
-
-#define BASE_DATASOURCE_URL "chrome://xpinstall/content/SoftwareUpdates.rdf"
-
-
-
-class nsXPINotifierImpl : public nsIUpdateNotification, public nsIRDFXMLSinkObserver
-{
-
-public:
-    static NS_IMETHODIMP New(nsISupports* aOuter, REFNSIID aIID, void** aResult);
-    
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIRDFXMLSINKOBSERVER
-    NS_DECL_NSIUPDATENOTIFICATION    
-
-protected:
-    
-    nsXPINotifierImpl();
-    virtual ~nsXPINotifierImpl();
-
-    nsresult NotificationEnabled(PRBool* aReturn);
-    nsresult Init();
-    nsresult OpenRemoteDataSource(const char* aURL, PRBool blocking, nsIRDFDataSource** aResult);
-    
-    PRBool IsNewerOrUninstalled(const char* regKey, const char* versionString);
-    PRInt32 CompareVersions(VERSION *oldversion, VERSION *newVersion);
-    void   StringToVersionNumbers(const nsString& version, int32 *aMajor, int32 *aMinor, int32 *aRelease, int32 *aBuild);
-    
-    nsCOMPtr<nsISupports> mNotifications;
-    nsIRDFService* mRDF;
-
-    PRUint32 mPendingRefreshes;
-
-    static nsIRDFResource* kXPI_NotifierSources;
-    static nsIRDFResource* kXPI_NotifierPackages;
-    static nsIRDFResource* kXPI_NotifierPackage_Title;
-    static nsIRDFResource* kXPI_NotifierPackage_Version;
-    static nsIRDFResource* kXPI_NotifierPackage_Description;
-    static nsIRDFResource* kXPI_NotifierPackage_RegKey;
-
-    static nsIRDFResource* kNC_NotificationRoot;
-    static nsIRDFResource* kNC_Source;
-	static nsIRDFResource* kNC_Name;
-	static nsIRDFResource* kNC_URL;
-	static nsIRDFResource* kNC_Child;
-	
-};

mozilla/xpinstall/src/nsWinProfile.cpp

@@ -1,23 +1,19 @@
 /* -*- 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/
+ * 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 License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
+ * Software distributed under the 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 Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
+ * 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.
- *
- * Contributor(s): 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  */
 
 #include "nsWinProfile.h"
@@ -27,84 +23,63 @@
 
 /* Public Methods */
 
-MOZ_DECL_CTOR_COUNTER(nsWinProfile);
-
 nsWinProfile::nsWinProfile( nsInstall* suObj, const nsString& folder, const nsString& file )
 {
-  MOZ_COUNT_CTOR(nsWinProfile);
-
-  mFilename = new nsString(folder);
-    
-  if (mFilename)
+  filename = new nsString(folder);
+  if(filename->Last() != '\\')
   {
-    if(mFilename->Last() != '\\')
-    {
-        mFilename->Append("\\");
-    }
-    mFilename->Append(file);
-
-	mInstallObject = suObj;
+    filename->Append("\\");
   }
+  filename->Append(file);
+
+	su = suObj;
+
+//	principal = suObj->GetPrincipal();
+//	privMgr = nsPrivilegeManager::getPrivilegeManager();
+//	impersonation = nsTarget::findTarget(IMPERSONATOR);
+//	target = (nsUserTarget*)nsTarget::findTarget(INSTALL_PRIV);
 }
 
 nsWinProfile::~nsWinProfile()
 {
-  if (mFilename)
-      delete mFilename;
-
-  MOZ_COUNT_DTOR(nsWinProfile);
-
+  delete filename;
 }
 
 PRInt32
-nsWinProfile::GetString(nsString section, nsString key, nsString* aReturn)
+nsWinProfile::getString(nsString section, nsString key, nsString* aReturn)
 {
-  return NativeGetString(section, key, aReturn);
+  return nativeGetString(section, key, aReturn);
 }
 
 PRInt32
-nsWinProfile::WriteString(nsString section, nsString key, nsString value, PRInt32* aReturn)
+nsWinProfile::writeString(nsString section, nsString key, nsString value, PRInt32* aReturn)
 {
+  nsWinProfileItem* wi = new nsWinProfileItem(this, section, key, value);
+
   *aReturn = NS_OK;
-  
-  nsWinProfileItem* wi = new nsWinProfileItem(this, section, key, value, aReturn);
 
-  if(wi == nsnull)
-  {
-    *aReturn = nsInstall::OUT_OF_MEMORY;
-    return NS_OK;
-  }
+  if(wi == NULL)
+    return PR_FALSE;
 
-  if(*aReturn != nsInstall::SUCCESS)
-  {
-    if(wi)
-    {
-      delete wi;
-      return NS_OK;
-    }
-  }
-
-  if (mInstallObject)
-    mInstallObject->ScheduleForInstall(wi);
-  
+  su->ScheduleForInstall(wi);
   return NS_OK;
 }
 
-nsString* nsWinProfile::GetFilename()
+nsString* nsWinProfile::getFilename()
 {
-	return mFilename;
+	return filename;
 }
 
-nsInstall* nsWinProfile::InstallObject()
+nsInstall* nsWinProfile::installObject()
 {
-	return mInstallObject;
+	return su;
 }
 
 PRInt32
-nsWinProfile::FinalWriteString( nsString section, nsString key, nsString value )
+nsWinProfile::finalWriteString( nsString section, nsString key, nsString value )
 {
 	/* do we need another security check here? */
-	return NativeWriteString(section, key, value);
+	return nativeWriteString(section, key, value);
 }
 
 /* Private Methods */
@@ -112,35 +87,35 @@ nsWinProfile::FinalWriteString( nsString section, nsString key, nsString value )
 #define STRBUFLEN 255
   
 PRInt32
-nsWinProfile::NativeGetString(nsString section, nsString key, nsString* aReturn )
+nsWinProfile::nativeGetString(nsString section, nsString key, nsString* aReturn )
 {
-  int       numChars;
+	int       numChars;
   char      valbuf[STRBUFLEN];
   char*     sectionCString;
   char*     keyCString;
   char*     filenameCString;
 
   /* make sure conversions worked */
-  if(section.First() != '\0' && key.First() != '\0' && mFilename->First() != '\0')
+  if(section.First() != '\0' && key.First() != '\0' && filename->First() != '\0')
   {
     sectionCString  = section.ToNewCString();
     keyCString      = key.ToNewCString();
-    filenameCString = mFilename->ToNewCString();
+    filenameCString = filename->ToNewCString();
 
     numChars        = GetPrivateProfileString(sectionCString, keyCString, "", valbuf, STRBUFLEN, filenameCString);
 
     *aReturn        = valbuf;
 
-    if (sectionCString)   Recycle(sectionCString);
-    if (keyCString)       Recycle(keyCString);
-    if (filenameCString)  Recycle(filenameCString);
+    delete [] sectionCString;
+    delete [] keyCString;
+    delete [] filenameCString;
   }
 
   return numChars;
 }
 
 PRInt32
-nsWinProfile::NativeWriteString( nsString section, nsString key, nsString value )
+nsWinProfile::nativeWriteString( nsString section, nsString key, nsString value )
 {
   char* sectionCString;
   char* keyCString;
@@ -149,19 +124,19 @@ nsWinProfile::NativeWriteString( nsString section, nsString key, nsString value
   int   success = 0;
 
 	/* make sure conversions worked */
-  if(section.First() != '\0' && key.First() != '\0' && mFilename->First() != '\0')
+  if(section.First() != '\0' && key.First() != '\0' && filename->First() != '\0')
   {
     sectionCString  = section.ToNewCString();
     keyCString      = key.ToNewCString();
     valueCString    = value.ToNewCString();
-    filenameCString = mFilename->ToNewCString();
+    filenameCString = filename->ToNewCString();
 
     success = WritePrivateProfileString( sectionCString, keyCString, valueCString, filenameCString );
 
-    if (sectionCString)   Recycle(sectionCString);
-    if (keyCString)       Recycle(keyCString);
-    if (valueCString)     Recycle(valueCString);
-    if (filenameCString)  Recycle(filenameCString);
+    delete [] sectionCString;
+    delete [] keyCString;
+    delete [] valueCString;
+    delete [] filenameCString;
   }
 
   return success;

mozilla/xpinstall/src/nsWinProfile.h

@@ -1,23 +1,19 @@
 /* -*- 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/
+ * 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 License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
+ * Software distributed under the 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 Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
+ * 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.
- *
- * Contributor(s): 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  */
 
 #ifndef nsWinProfile_h__
@@ -46,7 +42,7 @@ class nsWinProfile
      *
      * @return  false for failure, true for success
      */
-    PRInt32 WriteString( nsString section, nsString key, nsString value, PRInt32* aReturn );
+    PRInt32 writeString( nsString section, nsString key, nsString value, PRInt32* aReturn );
     
     /**
      * Reads a value from a windows "ini" file.  We don't support using
@@ -54,23 +50,23 @@ class nsWinProfile
      *
      * @return  String value from INI, "" if not found, null if error
      */
-    PRInt32 GetString( nsString section, nsString key, nsString* aReturn );
+    PRInt32 getString( nsString section, nsString key, nsString* aReturn );
     
-    nsString* GetFilename();
-    nsInstall* InstallObject();
+    nsString* getFilename();
+    nsInstall* installObject();
     
-    PRInt32 FinalWriteString( nsString section, nsString key, nsString value );
+    PRInt32 finalWriteString( nsString section, nsString key, nsString value );
 
     
   private:
     
     /* Private Fields */
-    nsString*  mFilename;
-    nsInstall* mInstallObject;
+    nsString*  filename;
+    nsInstall* su;
     
     /* Private Methods */
-    PRInt32 NativeWriteString( nsString section, nsString key, nsString value );
-    PRInt32 NativeGetString( nsString section, nsString key, nsString* aReturn );
+    PRInt32 nativeWriteString( nsString section, nsString key, nsString value );
+    PRInt32 nativeGetString( nsString section, nsString key, nsString* aReturn );
 };
 
 #endif /* nsWinProfile_h__ */

mozilla/xpinstall/src/nsWinProfileItem.cpp

@@ -1,23 +1,19 @@
 /* -*- 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/
+ * 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 License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
+ * Software distributed under the 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 Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
+ * 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.
- *
- * Contributor(s): 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  */
 
 
@@ -27,70 +23,54 @@
 
 /* Public Methods */
 
-MOZ_DECL_CTOR_COUNTER(nsWinProfileItem);
-
 nsWinProfileItem::nsWinProfileItem(nsWinProfile* profileObj, 
                                    nsString sectionName,
                                    nsString keyName,
-                                   nsString val,
-                                   PRInt32 *aReturn) : nsInstallObject(profileObj->InstallObject())
+                                   nsString val) : nsInstallObject(profileObj->installObject())
 {
-  MOZ_COUNT_CTOR(nsWinProfileItem);
-
-  mProfile = profileObj;
-  mSection = new nsString(sectionName);
-  mKey     = new nsString(keyName);
-  mValue   = new nsString(val);
-
-  *aReturn = nsInstall::SUCCESS;
-
-  if((mSection == nsnull) ||
-     (mKey     == nsnull) ||
-     (mValue   == nsnull))
-  {
-    *aReturn = nsInstall::OUT_OF_MEMORY;
-  }
+  profile = profileObj;
+  section = new nsString(sectionName);
+  key     = new nsString(keyName);
+  value   = new nsString(val);
 }
 
 nsWinProfileItem::~nsWinProfileItem()
 {
-  if (mSection) delete mSection;
-  if (mKey)     delete mKey;
-  if (mValue)   delete mValue;
-
-  MOZ_COUNT_DTOR(nsWinProfileItem);
+  delete profile;
+  delete section;
+  delete key;
+  delete value;
 }
 
 PRInt32 nsWinProfileItem::Complete()
 {
-	if (mProfile) 
-        mProfile->FinalWriteString(*mSection, *mKey, *mValue);
-	
-    return NS_OK;
+	profile->finalWriteString(*section, *key, *value);
+	return NS_OK;
 }
   
+float nsWinProfileItem::GetInstallOrder()
+{
+	return 4;
+}
+
 char* nsWinProfileItem::toString()
 {
   char*     resultCString;
-  
-  nsString* filename = new nsString(*mProfile->GetFilename());
-  nsString* result = new nsString("Write ");
-
-  if (filename == nsnull || result == nsnull)
-      return nsnull;
+  nsString* result;
+  nsString* filename = new nsString(*profile->getFilename());
 
+  result = new nsString("Write ");
   result->Append(*filename);
   result->Append(": [");
-  result->Append(*mSection);
+  result->Append(*section);
   result->Append("] ");
-  result->Append(*mKey);
+  result->Append(*key);
   result->Append("=");
-  result->Append(*mValue);
+  result->Append(*value);
 
   resultCString = result->ToNewCString();
-  
-  if (result)   delete result;
-  if (filename) delete filename;
+  delete result;
+  delete filename;
 
   return resultCString;
 }
@@ -112,7 +92,7 @@ PRInt32 nsWinProfileItem::Prepare()
 PRBool 
 nsWinProfileItem::CanUninstall()
 {
-    return PR_FALSE;
+    return FALSE;
 }
 
 /* RegisterPackageNode
@@ -122,6 +102,6 @@ nsWinProfileItem::CanUninstall()
 PRBool
 nsWinProfileItem::RegisterPackageNode()
 {
-    return PR_TRUE;
+    return TRUE;
 }
 

mozilla/xpinstall/src/nsWinProfileItem.h

@@ -1,23 +1,19 @@
 /* -*- 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/
+ * 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 License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
+ * Software distributed under the 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 Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
+ * 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.
- *
- * Contributor(s): 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  */
 
 #ifndef nsWinProfileItem_h__
@@ -42,16 +38,18 @@ public:
   nsWinProfileItem(nsWinProfile* profileObj,
                    nsString sectionName,
                    nsString keyName,
-                   nsString val,
-                   PRInt32 *aReturn);
+                   nsString val);
 
-  virtual ~nsWinProfileItem();
+  ~nsWinProfileItem();
 
   /**
    * Completes the install:
    * - writes the data into the .INI file
    */
   PRInt32 Complete();
+  
+  float GetInstallOrder();
+  
   char* toString();
   
   // no need for special clean-up
@@ -67,10 +65,10 @@ public:
 private:
   
   /* Private Fields */
-  nsWinProfile* mProfile;     // initiating profile object
-  nsString*     mSection;     // Name of section
-  nsString*     mKey;         // Name of key
-  nsString*     mValue;       // data to write
+  nsWinProfile* profile;     // initiating profile object
+  nsString*     section;     // Name of section
+  nsString*     key;         // Name of key
+  nsString*     value;       // data to write
   
   /* Private Methods */
  

mozilla/xpinstall/src/nsWinReg.cpp

@@ -1,23 +1,19 @@
 /* -*- 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/
+ * 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 License is distributed on an "AS
- * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
+ * Software distributed under the 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 Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
+ * 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.
- *
- * Contributor(s): 
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
  */
 
 #include "nsWinReg.h"
@@ -26,244 +22,164 @@
 
 /* Public Methods */
 
-MOZ_DECL_CTOR_COUNTER(nsWinReg);
-
 nsWinReg::nsWinReg(nsInstall* suObj)
 {
-    MOZ_COUNT_CTOR(nsWinReg);
+	su = suObj;
 
-    mInstallObject      = suObj;
-	mRootKey = (PRInt32)HKEY_CLASSES_ROOT;
-}
-
-nsWinReg::~nsWinReg()
-{
-    MOZ_COUNT_CTOR(nsWinReg);
+//	principal = suObj->GetPrincipal();
+//	privMgr = nsPrivilegeManager::getPrivilegeManager();
+//	impersonation = nsTarget::findTarget(IMPERSONATOR);
+//	target = (nsUserTarget*)nsTarget::findTarget(INSTALL_PRIV);
 }
 
 PRInt32
-nsWinReg::SetRootKey(PRInt32 key)
+nsWinReg::setRootKey(PRInt32 key)
 {
-	mRootKey = key;
-    return NS_OK;
+	rootkey = key;
+  return NS_OK;
 }
   
 PRInt32
-nsWinReg::CreateKey(const nsString& subkey, const nsString& classname, PRInt32* aReturn)
+nsWinReg::createKey(nsString subkey, nsString classname, PRInt32* aReturn)
 {
-	nsWinRegItem* wi = new nsWinRegItem(this, mRootKey, NS_WIN_REG_CREATE, subkey, classname, "null", aReturn);
+//	resolvePrivileges();
 
-  if(wi == nsnull)
+	nsWinRegItem* wi = new nsWinRegItem(this, rootkey, NS_WIN_REG_CREATE, subkey, classname, "null");
+	if(wi == nsnull)
   {
-    *aReturn = nsInstall::OUT_OF_MEMORY;
+//		return (-1);
+//    *aReturn = SaveError( result );
     return NS_OK;
   }
-
-  if(*aReturn != nsInstall::SUCCESS)
-  {
-    if(wi)
-    {
-      delete wi;
-      return NS_OK;
-    }
-  }
-
-  if(mInstallObject)
-  	mInstallObject->ScheduleForInstall(wi);
-	
-  return 0;
-}
-  
-PRInt32
-nsWinReg::DeleteKey(const nsString& subkey, PRInt32* aReturn)
-{
-	nsWinRegItem* wi = new nsWinRegItem(this, mRootKey, NS_WIN_REG_DELETE, subkey, "null", "null", aReturn);
-
-  if(wi == nsnull)
-  {
-    *aReturn = nsInstall::OUT_OF_MEMORY;
-    return NS_OK;
-  }
-
-  if(*aReturn != nsInstall::SUCCESS)
-  {
-    if(wi)
-    {
-      delete wi;
-      return NS_OK;
-    }
-  }
-
-  if(mInstallObject)
-    mInstallObject->ScheduleForInstall(wi);
-
-  return 0;
-}
-
-PRInt32
-nsWinReg::DeleteValue(const nsString& subkey, const nsString& valname, PRInt32* aReturn)
-{
-	nsWinRegItem* wi = new nsWinRegItem(this, mRootKey, NS_WIN_REG_DELETE_VAL, subkey, valname, "null", aReturn);
-
-  if(wi == nsnull)
-  {
-    *aReturn = nsInstall::OUT_OF_MEMORY;
-    return NS_OK;
-  }
-
-  if(*aReturn != nsInstall::SUCCESS)
-  {
-    if(wi)
-    {
-      delete wi;
-      return NS_OK;
-    }
-  }
-
-  if(mInstallObject)
-    mInstallObject->ScheduleForInstall(wi);
-
-  return 0;
-}
-
-PRInt32
-nsWinReg::SetValueString(const nsString& subkey, const nsString& valname, const nsString& value, PRInt32* aReturn)
-{
-	nsWinRegItem* wi = new nsWinRegItem(this, mRootKey, NS_WIN_REG_SET_VAL_STRING, subkey, valname, value, aReturn);
-
-  if(wi == nsnull)
-  {
-    *aReturn = nsInstall::OUT_OF_MEMORY;
-    return NS_OK;
-  }
-
-  if(*aReturn != nsInstall::SUCCESS)
-  {
-    if(wi)
-    {
-      delete wi;
-      return NS_OK;
-    }
-  }
-
-  if(mInstallObject)
-    mInstallObject->ScheduleForInstall(wi);
-	
-  return 0;
-}
-
-PRInt32
-nsWinReg::GetValueString(const nsString& subkey, const nsString& valname, nsString* aReturn)
-{
-   NativeGetValueString(subkey, valname, aReturn);
-   return NS_OK;
-}
- 
-PRInt32
-nsWinReg::SetValueNumber(const nsString& subkey, const nsString& valname, PRInt32 value, PRInt32* aReturn)
-{
-	nsWinRegItem* wi = new nsWinRegItem(this, mRootKey, NS_WIN_REG_SET_VAL_NUMBER, subkey, valname, value, aReturn);
-
-  if(wi == nsnull)
-  {
-    *aReturn = nsInstall::OUT_OF_MEMORY;
-    return NS_OK;
-  }
-
-  if(*aReturn != nsInstall::SUCCESS)
-  {
-    if(wi)
-    {
-      delete wi;
-      return NS_OK;
-    }
-  }
-
-  if(mInstallObject)
-    mInstallObject->ScheduleForInstall(wi);
-
-  return 0;
-}
-
-PRInt32
-nsWinReg::GetValueNumber(const nsString& subkey, const nsString& valname, PRInt32* aReturn)
-{
-    NativeGetValueNumber(subkey, valname, aReturn);
-    return NS_OK;
-}
- 
-PRInt32
-nsWinReg::SetValue(const nsString& subkey, const nsString& valname, nsWinRegValue* value, PRInt32* aReturn)
-{
-  // fix: need to figure out what to do with nsWinRegValue class.
-  //
-	// nsWinRegItem* wi = new nsWinRegItem(this, mRootKey, NS_WIN_REG_SET_VAL, subkey, valname, (nsWinRegValue*)value, aReturn);
-  //
-	// if(wi == nsnull)
-  // {
-  //   return NS_OK;
-  // }
-	// mInstallObject->ScheduleForInstall(wi);
+	su->ScheduleForInstall(wi);
 	return 0;
 }
   
 PRInt32
-nsWinReg::GetValue(const nsString& subkey, const nsString& valname, nsWinRegValue** aReturn)
+nsWinReg::deleteKey(nsString subkey, PRInt32* aReturn)
 {
-  // fix:
-  return NS_OK;
-}
-  
-nsInstall* nsWinReg::InstallObject()
-{
-	return mInstallObject;
-}
-  
-PRInt32
-nsWinReg::FinalCreateKey(PRInt32 root, const nsString& subkey, const nsString& classname, PRInt32* aReturn)
-{
-	SetRootKey(root);
-	*aReturn = NativeCreateKey(subkey, classname);
-  return NS_OK;
-}
-  
-PRInt32
-nsWinReg::FinalDeleteKey(PRInt32 root, const nsString& subkey, PRInt32* aReturn)
-{
-	SetRootKey(root);
-	*aReturn = NativeDeleteKey(subkey);
-  return NS_OK;
-}
-  
-PRInt32
-nsWinReg::FinalDeleteValue(PRInt32 root, const nsString& subkey, const nsString& valname, PRInt32* aReturn)
-{
-	SetRootKey(root);
-	*aReturn = NativeDeleteValue(subkey, valname);
-  return NS_OK;
+//	resolvePrivileges();
+
+	nsWinRegItem* wi = new nsWinRegItem(this, rootkey, NS_WIN_REG_DELETE, subkey, "null", "null");
+	if(wi == nsnull)
+  {
+//		return (-1);
+//    *aReturn = SaveError( result );
+    return NS_OK;
+  }
+	su->ScheduleForInstall(wi);
+	return 0;
 }
 
 PRInt32
-nsWinReg::FinalSetValueString(PRInt32 root, const nsString& subkey, const nsString& valname, const nsString& value, PRInt32* aReturn)
+nsWinReg::deleteValue(nsString subkey, nsString valname, PRInt32* aReturn)
 {
-	SetRootKey(root);
-	*aReturn = NativeSetValueString(subkey, valname, value);
+//	resolvePrivileges();
+
+	nsWinRegItem* wi = new nsWinRegItem(this, rootkey, NS_WIN_REG_DELETE_VAL, subkey, valname, "null");
+	if(wi == nsnull)
+  {
+//		return (-1);
+//    *aReturn = SaveError( result );
+    return NS_OK;
+  }
+	su->ScheduleForInstall(wi);
+	return 0;
+}
+
+PRInt32
+nsWinReg::setValueString(nsString subkey, nsString valname, nsString value, PRInt32* aReturn)
+{
+//	resolvePrivileges();
+
+	nsWinRegItem* wi = new nsWinRegItem(this, rootkey, NS_WIN_REG_SET_VAL_STRING, subkey, valname, value);
+	if(wi == nsnull)
+  {
+//		return (-1);
+//    *aReturn = SaveError( result );
+    return NS_OK;
+  }
+	su->ScheduleForInstall(wi);
+	return 0;
+}
+
+PRInt32
+nsWinReg::getValueString(nsString subkey, nsString valname, nsString** aReturn)
+{
+//	resolvePrivileges();
+
+//	return nativeGetValueString(subkey, valname);
+  return NS_OK;
+}
+  
+PRInt32
+nsWinReg::setValue(nsString subkey, nsString valname, nsWinRegValue* value, PRInt32* aReturn)
+{
+//	resolvePrivileges();
+
+  // fix: need to figure out what to do with nsWinRegValue class.
+	// nsWinRegItem* wi = new nsWinRegItem(this, rootkey, NS_WIN_REG_SET_VAL, subkey, valname, (nsWinRegValue*)value);
+	// if(wi == nsnull)
+  // {
+//		return (-1);
+//    *aReturn = SaveError(-1);
+  //   return NS_OK;
+  // }
+	// su->ScheduleForInstall(wi);
+	return 0;
+}
+  
+PRInt32
+nsWinReg::getValue(nsString subkey, nsString valname, nsWinRegValue** aReturn)
+{
+//	resolvePrivileges();
+
+//	return nativeGetValue(subkey, valname);
+  return NS_OK;
+}
+  
+nsInstall* nsWinReg::installObject()
+{
+	return su;
+}
+  
+PRInt32
+nsWinReg::finalCreateKey(PRInt32 root, nsString subkey, nsString classname, PRInt32* aReturn)
+{
+	setRootKey(root);
+	*aReturn = nativeCreateKey(subkey, classname);
+  return NS_OK;
+}
+  
+PRInt32
+nsWinReg::finalDeleteKey(PRInt32 root, nsString subkey, PRInt32* aReturn)
+{
+	setRootKey(root);
+	*aReturn = nativeDeleteKey(subkey);
+  return NS_OK;
+}
+  
+PRInt32
+nsWinReg::finalDeleteValue(PRInt32 root, nsString subkey, nsString valname, PRInt32* aReturn)
+{
+	setRootKey(root);
+	*aReturn = nativeDeleteValue(subkey, valname);
+  return NS_OK;
+}
+  
+PRInt32 
+nsWinReg::finalSetValueString(PRInt32 root, nsString subkey, nsString valname, nsString value, PRInt32* aReturn)
+{
+	setRootKey(root);
+	*aReturn = nativeSetValueString(subkey, valname, value);
   return NS_OK;
 }
  
 PRInt32
-nsWinReg::FinalSetValueNumber(PRInt32 root, const nsString& subkey, const nsString& valname, PRInt32 value, PRInt32* aReturn)
+nsWinReg::finalSetValue(PRInt32 root, nsString subkey, nsString valname, nsWinRegValue* value, PRInt32* aReturn)
 {
-	SetRootKey(root);
-	*aReturn = NativeSetValueNumber(subkey, valname, value);
-  return NS_OK;
-}
- 
-PRInt32
-nsWinReg::FinalSetValue(PRInt32 root, const nsString& subkey, const nsString& valname, nsWinRegValue* value, PRInt32* aReturn)
-{
-	SetRootKey(root);
-	*aReturn = NativeSetValue(subkey, valname, value);
+	setRootKey(root);
+	*aReturn = nativeSetValue(subkey, valname, value);
   return NS_OK;
 }
 
@@ -271,7 +187,7 @@ nsWinReg::FinalSetValue(PRInt32 root, const nsString& subkey, const nsString& va
 /* Private Methods */
 
 PRInt32
-nsWinReg::NativeCreateKey(const nsString& subkey, const nsString& classname)
+nsWinReg::nativeCreateKey(nsString subkey, nsString classname)
 {
     HKEY    root, newkey;
     LONG    result;
@@ -280,8 +196,8 @@ nsWinReg::NativeCreateKey(const nsString& subkey, const nsString& classname)
     char*   classnameCString  = classname.ToNewCString();
 
 #ifdef WIN32
-    root   = (HKEY)mRootKey;
-    result = RegCreateKeyEx(root, subkeyCString, 0, classnameCString, REG_OPTION_NON_VOLATILE, KEY_WRITE, nsnull, &newkey, &disposition);
+    root   = (HKEY)rootkey;
+    result = RegCreateKeyEx(root, subkeyCString, 0, classnameCString, REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, nsnull, &newkey, &disposition);
 
     if(ERROR_SUCCESS == result)
     {
@@ -289,31 +205,31 @@ nsWinReg::NativeCreateKey(const nsString& subkey, const nsString& classname)
     }
 #endif
 
-    if (subkeyCString)     Recycle(subkeyCString);
-    if (classnameCString)  Recycle(classnameCString);
+    delete [] subkeyCString;
+    delete [] classnameCString;
 
     return result;
 }
 
 PRInt32
-nsWinReg::NativeDeleteKey(const nsString& subkey)
+nsWinReg::nativeDeleteKey(nsString subkey)
 {
     HKEY  root;
     LONG  result;
     char* subkeyCString = subkey.ToNewCString();
 
 #ifdef WIN32
-    root   = (HKEY) mRootKey;
+    root   = (HKEY) rootkey;
     result = RegDeleteKey( root, subkeyCString );
 #endif
 
-    if (subkeyCString)  Recycle(subkeyCString);
+    delete [] subkeyCString;
 
     return result;
 }
   
 PRInt32
-nsWinReg::NativeDeleteValue(const nsString& subkey, const nsString& valname)
+nsWinReg::nativeDeleteValue(nsString subkey, nsString valname)
 {
 #if defined (WIN32) || defined (XP_OS2)
     HKEY    root, newkey;
@@ -321,7 +237,7 @@ nsWinReg::NativeDeleteValue(const nsString& subkey, const nsString& valname)
     char*   subkeyCString   = subkey.ToNewCString();
     char*   valnameCString  = valname.ToNewCString();
 
-    root   = (HKEY) mRootKey;
+    root   = (HKEY) rootkey;
     result = RegOpenKeyEx( root, subkeyCString, 0, KEY_WRITE, &newkey);
 
     if ( ERROR_SUCCESS == result )
@@ -330,8 +246,8 @@ nsWinReg::NativeDeleteValue(const nsString& subkey, const nsString& valname)
         RegCloseKey( newkey );
     }
 
-    if (subkeyCString)   Recycle(subkeyCString);
-    if (valnameCString)  Recycle(valnameCString);
+    delete [] subkeyCString;
+    delete [] valnameCString;
 
     return result;
 #else
@@ -340,7 +256,7 @@ nsWinReg::NativeDeleteValue(const nsString& subkey, const nsString& valname)
 }
 
 PRInt32
-nsWinReg::NativeSetValueString(const nsString& subkey, const nsString& valname, const nsString& value)
+nsWinReg::nativeSetValueString(nsString subkey, nsString valname, nsString value)
 {
     HKEY    root;
     HKEY    newkey;
@@ -351,40 +267,45 @@ nsWinReg::NativeSetValueString(const nsString& subkey, const nsString& valname,
     char*   valnameCString  = valname.ToNewCString();
     char*   valueCString    = value.ToNewCString();
     
-    length = value.Length();
+    length = subkey.Length();
 
-    root   = (HKEY) mRootKey;
-    result = RegOpenKeyEx( root, subkeyCString, 0, KEY_WRITE, &newkey);
+#ifdef WIN32
+    root   = (HKEY) rootkey;
+    result = RegOpenKeyEx( root, subkeyCString, 0, KEY_ALL_ACCESS, &newkey);
 
     if(ERROR_SUCCESS == result)
     {
         result = RegSetValueEx( newkey, valnameCString, 0, REG_SZ, (unsigned char*)valueCString, length );
         RegCloseKey( newkey );
     }
+#endif
 
-    if (subkeyCString)   Recycle(subkeyCString);
-    if (valnameCString)  Recycle(valnameCString);
-    if (valueCString)    Recycle(valueCString);
+    delete [] subkeyCString;
+    delete [] valnameCString;
+    delete [] valueCString;
 
     return result;
 }
  
 #define STRBUFLEN 255
  
-void
-nsWinReg::NativeGetValueString(const nsString& subkey, const nsString& valname, nsString* aReturn)
+nsString*
+nsWinReg::nativeGetValueString(nsString subkey, nsString valname)
 {
-    unsigned char     valbuf[_MAXKEYVALUE_];
-    HKEY              root;
-    HKEY              newkey;
-    LONG              result;
-    DWORD             type            = REG_SZ;
-    DWORD             length          = _MAXKEYVALUE_;
-    char*             subkeyCString   = subkey.ToNewCString();
-    char*             valnameCString  = valname.ToNewCString();
+    unsigned char    valbuf[STRBUFLEN];
+    HKEY    root;
+    HKEY    newkey;
+    LONG    result;
+    DWORD   type = REG_SZ;
+    DWORD   length = STRBUFLEN;
+	  nsString* value;
+    char*   subkeyCString   = subkey.ToNewCString();
+    char*   valnameCString  = valname.ToNewCString();
 
-    root   = (HKEY) mRootKey;
-    result = RegOpenKeyEx( root, subkeyCString, 0, KEY_READ, &newkey );
+
+#ifdef WIN32
+    root   = (HKEY) rootkey;
+    result = RegOpenKeyEx( root, subkeyCString, 0, KEY_ALL_ACCESS, &newkey );
 
     if ( ERROR_SUCCESS == result ) {
         result = RegQueryValueEx( newkey, valnameCString, nsnull, &type, valbuf, &length );
@@ -394,72 +315,19 @@ nsWinReg::NativeGetValueString(const nsString& subkey, const nsString& valname,
 
     if(ERROR_SUCCESS == result && type == REG_SZ)
     {
-        *aReturn = (char*)valbuf;
+        value = new nsString((char*)valbuf);
     }
+#endif
 
-    if (subkeyCString)   Recycle(subkeyCString);
-    if (valnameCString)  Recycle(valnameCString);
+    delete [] subkeyCString;
+    delete [] valnameCString;
+
+    return value;
 }
 
+  
 PRInt32
-nsWinReg::NativeSetValueNumber(const nsString& subkey, const nsString& valname, PRInt32 value)
-{
-    HKEY    root;
-    HKEY    newkey;
-    LONG    result;
-
-    char*   subkeyCString   = subkey.ToNewCString();
-    char*   valnameCString  = valname.ToNewCString();
-    
-    root   = (HKEY) mRootKey;
-    result = RegOpenKeyEx( root, subkeyCString, 0, KEY_WRITE, &newkey);
-
-    if(ERROR_SUCCESS == result)
-    {
-        result = RegSetValueEx( newkey, valnameCString, 0, REG_DWORD, (LPBYTE)&value, sizeof(PRInt32));
-        RegCloseKey( newkey );
-    }
-
-    if (subkeyCString)   Recycle(subkeyCString);
-    if (valnameCString)  Recycle(valnameCString);
-
-    return result;
-}
- 
-void
-nsWinReg::NativeGetValueNumber(const nsString& subkey, const nsString& valname, PRInt32* aReturn)
-{
-    PRInt32 valbuf;
-    PRInt32 valbuflen;
-    HKEY    root;
-    HKEY    newkey;
-    LONG    result;
-    DWORD   type            = REG_DWORD;
-    DWORD   length          = _MAXKEYVALUE_;
-    char*   subkeyCString   = subkey.ToNewCString();
-    char*   valnameCString  = valname.ToNewCString();
-
-    valbuflen = sizeof(PRInt32);
-    root      = (HKEY) mRootKey;
-    result    = RegOpenKeyEx( root, subkeyCString, 0, KEY_READ, &newkey );
-
-    if ( ERROR_SUCCESS == result ) {
-        result = RegQueryValueEx( newkey, valnameCString, nsnull, &type, (LPBYTE)&valbuf, (LPDWORD)&valbuflen);
-
-        RegCloseKey( newkey );
-    }
-
-    if(ERROR_SUCCESS == result && type == REG_DWORD)
-    {
-        *aReturn = valbuf;
-    }
-
-    if (subkeyCString)   Recycle(subkeyCString);
-    if (valnameCString)  Recycle(valnameCString);
-}
-
-PRInt32
-nsWinReg::NativeSetValue(const nsString& subkey, const nsString& valname, nsWinRegValue* value)
+nsWinReg::nativeSetValue(nsString subkey, nsString valname, nsWinRegValue* value)
 {
 #if defined (WIN32) || defined (XP_OS2)
     HKEY    root;
@@ -472,8 +340,8 @@ nsWinReg::NativeSetValue(const nsString& subkey, const nsString& valname, nsWinR
     char*   valnameCString  = valname.ToNewCString();
 
 
-    root   = (HKEY) mRootKey;
-    result = RegOpenKeyEx( root, subkeyCString, 0, KEY_WRITE, &newkey );
+    root   = (HKEY) rootkey;
+    result = RegOpenKeyEx( root, subkeyCString, 0, KEY_ALL_ACCESS, &newkey );
 
     if(ERROR_SUCCESS == result)
     {
@@ -485,8 +353,8 @@ nsWinReg::NativeSetValue(const nsString& subkey, const nsString& valname, nsWinR
         RegCloseKey( newkey );
     }
 
-    if (subkeyCString)   Recycle(subkeyCString);
-    if (valnameCString)  Recycle(valnameCString);
+    delete [] subkeyCString;
+    delete [] valnameCString;
 
     return result;
 #else
@@ -495,7 +363,7 @@ nsWinReg::NativeSetValue(const nsString& subkey, const nsString& valname, nsWinR
 }
   
 nsWinRegValue*
-nsWinReg::NativeGetValue(const nsString& subkey, const nsString& valname)
+nsWinReg::nativeGetValue(nsString subkey, nsString valname)
 {
 #if defined (WIN32) || defined (XP_OS2)
     unsigned char    valbuf[STRBUFLEN];
@@ -509,8 +377,8 @@ nsWinReg::NativeGetValue(const nsString& subkey, const nsString& valname)
     char*   subkeyCString   = subkey.ToNewCString();
     char*   valnameCString  = valname.ToNewCString();
 
-    root   = (HKEY) mRootKey;
-    result = RegOpenKeyEx( root, subkeyCString, 0, KEY_READ, &newkey );
+    root   = (HKEY) rootkey;
+    result = RegOpenKeyEx( root, subkeyCString, 0, KEY_ALL_ACCESS, &newkey );
 
     if(ERROR_SUCCESS == result)
     {
@@ -525,8 +393,8 @@ nsWinReg::NativeGetValue(const nsString& subkey, const nsString& valname)
         RegCloseKey( newkey );
     }
 
-    if (subkeyCString)   Recycle(subkeyCString);
-    if (valnameCString)  Recycle(valnameCString);
+    delete [] subkeyCString;
+    delete [] valnameCString;
 
     return value;
 #else
@@ -534,3 +402,13 @@ nsWinReg::NativeGetValue(const nsString& subkey, const nsString& valname)
 #endif
 }
 
+// PRBool
+// nsWinReg::resolvePrivileges()
+// {
+// 	if(privMgr->enablePrivilege(impersonation, 1) && 
+// 		privMgr->enablePrivilege(target, principal, 1))
+// 		return TRUE;
+// 	else
+// 		return FALSE;
+// }
+