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.win

@@ -25,6 +25,6 @@
 
 DEPTH=..
 
-DIRS= public src 
+DIRS= public res src 
 
 include <$(DEPTH)\config\rules.mak>

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

@@ -2,6 +2,9 @@
          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" />
@@ -23,5 +26,8 @@
          <NC:url>http://home.netscape.com/index.html</NC:url>
        </RDF:Description>
     </RDF:li>
+
+       </RDF:Bag>
+     </RDF:li>
   </RDF:Bag>
 </RDF:RDF>

mozilla/xpinstall/public/MANIFEST

@@ -4,4 +4,3 @@
 
 nsISoftwareUpdate.h
 nsSoftwareUpdateIIDs.h
-nsIXPInstallProgressNotifier.h

mozilla/xpinstall/public/Makefile.in

@@ -31,12 +31,13 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE = xpinstall
 
+XPIDLSRCS = nsIXPInstallProgress.idl
+
 EXPORTS =		             \
         nsIDOMInstallTriggerGlobal.h \
         nsIDOMInstallVersion.h       \
         nsSoftwareUpdateIIDs.h       \
         nsISoftwareUpdate.h          \
-        nsIXPInstallProgressNotifier.h \
         $(NULL)
 
 EXPORTS := $(addprefix $(srcdir)/, $(EXPORTS))

mozilla/xpinstall/public/makefile.win

@@ -22,17 +22,15 @@
 #     Daniel Veditz <dveditz@netscape.com>
 #     Douglas Turner <dougt@netscape.com>
 
+MODULE=xpinstall 
 DEPTH=..\..
 
-DEFINES=-D_IMPL_NS_DOM 
-
 EXPORTS=    nsIDOMInstallTriggerGlobal.h \
 			nsIDOMInstallVersion.h       \
             nsSoftwareUpdateIIDs.h       \
-			nsISoftwareUpdate.h          \
-            nsIXPInstallProgressNotifier.h
+			nsISoftwareUpdate.h
 
-MODULE=xpinstall 
+XPIDLSRCS = .\nsIXPInstallProgress.idl        
 
+include <$(DEPTH)\config\config.mak>
 include <$(DEPTH)\config\rules.mak>
-

mozilla/xpinstall/public/nsISoftwareUpdate.h

@@ -30,7 +30,7 @@
 #include "nsIFactory.h"
 #include "nsString.h"
 
-#include "nsIXPInstallProgressNotifier.h"
+#include "nsIXPInstallProgress.h"
 
 #define NS_IXPINSTALLCOMPONENT_PROGID NS_IAPPSHELLCOMPONENT_PROGID "/xpinstall"
 #define NS_IXPINSTALLCOMPONENT_CLASSNAME "Mozilla XPInstall Component"
@@ -53,13 +53,13 @@ class nsISoftwareUpdate : public nsISupports
                                   const nsString& localFile,
                                   long  flags) = 0; 
             
-            NS_IMETHOD RegisterNotifier(nsIXPInstallProgressNotifier *notifier) = 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(nsIXPInstallProgressNotifier **notifier) = 0;
+            NS_IMETHOD GetTopLevelNotifier(nsIXPInstallProgress **notifier) = 0;
 };
 
 

mozilla/xpinstall/public/nsIXPInstallProgress.idl

@@ -0,0 +1,30 @@
+/* -*- 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
+ * 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 "nsISupports.idl"
+
+[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/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.win

@@ -45,6 +45,7 @@ LINCS=                          \
         -I$(PUBLIC)\netlib      \
         -I$(PUBLIC)\xpcom       \
         -I$(PUBLIC)\pref        \
+        -I$(PUBLIC)\rdf         \
         -I$(PUBLIC)\js          \
         -I$(PUBLIC)\dom         \
         -I$(PUBLIC)\raptor      \
@@ -58,7 +59,6 @@ LLIBS =                                \
         $(DIST)\lib\libreg32.lib       \
         $(DIST)\lib\netlib.lib         \
         $(DIST)\lib\xpcom.lib        \
-        $(DIST)\lib\xppref32.lib       \
         $(DIST)\lib\js3250.lib         \
         $(DIST)\lib\jsdombase_s.lib    \
         $(DIST)\lib\jsdomevents_s.lib  \
@@ -95,6 +95,7 @@ OBJS =                                          \
        .\$(OBJDIR)\nsWinProfile.obj             \
        .\$(OBJDIR)\nsJSWinProfile.obj           \
        .\$(OBJDIR)\nsWinProfileItem.obj         \
+       .\$(OBJDIR)\nsInstallProgressDialog.obj  \
        .\$(OBJDIR)\nsInstallFileOpItem.obj      \
        $(NULL)
 

mozilla/xpinstall/src/nsInstall.cpp

@@ -38,12 +38,11 @@
 #include "nsFileStream.h"
 #include "nsSpecialSystemDirectory.h"
 
-#include "prtime.h"
-#include "prmem.h"
-#include "pratom.h"
-#include "prefapi.h"
-#include "VerReg.h"
+#include "nsIPref.h"
 
+#include "prmem.h"
+
+#include "VerReg.h"
 #include "zipfile.h"
 
 #include "nsInstall.h"
@@ -63,6 +62,10 @@
 #include "nsInstallFileOpEnums.h"
 #include "nsInstallFileOpItem.h"
 
+#ifdef XP_MAC
+#include "Gestalt.h"
+#endif 
+
 #ifdef XP_PC
 #define FILESEP "\\"
 #elif defined(XP_MAC)
@@ -153,7 +156,7 @@ nsInstallInfo::GetArguments(nsString& args, PRUint32 index)
 {
     nsString aURL = GetFromURL(index);
 
-    PRInt32 result = aURL.RFind('?');
+    PRInt32 result = aURL.RFind("?");
     if (result != -1)
     {            
         aURL.Right(args, (aURL.Length() - result - 1) );  
@@ -714,6 +717,25 @@ PRInt32
 nsInstall::Gestalt(const nsString& aSelector, PRInt32* aReturn)
 {
     *aReturn = nsnull;
+
+#ifdef XP_MAC
+	
+    long response = 0;
+    
+    if (aSelector == "")
+    {
+        return NS_OK;
+    }
+
+	char selector[4];
+	
+    aSelector.ToCString((char*)&selector,4);
+
+    Gestalt(selector, (int*)&response);
+
+    *aReturn = response;
+	
+#endif    
     return NS_OK;    
 }
 
@@ -1430,21 +1452,35 @@ nsInstall::GetQualifiedRegName(const nsString& name, nsString& qualifiedRegName
 }
 
 
+static NS_DEFINE_IID(kPrefsIID, NS_IPREF_IID);
+static NS_DEFINE_IID(kPrefsCID,  NS_PREF_CID);
 
 void
 nsInstall::CurrentUserNode(nsString& userRegNode)
 {    
     char *profname;
     int len = MAXREGNAMELEN;
-    int err;
+    nsIPref * prefs;
+    
+    nsresult rv = nsServiceManager::GetService(kPrefsCID, 
+                                               kPrefsIID,
+                                               (nsISupports**) &prefs);
 
-    profname = (char*) PR_Malloc(len);
 
-    err = PREF_GetCharPref( "profile.name", profname, &len );
-
-    if ( err != PREF_OK )
+    if ( NS_SUCCEEDED(rv) )
+    {
+        rv = prefs->CopyCharPref("profile.name", &profname);
+
+        if ( NS_FAILED(rv) )
+        {
+            PR_FREEIF(profname); // Allocated by PREF_CopyCharPref
+            profname = NULL;
+        }
+
+        NS_RELEASE(prefs);
+    }
+    else
     {
-        PR_FREEIF(profname);
         profname = NULL;
     }
     
@@ -1585,7 +1621,7 @@ nsInstall::ExtractFileFromJar(const nsString& aJarfile, nsFileSpec* aSuggestedNa
          
         // Get the extention of the file in the jar.
         
-        PRInt32 result = aJarfile.RFind('.');
+        PRInt32 result = aJarfile.RFind(".");
         if (result != -1)
         {            
             // We found an extention.  Add it to the tempfileName string

mozilla/xpinstall/src/nsInstall.h

@@ -44,7 +44,7 @@
 #include "nsInstallObject.h"
 #include "nsInstallVersion.h"
 
-#include "nsIXPInstallProgressNotifier.h"
+#include "nsIXPInstallProgress.h"
 
 
 class nsInstallInfo
@@ -235,7 +235,7 @@ class nsInstall
         nsVector*           mInstalledFiles;        
         nsHashtable*        mPatchList;
         
-        nsIXPInstallProgressNotifier *mNotifier;
+        nsIXPInstallProgress *mNotifier;
         
         PRInt32             mLastError;
 

mozilla/xpinstall/src/nsInstallProgressDialog.cpp

@@ -0,0 +1,343 @@
+/* -*- 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>
+ */
+
+
+#include "nsIXPInstallProgress.h"
+#include "nsInstallProgressDialog.h"
+
+#include "nsIAppShellComponentImpl.h"
+
+#include "nsIServiceManager.h"
+#include "nsIDocumentViewer.h"
+#include "nsIContent.h"
+#include "nsINameSpaceManager.h"
+#include "nsIContentViewer.h"
+#include "nsIDOMElement.h"
+#include "nsINetService.h"
+
+#include "nsIWebShell.h"
+#include "nsIWebShellWindow.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 );
+
+// Utility to set element attribute.
+static nsresult setAttribute( nsIDOMXULDocument *doc,
+                              const char *id,
+                              const char *name,
+                              const 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->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_REFCNT();
+    mWindow = nsnull;
+    mDocument = nsnull;
+
+}
+
+nsInstallProgressDialog::~nsInstallProgressDialog()
+{
+}
+
+
+NS_IMPL_ADDREF( nsInstallProgressDialog );
+NS_IMPL_RELEASE( nsInstallProgressDialog );
+
+NS_IMETHODIMP 
+nsInstallProgressDialog::QueryInterface(REFNSIID aIID,void** aInstancePtr)
+{
+  if (aInstancePtr == NULL) {
+    return NS_ERROR_NULL_POINTER;
+  }
+
+  // Always NULL result, in case of failure
+  *aInstancePtr = NULL;
+
+  if (aIID.Equals(nsIXPInstallProgress::GetIID())) {
+    *aInstancePtr = (void*) ((nsInstallProgressDialog*)this);
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+  if (aIID.Equals(nsIXULWindowCallbacks::GetIID())) {
+    *aInstancePtr = (void*) ((nsIXULWindowCallbacks*)this);
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+  if (aIID.Equals(kISupportsIID)) {
+    *aInstancePtr = (void*) (nsISupports*)((nsIXPInstallProgress*)this);
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+
+  return NS_ERROR_NO_INTERFACE;
+}
+
+NS_IMETHODIMP 
+nsInstallProgressDialog::BeforeJavascriptEvaluation()
+{
+    nsresult rv = NS_OK;
+
+    // Get app shell service.
+    nsIAppShellService *appShell;
+    rv = nsServiceManager::GetService( kAppShellServiceCID,
+                                       nsIAppShellService::GetIID(),
+                                       (nsISupports**)&appShell );
+
+    if ( NS_SUCCEEDED( rv ) ) 
+    {
+        // Open "progress" dialog.
+        nsIURL *url;
+        rv = NS_NewURL( &url, "resource:/res/xpinstall/progress.xul" );
+        
+        if ( NS_SUCCEEDED(rv) ) 
+        {
+        
+            nsIWebShellWindow *newWindow;
+
+            rv = appShell->CreateTopLevelWindow( nsnull,
+                                                 url,
+                                                 PR_TRUE,
+                                                 newWindow,
+                                                 nsnull,
+                                                 this,  // callbacks??
+                                                 0,
+                                                 0 );
+
+            if ( NS_SUCCEEDED( rv ) ) 
+            {
+                mWindow = newWindow;
+                NS_RELEASE( newWindow );
+
+                 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 NS_OK;
+}
+
+NS_IMETHODIMP 
+nsInstallProgressDialog::AfterJavascriptEvaluation()
+{
+    if (mWindow)
+    {
+        mWindow->Close();
+    }
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP 
+nsInstallProgressDialog::InstallStarted(const char *UIPackageName)
+{
+    setAttribute( mDocument, "dialog.uiPackageName", "value", nsString(UIPackageName) );
+    return NS_OK;
+}
+
+NS_IMETHODIMP 
+nsInstallProgressDialog::ItemScheduled(const char *message)
+{
+    PRInt32 maxChars = 40;
+
+    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)
+    {
+        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 );
+
+    nsresult rv = NS_OK;
+    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;
+}
+
+NS_IMETHODIMP 
+nsInstallProgressDialog::InstallAborted()
+{
+    return NS_OK;
+}
+
+
+
+
+// Do startup stuff from C++ side.
+NS_IMETHODIMP
+nsInstallProgressDialog::ConstructBeforeJavaScript(nsIWebShell *aWebShell) 
+{
+    nsresult rv = NS_OK;
+
+    // Get content viewer from the web shell.
+    nsCOMPtr<nsIContentViewer> contentViewer;
+    rv = aWebShell ? aWebShell->GetContentViewer(getter_AddRefs(contentViewer))
+                   : NS_ERROR_NULL_POINTER;
+
+    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: Upcast to nsIDocumentViewer failed, rv=0x%X\n",
+                          __FILE__, (int)__LINE__, (int)rv );
+        }
+    } 
+    else 
+    {
+        DEBUG_PRINTF( PR_STDOUT, "%s %d: GetContentViewer failed, rv=0x%X\n",
+                      __FILE__, (int)__LINE__, (int)rv );
+    }
+
+    return rv;
+}

mozilla/xpinstall/src/nsInstallProgressDialog.h

@@ -0,0 +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.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 __nsInstallProgressDialog_h__
+#define __nsInstallProgressDialog_h__
+
+#include "nsIXPInstallProgress.h"
+#include "nsISupports.h"
+#include "nsISupportsUtils.h"
+
+#include "nsCOMPtr.h"
+
+#include "nsIWebShell.h"
+#include "nsIWebShellWindow.h"
+#include "nsIXULWindowCallbacks.h"    
+
+#include "nsIDocument.h"
+#include "nsIDOMXULDocument.h"
+
+
+class nsInstallProgressDialog : public nsIXPInstallProgress, public nsIXULWindowCallbacks
+{
+    public: 
+
+        nsInstallProgressDialog();
+        virtual ~nsInstallProgressDialog();
+        
+        NS_DECL_ISUPPORTS
+
+        
+        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();
+
+        // Declare implementations of nsIXULWindowCallbacks interface functions.
+        NS_IMETHOD ConstructBeforeJavaScript(nsIWebShell *aWebShell);
+        NS_IMETHOD ConstructAfterJavaScript(nsIWebShell *aWebShell) { return NS_OK; }
+
+    private:
+
+        nsCOMPtr<nsIDOMXULDocument>  mDocument;
+        nsCOMPtr<nsIWebShellWindow>  mWindow;
+};
+#endif

mozilla/xpinstall/src/nsInstallTrigger.cpp

@@ -27,8 +27,10 @@
 #include "nsISupports.h"
 #include "nsIScriptGlobalObject.h"
 
-#include "pratom.h"
-#include "prefapi.h"
+#include "nsIPref.h"
+
+#include "nsRepository.h"
+#include "nsIServiceManager.h"
 
 #include "nsSpecialSystemDirectory.h"
 
@@ -37,6 +39,7 @@ static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
 static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
 
 static NS_DEFINE_IID(kIInstallTrigger_IID, NS_IDOMINSTALLTRIGGERGLOBAL_IID);
+static NS_DEFINE_IID(kIInstallTrigger_CID, NS_SoftwareUpdateInstallTrigger_CID);
 
 
 
@@ -121,11 +124,37 @@ nsInstallTrigger::SetScriptObject(void *aScriptObject)
   return NS_OK;
 }
 
+static NS_DEFINE_IID(kPrefsIID, NS_IPREF_IID);
+static NS_DEFINE_IID(kPrefsCID,  NS_PREF_CID);
 
 NS_IMETHODIMP    
 nsInstallTrigger::UpdateEnabled(PRBool* aReturn)
 {
-    PREF_GetBoolPref( (const char*) AUTOUPDATE_ENABLE_PREF, aReturn);
+    nsIPref * prefs;
+    
+    nsresult rv = nsServiceManager::GetService(kPrefsCID, 
+                                               kPrefsIID,
+                                               (nsISupports**) &prefs);
+
+
+    if ( NS_SUCCEEDED(rv) )
+    {
+        rv = prefs->GetBoolPref( (const char*) AUTOUPDATE_ENABLE_PREF, aReturn);
+
+        if (NS_FAILED(rv))
+        {
+            *aReturn = PR_FALSE;
+        }
+
+        NS_RELEASE(prefs);
+    }
+    else
+    {
+        *aReturn = PR_FALSE;  /* no prefs manager.  set to false */
+    }
+    
+    //FIX!!!!!!!!!!  
+    *aReturn = PR_TRUE; 
     return NS_OK;
 }
 
@@ -227,14 +256,14 @@ nsInstallTrigger::CreateTempFileFromURL(const nsString& aURL, nsString& tempFile
     {
         nsSpecialSystemDirectory tempFile(nsSpecialSystemDirectory::OS_TemporaryDirectory);
     
-        PRInt32 result = aURL.RFind('/');
+        PRInt32 result = aURL.RFind("/");
         if (result != -1)
         {    
             nsString jarName;
                        
             aURL.Right(jarName, (aURL.Length() - result) );
             
-            PRInt32 argOffset = jarName.RFind('?');
+            PRInt32 argOffset = jarName.RFind("?");
 
             if (argOffset != -1)
             {
@@ -260,101 +289,71 @@ nsInstallTrigger::CreateTempFileFromURL(const nsString& aURL, nsString& tempFile
 /////////////////////////////////////////////////////////////////////////
 // 
 /////////////////////////////////////////////////////////////////////////
-static PRInt32 gInstallTriggerInstanceCnt = 0;
-static PRInt32 gInstallTriggerLock        = 0;
+
+
 
 nsInstallTriggerFactory::nsInstallTriggerFactory(void)
 {
-    mRefCnt=0;
-    PR_AtomicIncrement(&gInstallTriggerInstanceCnt);
+    NS_INIT_REFCNT();
 }
 
 nsInstallTriggerFactory::~nsInstallTriggerFactory(void)
 {
-    PR_AtomicDecrement(&gInstallTriggerInstanceCnt);
+    NS_ASSERTION(mRefCnt == 0, "non-zero refcnt at destruction");
 }
 
-NS_IMETHODIMP 
-nsInstallTriggerFactory::QueryInterface(REFNSIID aIID,void** aInstancePtr)
+NS_IMETHODIMP
+nsInstallTriggerFactory::QueryInterface(const nsIID &aIID, void **aResult)
 {
-    if (aInstancePtr == NULL)
-    {
+    if (! aResult)
         return NS_ERROR_NULL_POINTER;
-    }
 
     // Always NULL result, in case of failure
-    *aInstancePtr = NULL;
+    *aResult = nsnull;
 
-    if ( aIID.Equals(kISupportsIID) )
-    {
-        *aInstancePtr = (void*) this;
-    }
-    else if ( aIID.Equals(kIFactoryIID) )
-    {
-        *aInstancePtr = (void*) this;
+    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;
     }
 
-    if (aInstancePtr == NULL)
-    {
-        return NS_ERROR_NO_INTERFACE;
-    }
-
-    AddRef();
-    return NS_OK;
+    return NS_NOINTERFACE;
 }
 
-
-
-NS_IMETHODIMP_(nsrefcnt)
-nsInstallTriggerFactory::AddRef(void)
-{
-    return ++mRefCnt;
-}
-
-
-NS_IMETHODIMP_(nsrefcnt)
-nsInstallTriggerFactory::Release(void)
-{
-    if (--mRefCnt ==0)
-    {
-        delete this;
-        return 0; // Don't access mRefCnt after deleting!
-    }
-
-    return mRefCnt;
-}
+NS_IMPL_ADDREF(nsInstallTriggerFactory);
+NS_IMPL_RELEASE(nsInstallTriggerFactory);
 
 NS_IMETHODIMP
 nsInstallTriggerFactory::CreateInstance(nsISupports *aOuter, REFNSIID aIID, void **aResult)
 {
-    if (aResult == NULL)
-    {
+   if (! aResult)
         return NS_ERROR_NULL_POINTER;
-    }
 
-    *aResult = NULL;
+    *aResult = nsnull;
+
+    nsresult rv;
 
-    /* do I have to use iSupports? */
     nsInstallTrigger *inst = new nsInstallTrigger();
-
-    if (inst == NULL)
+    
+    if (! inst)
         return NS_ERROR_OUT_OF_MEMORY;
 
-    nsresult result =  inst->QueryInterface(aIID, aResult);
-
-    if (NS_FAILED(result))
-        delete inst;
-
-    return result;
+    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)
 {
-    if (aLock)
-        PR_AtomicIncrement(&gInstallTriggerLock);
-    else
-        PR_AtomicDecrement(&gInstallTriggerLock);
-
+    // Not implemented in simplest case.
     return NS_OK;
 }

mozilla/xpinstall/src/nsInstallVersion.cpp

@@ -27,7 +27,6 @@
 #include "nsISupports.h"
 #include "nsIScriptGlobalObject.h"
 
-#include "pratom.h"
 #include "prprf.h"
 
 static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
@@ -334,69 +333,40 @@ nsInstallVersion::StringToVersionNumbers(const nsString& version, PRInt32 *aMajo
 /////////////////////////////////////////////////////////////////////////
 // 
 /////////////////////////////////////////////////////////////////////////
-static PRInt32 gInstallVersionInstanceCnt = 0;
-static PRInt32 gInstallVersionLock        = 0;
 
 nsInstallVersionFactory::nsInstallVersionFactory(void)
 {
-    mRefCnt=0;
-    PR_AtomicIncrement(&gInstallVersionInstanceCnt);
+    NS_INIT_REFCNT();
 }
 
 nsInstallVersionFactory::~nsInstallVersionFactory(void)
 {
-    PR_AtomicDecrement(&gInstallVersionInstanceCnt);
+    NS_ASSERTION(mRefCnt == 0, "non-zero refcnt at destruction");
 }
 
-NS_IMETHODIMP 
-nsInstallVersionFactory::QueryInterface(REFNSIID aIID,void** aInstancePtr)
+NS_IMETHODIMP
+nsInstallVersionFactory::QueryInterface(const nsIID &aIID, void **aResult)
 {
-    if (aInstancePtr == NULL)
-    {
+    if (! aResult)
         return NS_ERROR_NULL_POINTER;
-    }
 
     // Always NULL result, in case of failure
-    *aInstancePtr = NULL;
+    *aResult = nsnull;
 
-    if ( aIID.Equals(kISupportsIID) )
-    {
-        *aInstancePtr = (void*) this;
+    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;
     }
-    else if ( aIID.Equals(kIFactoryIID) )
-    {
-        *aInstancePtr = (void*) this;
-    }
-
-    if (aInstancePtr == NULL)
-    {
-        return NS_ERROR_NO_INTERFACE;
-    }
-
-    AddRef();
-    return NS_OK;
+    return NS_NOINTERFACE;
 }
 
-
-
-NS_IMETHODIMP_(nsrefcnt)
-nsInstallVersionFactory::AddRef(void)
-{
-    return ++mRefCnt;
-}
-
-
-NS_IMETHODIMP_(nsrefcnt)
-nsInstallVersionFactory::Release(void)
-{
-    if (--mRefCnt ==0)
-    {
-        delete this;
-        return 0; // Don't access mRefCnt after deleting!
-    }
-
-    return mRefCnt;
-}
+NS_IMPL_ADDREF(nsInstallVersionFactory);
+NS_IMPL_RELEASE(nsInstallVersionFactory);
 
 NS_IMETHODIMP
 nsInstallVersionFactory::CreateInstance(nsISupports *aOuter, REFNSIID aIID, void **aResult)
@@ -425,10 +395,5 @@ nsInstallVersionFactory::CreateInstance(nsISupports *aOuter, REFNSIID aIID, void
 NS_IMETHODIMP
 nsInstallVersionFactory::LockFactory(PRBool aLock)
 {
-    if (aLock)
-        PR_AtomicIncrement(&gInstallVersionLock);
-    else
-        PR_AtomicDecrement(&gInstallVersionLock);
-
-    return NS_OK;
+  return NS_OK;
 }

mozilla/xpinstall/src/nsLoggingProgressNotifier.cpp

@@ -22,7 +22,7 @@
  *     Douglas Turner <dougt@netscape.com>
  */
 
-#include "nsIXPInstallProgressNotifier.h"
+#include "nsIXPInstallProgress.h"
 #include "nsLoggingProgressNotifier.h"
 
 #include "nsFileSpec.h"
@@ -35,24 +35,28 @@
 
 nsLoggingProgressNotifier::nsLoggingProgressNotifier()
 {
+    NS_INIT_REFCNT();
 }
 
 nsLoggingProgressNotifier::~nsLoggingProgressNotifier()
 {
 }
 
-void
-nsLoggingProgressNotifier::BeforeJavascriptEvaluation(void)
+NS_IMPL_ISUPPORTS(nsLoggingProgressNotifier, nsIXPInstallProgress::GetIID());
+
+NS_IMETHODIMP
+nsLoggingProgressNotifier::BeforeJavascriptEvaluation()
 {
     nsSpecialSystemDirectory logFile(nsSpecialSystemDirectory::OS_CurrentProcessDirectory);
     logFile += "Install.log";
 
     mLogStream = new nsOutputFileStream(logFile, PR_WRONLY | PR_CREATE_FILE | PR_APPEND, 0744 );
     mLogStream->seek(logFile.GetFileSize());
+    return NS_OK;
 }
 
-void
-nsLoggingProgressNotifier::AfterJavascriptEvaluation(void)
+NS_IMETHODIMP
+nsLoggingProgressNotifier::AfterJavascriptEvaluation()
 {
     char* time;
     GetTime(&time);
@@ -65,12 +69,14 @@ nsLoggingProgressNotifier::AfterJavascriptEvaluation(void)
     mLogStream->close();
     delete mLogStream;
     mLogStream = nsnull;
+
+    return NS_OK;
 }
 
-void
+NS_IMETHODIMP
 nsLoggingProgressNotifier::InstallStarted(const char* UIPackageName)
 {
-    if (mLogStream == nsnull) return;
+    if (mLogStream == nsnull) return -1;
 
     char* time;
     GetTime(&time);
@@ -84,26 +90,28 @@ nsLoggingProgressNotifier::InstallStarted(const char* UIPackageName)
 
 
     PL_strfree(time);
+    return NS_OK;
 }
 
-long
+NS_IMETHODIMP
 nsLoggingProgressNotifier::ItemScheduled(const char* message )
 {
-    return 0;
+    return NS_OK;
 }
 
-void
-nsLoggingProgressNotifier::InstallFinalization(const char* message, long itemNum, long totNum )
+NS_IMETHODIMP
+nsLoggingProgressNotifier::InstallFinalization(const char* message, PRInt32 itemNum, PRInt32 totNum )
 {
-    if (mLogStream == nsnull) return;
+    if (mLogStream == nsnull) return -1;
 
     *mLogStream << "     Item [" << (itemNum+1) << "/" << totNum << "]\t" << message << nsEndl;
+    return NS_OK;
 }
 
-void
-nsLoggingProgressNotifier::InstallAborted(void)
+NS_IMETHODIMP
+nsLoggingProgressNotifier::InstallAborted()
 {
-    if (mLogStream == nsnull) return;
+    if (mLogStream == nsnull) return -1;
 
     char* time;
     GetTime(&time);
@@ -111,6 +119,7 @@ nsLoggingProgressNotifier::InstallAborted(void)
     *mLogStream << "     Aborted Installation at " << time << nsEndl << nsEndl;
 
     PL_strfree(time);
+    return NS_OK;
 }
 
 void 

mozilla/xpinstall/src/nsLoggingProgressNotifier.h

@@ -27,23 +27,25 @@
 #ifndef nsLoggingProgressNotifier_H__
 #define nsLoggingProgressNotifier_H__
 
-#include "nsIXPInstallProgressNotifier.h"
+#include "nsIXPInstallProgress.h"
 #include "nsFileStream.h"
 
 
-class nsLoggingProgressNotifier : public nsIXPInstallProgressNotifier
+class nsLoggingProgressNotifier : public nsIXPInstallProgress
 {
     public:
         
         nsLoggingProgressNotifier();
         virtual ~nsLoggingProgressNotifier();
-                
-        void BeforeJavascriptEvaluation(void);
-        void AfterJavascriptEvaluation(void);
-        void InstallStarted(const char* UIPackageName);
-        long ItemScheduled(const char* message );
-        void InstallFinalization(const char* message, long itemNum, long totNum );
-        void InstallAborted(void);
+        
+        NS_DECL_ISUPPORTS
+
+        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);

mozilla/xpinstall/src/nsSoftwareUpdate.cpp

@@ -40,6 +40,7 @@
 
 #include "nsTopProgressNotifier.h"
 #include "nsLoggingProgressNotifier.h"
+#include "nsInstallProgressDialog.h"
 
 #include "nsIAppShellComponent.h"
 #include "nsIRegistry.h"
@@ -54,6 +55,10 @@
 #include "nsIScriptNameSpaceManager.h"
 #include "nsIScriptExternalNameSet.h"
 
+#include "nsIEventQueueService.h"
+#include "nsProxyObjectManager.h"
+
+
 ////////////////////////////////////////////////////////////////////////////////
 // Globals
 ////////////////////////////////////////////////////////////////////////////////
@@ -76,8 +81,8 @@ static NS_DEFINE_IID(kInstallTrigger_CID, NS_SoftwareUpdateInstallTrigger_CID);
 static NS_DEFINE_IID(kIInstallVersion_IID, NS_IDOMINSTALLVERSION_IID);
 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()
@@ -114,7 +119,7 @@ nsSoftwareUpdate::nsSoftwareUpdate()
     NR_StartupRegistry();   /* startup the registry; if already started, this will essentially be a noop */
 
     nsSpecialSystemDirectory appDir(nsSpecialSystemDirectory::OS_CurrentProcessDirectory);
-    VR_SetRegDirectory( nsNSPRPath(appDir) );
+    VR_SetRegDirectory( appDir.GetNativePathCString() );
     
     /***************************************/
     /* Stupid Hack to test js env*/
@@ -148,7 +153,56 @@ nsSoftwareUpdate::nsSoftwareUpdate()
     
     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();
 }
+
+
+
+
+
 nsSoftwareUpdate::~nsSoftwareUpdate()
 {
 #ifdef NS_DEBUG
@@ -238,7 +292,7 @@ nsSoftwareUpdate::Shutdown()
 
 
 NS_IMETHODIMP 
-nsSoftwareUpdate::RegisterNotifier(nsIXPInstallProgressNotifier *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
@@ -250,7 +304,7 @@ nsSoftwareUpdate::RegisterNotifier(nsIXPInstallProgressNotifier *notifier)
 }
 
 NS_IMETHODIMP
-nsSoftwareUpdate::GetTopLevelNotifier(nsIXPInstallProgressNotifier **notifier)
+nsSoftwareUpdate::GetTopLevelNotifier(nsIXPInstallProgress **notifier)
 {
     *notifier = mTopLevelObserver;
     return NS_OK;

mozilla/xpinstall/src/nsSoftwareUpdate.h

@@ -15,7 +15,7 @@ class nsInstallInfo;
 
 #include "nsIScriptExternalNameSet.h"
 #include "nsIAppShellComponent.h"
-#include "nsIXPInstallProgressNotifier.h"
+#include "nsIXPInstallProgress.h"
 #include "nsTopProgressNotifier.h"
 
 class nsSoftwareUpdate:  public nsIAppShellComponent, public nsISoftwareUpdate
@@ -34,12 +34,12 @@ class nsSoftwareUpdate:  public nsIAppShellComponent, public nsISoftwareUpdate
                               const nsString& localFile, 
                               long flags);  
 
-        NS_IMETHOD RegisterNotifier(nsIXPInstallProgressNotifier *notifier);
+        NS_IMETHOD RegisterNotifier(nsIXPInstallProgress *notifier);
         
         NS_IMETHOD InstallPending(void);
 
         NS_IMETHOD InstallJarCallBack();
-        NS_IMETHOD GetTopLevelNotifier(nsIXPInstallProgressNotifier **notifier);
+        NS_IMETHOD GetTopLevelNotifier(nsIXPInstallProgress **notifier);
 
 
     private:

mozilla/xpinstall/src/nsSoftwareUpdateRun.cpp

@@ -295,7 +295,7 @@ extern "C" void RunInstallOnThread(void *data)
                                                 kISoftwareUpdateIID,
                                                 (nsISupports**)&softwareUpdate);
     
-    nsIXPInstallProgressNotifier *notifier;
+    nsIXPInstallProgress *notifier;
 
     if (NS_SUCCEEDED(rv))
     {

mozilla/xpinstall/src/nsTopProgressNotifier.cpp

@@ -22,7 +22,7 @@
  *     Douglas Turner <dougt@netscape.com>
  */
 
-#include "nsIXPInstallProgressNotifier.h"
+#include "nsIXPInstallProgress.h"
 #include "nsTopProgressNotifier.h"
 
 nsTopProgressNotifier::nsTopProgressNotifier()
@@ -37,7 +37,7 @@ nsTopProgressNotifier::~nsTopProgressNotifier()
         PRUint32 i=0;
         for (; i < mNotifiers->GetSize(); i++) 
         {
-            nsIXPInstallProgressNotifier* element = (nsIXPInstallProgressNotifier*)mNotifiers->Get(i);
+            nsIXPInstallProgress* element = (nsIXPInstallProgress*)mNotifiers->Get(i);
             delete element;
         }
 
@@ -46,8 +46,12 @@ nsTopProgressNotifier::~nsTopProgressNotifier()
     }
 }
 
+
+NS_IMPL_ISUPPORTS(nsTopProgressNotifier, nsIXPInstallProgress::GetIID());
+
+
 long
-nsTopProgressNotifier::RegisterNotifier(nsIXPInstallProgressNotifier * newNotifier)
+nsTopProgressNotifier::RegisterNotifier(nsIXPInstallProgress * newNotifier)
 {
      return mNotifiers->Add( newNotifier );
 }
@@ -61,22 +65,24 @@ nsTopProgressNotifier::UnregisterNotifier(long id)
 
 
 
-void
-nsTopProgressNotifier::BeforeJavascriptEvaluation(void)
+NS_IMETHODIMP
+nsTopProgressNotifier::BeforeJavascriptEvaluation()
 {
     if (mNotifiers)
     {
         PRUint32 i=0;
         for (; i < mNotifiers->GetSize(); i++) 
         {
-            nsIXPInstallProgressNotifier* element = (nsIXPInstallProgressNotifier*)mNotifiers->Get(i);
+            nsIXPInstallProgress* element = (nsIXPInstallProgress*)mNotifiers->Get(i);
             if (element != NULL)
                 element->BeforeJavascriptEvaluation();
         }
     }
+    
+    return NS_OK;
 }
 
-void
+NS_IMETHODIMP
 nsTopProgressNotifier::AfterJavascriptEvaluation(void)
 {
     if (mNotifiers)
@@ -84,14 +90,15 @@ nsTopProgressNotifier::AfterJavascriptEvaluation(void)
         PRUint32 i=0;
         for (; i < mNotifiers->GetSize(); i++) 
         {
-            nsIXPInstallProgressNotifier* element = (nsIXPInstallProgressNotifier*)mNotifiers->Get(i);
+            nsIXPInstallProgress* element = (nsIXPInstallProgress*)mNotifiers->Get(i);
             if (element != NULL)
                 element->AfterJavascriptEvaluation();
         }
     }
+    return NS_OK;
 }
 
-void
+NS_IMETHODIMP
 nsTopProgressNotifier::InstallStarted(const char* UIPackageName)
 {
     if (mNotifiers)
@@ -99,14 +106,15 @@ nsTopProgressNotifier::InstallStarted(const char* UIPackageName)
         PRUint32 i=0;
         for (; i < mNotifiers->GetSize(); i++) 
         {
-            nsIXPInstallProgressNotifier* element = (nsIXPInstallProgressNotifier*)mNotifiers->Get(i);
+            nsIXPInstallProgress* element = (nsIXPInstallProgress*)mNotifiers->Get(i);
             if (element != NULL)
                 element->InstallStarted(UIPackageName);
         }
     }
+    return NS_OK;
 }
 
-long
+NS_IMETHODIMP
 nsTopProgressNotifier::ItemScheduled( const char* message )
 {
     long rv = 0;
@@ -116,7 +124,7 @@ nsTopProgressNotifier::ItemScheduled( const char* message )
         PRUint32 i=0;
         for (; i < mNotifiers->GetSize(); i++) 
         {
-            nsIXPInstallProgressNotifier* element = (nsIXPInstallProgressNotifier*)mNotifiers->Get(i);
+            nsIXPInstallProgress* element = (nsIXPInstallProgress*)mNotifiers->Get(i);
             if (element != NULL)
                 if (element->ItemScheduled( message ) != 0)
                     rv = -1;
@@ -126,22 +134,23 @@ nsTopProgressNotifier::ItemScheduled( const char* message )
     return rv;
 }
 
-void
-nsTopProgressNotifier::InstallFinalization( const char* message, long itemNum, long totNum )
+NS_IMETHODIMP
+nsTopProgressNotifier::InstallFinalization( const char* message, PRInt32 itemNum, PRInt32 totNum )
 {
     if (mNotifiers)
     {
         PRUint32 i=0;
         for (; i < mNotifiers->GetSize(); i++) 
         {
-            nsIXPInstallProgressNotifier* element = (nsIXPInstallProgressNotifier*)mNotifiers->Get(i);
+            nsIXPInstallProgress* element = (nsIXPInstallProgress*)mNotifiers->Get(i);
             if (element != NULL)
                 element->InstallFinalization( message, itemNum, totNum );
         }
     }
+    return NS_OK;
 }
 
-void
+NS_IMETHODIMP
 nsTopProgressNotifier::InstallAborted(void)
 {
    if (mNotifiers)
@@ -149,11 +158,12 @@ nsTopProgressNotifier::InstallAborted(void)
         PRUint32 i=0;
         for (; i < mNotifiers->GetSize(); i++) 
         {
-            nsIXPInstallProgressNotifier* element = (nsIXPInstallProgressNotifier*)mNotifiers->Get(i);
+            nsIXPInstallProgress* element = (nsIXPInstallProgress*)mNotifiers->Get(i);
             if (element != NULL)
                 element->InstallAborted();
         }
     }
+   return NS_OK;
 }
 
 

mozilla/xpinstall/src/nsTopProgressNotifier.h

@@ -25,26 +25,29 @@
 #ifndef nsTopProgressNotifier_h__
 #define nsTopProgressNotifier_h__
 
-#include "nsIXPInstallProgressNotifier.h"
+#include "nsIXPInstallProgress.h"
 #include "nsVector.h"
 
 
-class nsTopProgressNotifier : public nsIXPInstallProgressNotifier
+class nsTopProgressNotifier : public nsIXPInstallProgress
 {
     public:
 
         nsTopProgressNotifier();
         virtual ~nsTopProgressNotifier();
 
-        long RegisterNotifier(nsIXPInstallProgressNotifier * newNotifier);
+        long RegisterNotifier(nsIXPInstallProgress * newNotifier);
         void UnregisterNotifier(long id);
 
-        void BeforeJavascriptEvaluation(void);
-        void AfterJavascriptEvaluation(void);
-        void InstallStarted(const char* UIPackageName);
-        long ItemScheduled(const  char* message );
-        void InstallFinalization(const char* message, long itemNum, long totNum );
-        void InstallAborted(void);
+        NS_DECL_ISUPPORTS
+
+
+        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:
         nsVector *mNotifiers;