updated comment

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

mozilla/mailnews/base/public/nsIMapiRegistry.idl

@@ -1,70 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Srilatha Moturi <srilatha@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsISupports.idl"
-
-interface nsIDOMWindow;
-
-/**
- * This interface provides support for registering Mozilla as the default
- * Mail Client. This interface can also be used to get/set the user preference
- * for the default Mail Client.
- * 
- */
-[scriptable, uuid(c5be14ba-4e0a-4eec-a1b8-04363761d63c)]
-interface nsIMapiRegistry: nsISupports {
-
-   /** This is set to TRUE if Mozilla is the default Application
-    */
-   attribute boolean isDefaultMailClient;
-
-   /** This is set TRUE only once per session.
-    */
-   readonly attribute boolean showDialog;
-
-   /** This will bring the dialog asking the user if he/she wants to set
-    * Mozilla as default Mail Client.
-    * Call this only if Mozilla is not the default Mail client
-    */
-   void showMailIntegrationDialog(in nsIDOMWindow parentWindow);
-   
-};
-
-%{C++
-#define NS_IMAPIREGISTRY_CONTRACTID    "@mozilla.org/mapiregistry;1"
-#define NS_IMAPIREGISTRY_CLASSNAME "Mozilla MAPI Registry"
-%}

mozilla/mailnews/mapi/mapiDll/Mapi32.DEF

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

mozilla/mailnews/mapi/mapiDll/MapiDll.cpp

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

mozilla/mailnews/mapi/mapiDll/makefile.win

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

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

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

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

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

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

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

mozilla/mailnews/mapi/mapihook/makefile.win

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

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

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

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

@@ -1,70 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Srilatha Moturi <srilatha@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "nsISupports.idl"
-
-interface nsIDOMWindow;
-
-/**
- * This interface provides support for registering Mozilla as the default
- * Mail Client. This interface can also be used to get/set the user preference
- * for the default Mail Client.
- * 
- */
-[scriptable, uuid(c5be14ba-4e0a-4eec-a1b8-04363761d63c)]
-interface nsIMapiRegistry: nsISupports {
-
-   /** This is set to TRUE if Mozilla is the default Application
-    */
-   attribute boolean isDefaultMailClient;
-
-   /** This is set TRUE only once per session.
-    */
-   readonly attribute boolean showDialog;
-
-   /** This will bring the dialog asking the user if he/she wants to set
-    * Mozilla as default Mail Client.
-    * Call this only if Mozilla is not the default Mail client
-    */
-   void showMailIntegrationDialog(in nsIDOMWindow parentWindow);
-   
-};
-
-%{C++
-#define NS_IMAPIREGISTRY_CONTRACTID    "@mozilla.org/mapiregistry;1"
-#define NS_IMAPIREGISTRY_CLASSNAME "Mozilla MAPI Registry"
-%}

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

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

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

@@ -1,323 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corp.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Krishna Mohan Khandrika <kkhandrika@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#undef _UNICODE
-#undef UNICODE
-
-#include <objbase.h>
-#include "nsString.h"
-#include "Registry.h"
-
-#define MAPI_PROXY_DLL_NAME   "MapiProxy.dll"
-#define MAPI_STARTUP_ARG      " /MAPIStartUp"
-#define MAX_SIZE              2048
-
-// Size of a CLSID as a string
-const int CLSID_STRING_SIZE = 39;
-
-// Proxy/Stub Dll Routines
-
-typedef HRESULT (__stdcall ProxyServer)();
-
-
-// Convert a CLSID to a char string.
-
-BOOL CLSIDtochar(const CLSID& clsid, char* szCLSID,
-                 int length)
-{
-    LPOLESTR wszCLSID = NULL;
-
-    // Get CLSID
-    HRESULT hr = StringFromCLSID(clsid, &wszCLSID);
-    if (FAILED(hr))
-        return FALSE;
-
-    // Covert from wide characters to non-wide.
-    wcstombs(szCLSID, wszCLSID, length);
-
-    // Free memory.
-    CoTaskMemFree(wszCLSID);
-
-    return TRUE;
-}
-
-// Create a key and set its value.
-
-BOOL setKeyAndValue(nsCAutoString keyName, const char* subKey,
-                    const char* theValue)
-{
-    HKEY hKey;
-    BOOL retValue = TRUE;
-
-    nsCAutoString theKey(keyName);
-    if (subKey != NULL)
-    {
-        theKey += "\\";
-        theKey += subKey;
-    }
-
-    // Create and open key and subkey.
-    long lResult = RegCreateKeyEx(HKEY_CLASSES_ROOT, theKey.get(), 
-                                  0, NULL, REG_OPTION_NON_VOLATILE,
-                                  KEY_ALL_ACCESS, NULL, &hKey, NULL);
-    if (lResult != ERROR_SUCCESS)
-        return FALSE ;
-
-    // Set the Value.
-    if (theValue != NULL)
-    {
-       lResult = RegSetValueEx(hKey, NULL, 0, REG_SZ, (BYTE *)theValue, 
-                      strlen(theValue)+1);
-       if (lResult != ERROR_SUCCESS)
-           retValue = FALSE;
-    }
-
-    RegCloseKey(hKey);
-    return TRUE;
-}
-
-// Delete a key and all of its descendents.
-
-LONG recursiveDeleteKey(HKEY hKeyParent,           // Parent of key to delete
-                        const char* lpszKeyChild)  // Key to delete
-{
-    // Open the child.
-    HKEY hKeyChild ;
-    LONG lRes = RegOpenKeyEx(hKeyParent, lpszKeyChild, 0,
-                             KEY_ALL_ACCESS, &hKeyChild) ;
-    if (lRes != ERROR_SUCCESS)
-    {
-        return lRes ;
-    }
-
-    // Enumerate all of the decendents of this child.
-    FILETIME time ;
-    char szBuffer[MAX_SIZE] ;
-    DWORD dwSize = MAX_SIZE ;
-    while (RegEnumKeyEx(hKeyChild, 0, szBuffer, &dwSize, NULL,
-                        NULL, NULL, &time) == S_OK)
-    {
-        // Delete the decendents of this child.
-        lRes = recursiveDeleteKey(hKeyChild, szBuffer) ;
-        if (lRes != ERROR_SUCCESS)
-        {
-            // Cleanup before exiting.
-            RegCloseKey(hKeyChild) ;
-            return lRes;
-        }
-        dwSize = MAX_SIZE;
-    }
-
-    // Close the child.
-    RegCloseKey(hKeyChild) ;
-
-    // Delete this child.
-    return RegDeleteKey(hKeyParent, lpszKeyChild) ;
-}
-
-void RegisterProxy()
-{
-    HINSTANCE h = NULL;
-    ProxyServer *RegisterFunc = NULL;
-
-    char szModule[MAX_SIZE];
-    char *pTemp = NULL;
-
-    HMODULE hModule = GetModuleHandle(NULL);
-    DWORD dwResult  = ::GetModuleFileName(hModule, szModule,
-                                          sizeof(szModule)/sizeof(char));
-    if (dwResult == 0)
-        return;
-
-    pTemp = strrchr(szModule, '\\');
-    if (pTemp == NULL)
-        return;
-
-    *pTemp = '\0';
-    nsCAutoString proxyPath(szModule);
-
-    proxyPath += "\\";
-    proxyPath += MAPI_PROXY_DLL_NAME;
-
-    h = LoadLibrary(proxyPath.get());
-    if (h == NULL)
-        return;
-
-    RegisterFunc = (ProxyServer *) GetProcAddress(h, "DllRegisterServer");
-    if (RegisterFunc)
-        RegisterFunc();
-
-    FreeLibrary(h);
-}
-
-void UnRegisterProxy()
-{
-    HINSTANCE h = NULL;
-    ProxyServer *UnRegisterFunc = NULL;
-
-    char szModule[MAX_SIZE];
-    char *pTemp = NULL;
-
-    HMODULE hModule = GetModuleHandle(NULL);
-    DWORD dwResult  = ::GetModuleFileName(hModule, szModule,
-                                          sizeof(szModule)/sizeof(char));
-    if (dwResult == 0)
-        return;
-
-    pTemp = strrchr(szModule, '\\');
-    if (pTemp == NULL)
-        return;
-
-    *pTemp = '\0';
-    nsCAutoString proxyPath(szModule);
-
-    proxyPath += "\\";
-    proxyPath += MAPI_PROXY_DLL_NAME;
-
-    h = LoadLibrary(proxyPath.get());
-    if (h == NULL)
-        return;
-
-    UnRegisterFunc = (ProxyServer *) GetProcAddress(h, "DllUnregisterServer");
-    if (UnRegisterFunc)
-        UnRegisterFunc();
-
-    FreeLibrary(h);
-}
-
-// Register the component in the registry.
-
-HRESULT RegisterServer(const CLSID& clsid,         // Class ID
-                       const char* szFriendlyName, // Friendly Name
-                       const char* szVerIndProgID, // Programmatic
-                       const char* szProgID)       //   IDs
-{
-    HMODULE hModule = GetModuleHandle(NULL);
-    char szModuleName[MAX_SIZE];
-    char szCLSID[CLSID_STRING_SIZE];
-
-    nsCAutoString independentProgId(szVerIndProgID);
-    nsCAutoString progId(szProgID);
-
-    DWORD dwResult = ::GetModuleFileName(hModule, szModuleName,
-                              sizeof(szModuleName)/sizeof(char));
-
-    if (dwResult == 0)
-        return S_FALSE;
-
-    nsCAutoString moduleName(szModuleName);
-    nsCAutoString registryKey("CLSID\\");
-
-    moduleName += MAPI_STARTUP_ARG;
-
-    // Convert the CLSID into a char.
-
-    if (!CLSIDtochar(clsid, szCLSID, sizeof(szCLSID)))
-        return S_FALSE;
-    registryKey += szCLSID;
-
-    // Add the CLSID to the registry.
-    if (!setKeyAndValue(registryKey, NULL, szFriendlyName))
-        return S_FALSE;
-
-    if (!setKeyAndValue(registryKey, "LocalServer32", moduleName.get()))
-        return S_FALSE;
-
-    // Add the ProgID subkey under the CLSID key.
-    if (!setKeyAndValue(registryKey, "ProgID", szProgID))
-        return S_FALSE;
-
-    // Add the version-independent ProgID subkey under CLSID key.
-    if (!setKeyAndValue(registryKey, "VersionIndependentProgID", szVerIndProgID))
-        return S_FALSE;
-
-    // Add the version-independent ProgID subkey under HKEY_CLASSES_ROOT.
-    if (!setKeyAndValue(independentProgId, NULL, szFriendlyName))
-        return S_FALSE; 
-    if (!setKeyAndValue(independentProgId, "CLSID", szCLSID))
-        return S_FALSE;
-    if (!setKeyAndValue(independentProgId, "CurVer", szProgID))
-        return S_FALSE;
-
-    // Add the versioned ProgID subkey under HKEY_CLASSES_ROOT.
-    if (!setKeyAndValue(progId, NULL, szFriendlyName))
-        return S_FALSE; 
-    if (!setKeyAndValue(progId, "CLSID", szCLSID))
-        return S_FALSE;
-
-    RegisterProxy();
-
-    return S_OK;
-}
-
-LONG UnregisterServer(const CLSID& clsid,         // Class ID
-                      const char* szVerIndProgID, // Programmatic
-                      const char* szProgID)       //   IDs
-{
-    LONG lResult = S_OK;
-
-    // Convert the CLSID into a char.
-
-    char szCLSID[CLSID_STRING_SIZE];
-    if (!CLSIDtochar(clsid, szCLSID, sizeof(szCLSID)))
-        return S_FALSE;
-
-    UnRegisterProxy();
-
-    nsCAutoString registryKey("CLSID\\");
-    registryKey += szCLSID;
-
-    lResult = recursiveDeleteKey(HKEY_CLASSES_ROOT, registryKey.get());
-    if (lResult == ERROR_SUCCESS || lResult == ERROR_FILE_NOT_FOUND)
-        return lResult;
-
-    registryKey += "\\LocalServer32";
-
-    // Delete only the path for this server.
-
-    lResult = recursiveDeleteKey(HKEY_CLASSES_ROOT, registryKey.get());
-    if (lResult != ERROR_SUCCESS && lResult != ERROR_FILE_NOT_FOUND)
-        return lResult;
-
-    // Delete the version-independent ProgID Key.
-    lResult = recursiveDeleteKey(HKEY_CLASSES_ROOT, szVerIndProgID);
-    if (lResult != ERROR_SUCCESS && lResult != ERROR_FILE_NOT_FOUND)
-        return lResult;
-
-    lResult = recursiveDeleteKey(HKEY_CLASSES_ROOT, szProgID);
-
-    return lResult;
-}

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

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

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

@@ -1,107 +0,0 @@
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-# Srilatha Moturi <srilatha@netscape.com>
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH=..\..\..\..
-
-MODULE          = msgMapi
-MAKE_OBJ_TYPE = DLL
-LIBRARY_NAME=$(MODULE)
-MODULE_NAME	= $(MODULE)
-
-REQUIRES        = xpcom \
-                  string \
-		  MapiProxy \
-		  appshell \
-		  windowwatcher \
-		  dom \
-		  profile \
-		  msgbase \
-		  pref \
-		  msgbaseutil \
-		  msgcompo \
-		  mailnews \
-		  necko \
-		  intl \
-		  editor \
-		  msgdb \
-		  uriloader \
- 	          appstartup \
-	$(NULL)
-
-include <$(DEPTH)\config\config.mak>
-############################################################################
-
-LCFLAGS=-DUNICODE -D_UNICODE
-
-
-
-OBJS=   \
-    ..\build\$(OBJDIR)\msgMapi_i.obj    \
-    .\$(OBJDIR)\msgMapiFactory.obj  \
-    .\$(OBJDIR)\msgMapiHook.obj \
-    .\$(OBJDIR)\msgMapiImp.obj  \
-    .\$(OBJDIR)\msgMapiMain.obj \
-    .\$(OBJDIR)\msgMapiSupport.obj  \
-	.\$(OBJDIR)\nsMapiRegistry.obj	\
-	.\$(OBJDIR)\nsMapiRegistryUtils.obj \
-    .\$(OBJDIR)\Registry.obj  \
-	$(NULL)
-
-
-
-LLIBS=                               \
- $(DIST)\lib\xpcom.lib               \
- $(DIST)\lib\msgbsutl.lib            \
- $(LIBNSPR)                          \
- $(NULL)
-
-WIN_LIBS=       \
-	ole32.lib   \
-    $(NULL)
-
-EXPORTS=	\
-    msgMapiFactory.h    \
-    msgMapiHook.h       \
-    msgMapiImp.h        \
-    msgMapiMain.h       \
-    msgMapiSupport.h    \
-	nsMapiRegistry.h		\
-	nsMapiRegistryUtils.h   \
-    Registry.h \
-	$(NULL)
-
-include <$(DEPTH)\config\rules.mak>

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

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

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

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

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

@@ -1,777 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corp.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
- * Contributor(s): Srilatha Moturi (srilatha@netscape.com)
- * Contributor(s): Rajiv Dayal (rdayal@netscape.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#define MAPI_STARTUP_ARG       "/MAPIStartUp"
-
-#define MAPI_STARTUP_ARG       "/MAPIStartUp"
-
-#include <mapidefs.h>
-#include <mapi.h>
-#include <tchar.h>
-
-#include "nsCOMPtr.h"
-#include "nsIComponentManager.h"
-#include "nsIServiceManager.h"
-#include "nsISupports.h"
-#include "nsIPromptService.h"
-#include "nsAppShellCIDs.h"
-#include "nsIDOMWindowInternal.h"
-#include "nsIAppShellService.h"
-#include "nsINativeAppSupport.h"
-#include "nsICmdLineService.h"
-#include "nsIProfileInternal.h"
-#include "nsIMsgAccountManager.h"
-#include "nsIDOMWindowInternal.h"
-#include "nsXPIDLString.h"
-#include "nsReadableUtils.h"
-#include "nsMsgBaseCID.h"
-#include "nsIStringBundle.h"
-#include "nsIPref.h"
-#include "nsString.h"
-
-#include "nsIMsgAttachment.h"
-#include "nsIMsgCompFields.h"
-#include "nsIMsgComposeParams.h"
-#include "nsIMsgCompose.h"
-#include "nsMsgCompCID.h"
-#include "nsIMsgSend.h"
-#include "nsIProxyObjectManager.h"
-#include "nsIMsgComposeService.h"
-#include "nsProxiedService.h"
-#include "nsSpecialSystemDirectory.h"
-#include "nsMsgI18N.h"
-
-#include "msgMapi.h"
-#include "msgMapiHook.h"
-#include "msgMapiSupport.h"
-#include "msgMapiMain.h"
-#include "nsNetUtil.h"
-
-static NS_DEFINE_CID(kCmdLineServiceCID, NS_COMMANDLINE_SERVICE_CID);
-
-class nsMAPISendListener : public nsIMsgSendListener
-{
-public:
-
-    virtual ~nsMAPISendListener() { }
-
-    // nsISupports interface
-    NS_DECL_ISUPPORTS
-
-    /* void OnStartSending (in string aMsgID, in PRUint32 aMsgSize); */
-    NS_IMETHOD OnStartSending(const char *aMsgID, PRUint32 aMsgSize) { return NS_OK; }
-
-    /* void OnProgress (in string aMsgID, in PRUint32 aProgress, in PRUint32 aProgressMax); */
-    NS_IMETHOD OnProgress(const char *aMsgID, PRUint32 aProgress, PRUint32 aProgressMax) { return NS_OK;}
-
-    /* void OnStatus (in string aMsgID, in wstring aMsg); */
-    NS_IMETHOD OnStatus(const char *aMsgID, const PRUnichar *aMsg) { return NS_OK;}
-
-    /* void OnStopSending (in string aMsgID, in nsresult aStatus, in wstring aMsg, in nsIFileSpec returnFileSpec); */
-    NS_IMETHOD OnStopSending(const char *aMsgID, nsresult aStatus, const PRUnichar *aMsg, 
-                           nsIFileSpec *returnFileSpec) {
-        m_done = PR_TRUE;
-        HANDLE hEvent = CreateEvent (NULL, FALSE, FALSE, (LPCTSTR) MAPI_SENDCOMPLETE_EVENT) ;
-        SetEvent (hEvent) ;
-        CloseHandle (hEvent) ;
-        return NS_OK ;
-    }
-
- /* void OnSendNotPerformed */
- NS_IMETHOD OnSendNotPerformed(const char *aMsgID, nsresult aStatus)
- {
- return OnStopSending(aMsgID, aStatus, nsnull, nsnull) ;
- }
- 
-    /* void OnGetDraftFolderURI (); */
-    NS_IMETHOD OnGetDraftFolderURI(const char *aFolderURI) {return NS_OK;}
-
-    static nsresult CreateMAPISendListener( nsIMsgSendListener **ppListener);
-
-    PRBool IsDone() { return m_done ; }
-
-protected :
-    nsMAPISendListener() {
-        NS_INIT_REFCNT(); 
-        m_done = PR_FALSE;
-    }
-
-    PRBool          m_done;
-};
-
-
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsMAPISendListener, nsIMsgSendListener)
-
-nsresult nsMAPISendListener::CreateMAPISendListener( nsIMsgSendListener **ppListener)
-{
-    NS_ENSURE_ARG_POINTER(ppListener) ;
-
-    *ppListener = new nsMAPISendListener();
-    if (! *ppListener)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    NS_ADDREF(*ppListener);
-    return NS_OK;
-}
-
-PRBool nsMapiHook::isMapiService = PR_FALSE;
-
-PRBool nsMapiHook::Initialize()
-{
-    nsresult rv;
-    nsCOMPtr<nsINativeAppSupport> native;
-
-    nsCOMPtr<nsICmdLineService> cmdLineArgs(do_GetService(kCmdLineServiceCID, &rv));
-    if (NS_FAILED(rv)) return PR_FALSE;
-
-    nsCOMPtr<nsIAppShellService> appShell (do_GetService( "@mozilla.org/appshell/appShellService;1", &rv));
-    if (NS_FAILED(rv)) return PR_FALSE;
-
-    rv = appShell->GetNativeAppSupport( getter_AddRefs( native ));
-    if (NS_FAILED(rv)) return PR_FALSE;
-
-    rv = native->EnsureProfile(cmdLineArgs);
-    if (NS_FAILED(rv)) return PR_FALSE;
-
-    return PR_TRUE;
-}
-
-void nsMapiHook::CleanUp()
-{
-    // This routine will be fully implemented in future
-    // to cleanup mapi related stuff inside mozilla code.
-}
-
-PRBool nsMapiHook::DisplayLoginDialog(PRBool aLogin, PRUnichar **aUsername, \
-                      PRUnichar **aPassword)
-{
-    nsresult rv;
-    PRBool btnResult = PR_FALSE;
-
-    nsCOMPtr<nsIAppShellService> appShell(do_GetService( "@mozilla.org/appshell/appShellService;1", &rv));
-    if (NS_FAILED(rv) || !appShell) return PR_FALSE;
-   
-    nsCOMPtr<nsIPromptService> dlgService(do_GetService("@mozilla.org/embedcomp/prompt-service;1", &rv));
-    if (NS_SUCCEEDED(rv) && dlgService)
-    {
-        nsCOMPtr<nsIStringBundleService> bundleService(do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv));
-        if (NS_FAILED(rv) || !bundleService) return PR_FALSE;
-
-        nsCOMPtr<nsIStringBundle> bundle;
-        rv = bundleService->CreateBundle(MAPI_PROPERTIES_CHROME, getter_AddRefs(bundle));
-        if (NS_FAILED(rv) || !bundle) return PR_FALSE;
-
-        nsCOMPtr<nsIStringBundle> brandBundle;
-        rv = bundleService->CreateBundle(
-                        "chrome://global/locale/brand.properties",
-                        getter_AddRefs(brandBundle));
-        if (NS_FAILED(rv)) return PR_FALSE;
-
-        nsXPIDLString brandName;
-        rv = brandBundle->GetStringFromName(
-                           NS_LITERAL_STRING("brandShortName").get(),
-                           getter_Copies(brandName));
-        if (NS_FAILED(rv)) return PR_FALSE;
-        
-        nsXPIDLString loginTitle;
-        const PRUnichar *brandStrings[] = { brandName.get() };
-        NS_NAMED_LITERAL_STRING(loginTitlePropertyTag, "loginTitle");
-        const PRUnichar *dTitlePropertyTag = loginTitlePropertyTag.get();
-        rv = bundle->FormatStringFromName(dTitlePropertyTag, brandStrings, 1,
-                                          getter_Copies(loginTitle));
-        if (NS_FAILED(rv)) return PR_FALSE;
-        
-        if (aLogin)
-        {
-            nsXPIDLString loginText;
-            rv = bundle->GetStringFromName(NS_LITERAL_STRING("loginTextwithName").get(),
-                                           getter_Copies(loginText));
-            if (NS_FAILED(rv) || !loginText) return PR_FALSE;
-
-
-
-            rv = dlgService->PromptUsernameAndPassword(nsnull, loginTitle,
-                                                       loginText, aUsername, aPassword,
-                                                       nsnull, PR_FALSE, &btnResult);
-        }
-        else
-        {
-            //nsString loginString; 
-            nsXPIDLString loginText;
-            const PRUnichar *userNameStrings[] = { *aUsername };
-
-            NS_NAMED_LITERAL_STRING(loginTextPropertyTag, "loginText");
-            const PRUnichar *dpropertyTag = loginTextPropertyTag.get();
-            rv = bundle->FormatStringFromName(dpropertyTag, userNameStrings, 1,
-                                              getter_Copies(loginText));
-            if (NS_FAILED(rv)) return PR_FALSE;
-
-            rv = dlgService->PromptPassword(nsnull, loginTitle, loginText,
-                                            aPassword, nsnull, PR_FALSE, &btnResult);
-        }
-    }            
-
-    return btnResult;
-}
-
-PRBool nsMapiHook::VerifyUserName(const PRUnichar *aUsername, char **aIdKey)
-{
-    nsresult rv;
-
-    if (aUsername == nsnull)
-        return PR_FALSE;
-
-    nsCOMPtr<nsIMsgAccountManager> accountManager(do_GetService(NS_MSGACCOUNTMANAGER_CONTRACTID, &rv));
-    if (NS_FAILED(rv)) return PR_FALSE;
-    nsCOMPtr<nsISupportsArray> identities;
-    rv = accountManager->GetAllIdentities(getter_AddRefs(identities));
-    if (NS_FAILED(rv)) return PR_FALSE;
-    PRUint32 numIndentities;
-    identities->Count(&numIndentities);
-
-    for (PRUint32 i = 0; i < numIndentities; i++)
-    {
-        // convert supports->Identity
-        nsCOMPtr<nsISupports> thisSupports;
-        rv = identities->GetElementAt(i, getter_AddRefs(thisSupports));
-        if (NS_FAILED(rv)) continue;
-        nsCOMPtr<nsIMsgIdentity> thisIdentity(do_QueryInterface(thisSupports, &rv));
-        if (NS_SUCCEEDED(rv) && thisIdentity)
-        {
-            nsXPIDLCString email;
-            rv = thisIdentity->GetEmail(getter_Copies(email));
-            if (NS_FAILED(rv)) continue;
-
-            // get the username from the email and compare with the username
-            nsCAutoString aEmail(email.get());
-            PRInt32 index = aEmail.FindChar('@');
-            if (index != -1)
-                aEmail.Truncate(index);
-
-if (nsDependentString(aUsername) == NS_ConvertASCIItoUCS2(aEmail))  // == overloaded
-                return NS_SUCCEEDED(thisIdentity->GetKey(aIdKey));
-        }
-    }
-
-    return PR_FALSE;
-}
-
-PRBool 
-nsMapiHook::IsBlindSendAllowed()
-{
-    PRBool enabled = PR_FALSE;
-    PRBool warn = PR_TRUE;
-    nsCOMPtr<nsIPref> prefs = do_GetService(NS_PREF_CONTRACTID);
-    if (prefs) {
-	    prefs->GetBoolPref(PREF_MAPI_WARN_PRIOR_TO_BLIND_SEND,&warn);
-            prefs->GetBoolPref(PREF_MAPI_BLIND_SEND_ENABLED,&enabled);
-    } 
-    if (!enabled)
-        return PR_FALSE;
-
-    if (!warn)
-        return PR_TRUE; // Everything is okay.  
-
-    nsresult rv;
-    nsCOMPtr<nsIStringBundleService> bundleService(do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv));
-    if (NS_FAILED(rv) || !bundleService) return PR_FALSE;
-
-    nsCOMPtr<nsIStringBundle> bundle;
-    rv = bundleService->CreateBundle(MAPI_PROPERTIES_CHROME, getter_AddRefs(bundle));
-    if (NS_FAILED(rv) || !bundle) return PR_FALSE;
-
-    nsXPIDLString warningMsg;
-    rv = bundle->GetStringFromName(NS_LITERAL_STRING("mapiBlindSendWarning").get(),
-                                        getter_Copies(warningMsg));
-    if (NS_FAILED(rv)) return PR_FALSE;
-    
-   nsXPIDLString dontShowAgainMessage;
-    rv = bundle->GetStringFromName(NS_LITERAL_STRING("mapiBlindSendDontShowAgain").get(),
-                                        getter_Copies(dontShowAgainMessage));
-    if (NS_FAILED(rv)) return PR_FALSE;
-
-    nsCOMPtr<nsIPromptService> dlgService(do_GetService("@mozilla.org/embedcomp/prompt-service;1", &rv));
-    if (NS_FAILED(rv) || !dlgService) return PR_FALSE;
-    
-    PRBool continueToWarn = PR_TRUE;
-    PRBool okayToContinue = PR_FALSE;
-    dlgService->ConfirmCheck(nsnull, nsnull, warningMsg, dontShowAgainMessage, &continueToWarn, &okayToContinue);
-        
-    if (!continueToWarn && okayToContinue && prefs)
-        prefs->SetBoolPref(PREF_MAPI_WARN_PRIOR_TO_BLIND_SEND,PR_FALSE);
-    
-    return okayToContinue;
-        
-}
-
-// this is used for Send without UI
-nsresult nsMapiHook::BlindSendMail (unsigned long aSession, nsIMsgCompFields * aCompFields) 
-{
-    nsresult rv = NS_OK ;
-
-    if (!IsBlindSendAllowed())
-        return NS_ERROR_FAILURE;
-
-    /** create nsIMsgComposeParams obj and other fields to populate it **/    
-
-    // get parent window
-    nsCOMPtr<nsIAppShellService> appService = do_GetService( "@mozilla.org/appshell/appShellService;1", &rv);
-    if (NS_FAILED(rv)|| (!appService) ) return rv ;
-
-    nsCOMPtr<nsIDOMWindowInternal>  hiddenWindow;
-    rv = appService->GetHiddenDOMWindow(getter_AddRefs(hiddenWindow));
-
-    if ( NS_FAILED(rv) ) return rv ;
-
-    // smtp password and Logged in used IdKey from MapiConfig (session obj)
-    nsMAPIConfiguration * pMapiConfig = nsMAPIConfiguration::GetMAPIConfiguration() ;
-    if (!pMapiConfig) return NS_ERROR_FAILURE ;  // get the singelton obj
-    PRUnichar * password = pMapiConfig->GetPassword(aSession) ;
-    // password
-    nsCAutoString smtpPassword ;
-    smtpPassword.AssignWithConversion (password) ;
-    // Id key
-    char * MsgIdKey = pMapiConfig->GetIdKey(aSession) ;
-
-    // get the MsgIdentity for the above key using AccountManager
-    nsCOMPtr <nsIMsgAccountManager> accountManager = do_GetService (NS_MSGACCOUNTMANAGER_CONTRACTID) ;
-    if (NS_FAILED(rv) || (!accountManager) ) return rv ;
-
-    nsCOMPtr <nsIMsgIdentity> pMsgId ;
-    rv = accountManager->GetIdentity (MsgIdKey, getter_AddRefs(pMsgId)) ;
-    if (NS_FAILED(rv) ) return rv ;
-
-    // create a send listener to get back the send status
-    nsCOMPtr <nsIMsgSendListener> sendListener ;
-    rv = nsMAPISendListener::CreateMAPISendListener(getter_AddRefs(sendListener)) ; 
-    if (NS_FAILED(rv) || (!sendListener) ) return rv;
-
-    // create the compose params object 
-    nsCOMPtr<nsIMsgComposeParams> pMsgComposeParams (do_CreateInstance(NS_MSGCOMPOSEPARAMS_CONTRACTID, &rv));
-    if (NS_FAILED(rv) || (!pMsgComposeParams) ) return rv ;
-
-    // populate the compose params
-    pMsgComposeParams->SetType(nsIMsgCompType::New);
-    pMsgComposeParams->SetFormat(nsIMsgCompFormat::Default);
-    pMsgComposeParams->SetIdentity(pMsgId);
-    pMsgComposeParams->SetComposeFields(aCompFields); 
-    pMsgComposeParams->SetSendListener(sendListener) ;
-    pMsgComposeParams->SetSmtpPassword(smtpPassword.get());
-
-    // create the nsIMsgCompose object to send the object
-    nsCOMPtr<nsIMsgCompose> pMsgCompose (do_CreateInstance(NS_MSGCOMPOSE_CONTRACTID, &rv));
-    if (NS_FAILED(rv) || (!pMsgCompose) ) return rv ;
-
-    /** initialize nsIMsgCompose, Send the message, wait for send completion response **/
-
-    rv = pMsgCompose->Initialize(hiddenWindow, pMsgComposeParams) ;
-    if (NS_FAILED(rv)) return rv ;
-
-    pMsgCompose->SendMsg(nsIMsgSend::nsMsgDeliverNow, pMsgId, nsnull) ;
-    if (NS_FAILED(rv)) return rv ;
-
-    // assign to interface pointer from nsCOMPtr to facilitate typecast below
-    nsIMsgSendListener * pSendListener = sendListener ;  
-
-    // we need to wait here to make sure that we return only after send is completed
-    // so we will have a event loop here which will process the events till the Send IsDone.
-    nsCOMPtr<nsIEventQueueService> pEventQService = do_GetService(NS_EVENTQUEUESERVICE_CONTRACTID, &rv);
-    nsCOMPtr<nsIEventQueue> eventQueue;
-    pEventQService->GetThreadEventQueue(NS_CURRENT_THREAD,getter_AddRefs(eventQueue));
-    while ( !((nsMAPISendListener *) pSendListener)->IsDone() )
-        eventQueue->ProcessPendingEvents();
-
-    return rv ;
-}
-
-// this is used to populate comp fields with Unicode data
-nsresult nsMapiHook::PopulateCompFields(lpnsMapiMessage aMessage, 
-                                    nsIMsgCompFields * aCompFields)
-{
-    nsresult rv = NS_OK ;
-
-    if (aMessage->lpOriginator)
-    {
-        PRUnichar * From = aMessage->lpOriginator->lpszAddress ;
-        aCompFields->SetFrom (From) ;
-    }
-
-    nsAutoString To ;
-    nsAutoString Cc ; 
-    nsAutoString Bcc ;
-
-    nsAutoString Comma ;
-    Comma.AssignWithConversion(",");
-
-    if (aMessage->lpRecips)
-    {
-        for (int i=0 ; i < (int) aMessage->nRecipCount ; i++)
-        {
-            if (aMessage->lpRecips[i].lpszAddress)
-            {
-                switch (aMessage->lpRecips[i].ulRecipClass)
-                {
-                case MAPI_TO :
-                    if (To.Length() > 0)
-                        To += Comma ;
-                    To += (PRUnichar *) aMessage->lpRecips[i].lpszAddress ;
-                    break ;
-
-                case MAPI_CC :
-                    if (Cc.Length() > 0)
-                        Cc += Comma ;
-                    Cc += (PRUnichar *) aMessage->lpRecips[i].lpszAddress ; 
-                    break ;
-
-                case MAPI_BCC :
-                    if (Bcc.Length() > 0)
-                        Bcc += Comma ;
-                    Bcc += (PRUnichar *) aMessage->lpRecips[i].lpszAddress ; 
-                    break ;
-                }
-            }
-        }
-    }
-
-    // set To, Cc, Bcc
-    aCompFields->SetTo (To.get()) ;
-    aCompFields->SetCc (Cc.get()) ;
-    aCompFields->SetBcc (Bcc.get()) ;
-
-    // set subject
-    if (aMessage->lpszSubject)
-    {
-        PRUnichar * Subject = aMessage->lpszSubject ;
-        aCompFields->SetSubject(Subject) ;
-    }
-
-    // handle attachments as File URL
-    rv = HandleAttachments (aCompFields, aMessage->nFileCount, aMessage->lpFiles, PR_TRUE) ;
-    if (NS_FAILED(rv)) return rv ;    
-
-    // set body
-    if (aMessage->lpszNoteText)
-    {
-        PRUnichar * Body = aMessage->lpszNoteText ;
-        rv = aCompFields->SetBody(Body) ;
-    }
-
-#ifdef RAJIV_DEBUG
-    // testing what all was set in CompFields
-    printf ("To : %S \n", To.get()) ;
-    printf ("CC : %S \n", Cc.get() ) ;
-    printf ("BCC : %S \n", Bcc.get() ) ;
-#endif
-
-    return rv ;
-
-}
-
-nsresult nsMapiHook::HandleAttachments (nsIMsgCompFields * aCompFields, PRInt32 aFileCount, 
-                                        lpnsMapiFileDesc aFiles, BOOL aIsUnicode)
-{
-    nsresult rv = NS_OK ;
-
-    nsCAutoString Attachments ;
-    nsCAutoString TempFiles ;
-
-    nsCOMPtr <nsILocalFile> pFile = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID, &rv) ;
-    if (NS_FAILED(rv) || (!pFile) ) return rv ;        
-
-    for (int i=0 ; i < aFileCount ; i++)
-    {
-        if (aFiles[i].lpszPathName)
-        {
-            // check if attachment exists
-            if (aIsUnicode)
-                pFile->InitWithUnicodePath (aFiles[i].lpszPathName) ; 
-            else
-                pFile->InitWithPath ((char *) aFiles[i].lpszPathName) ; 
-            PRBool bExist ;
-            rv = pFile->Exists(&bExist) ;
-            if (NS_FAILED(rv) || (!bExist) ) return NS_ERROR_FILE_TARGET_DOES_NOT_EXIST ;
-
-            // create Msg attachment object
-            nsCOMPtr<nsIMsgAttachment> attachment = do_CreateInstance(NS_MSGATTACHMENT_CONTRACTID, &rv);
-            if (NS_FAILED(rv) || (!attachment) ) return rv ;
-
-            // set url 
-            nsXPIDLCString pURL ;
-            NS_GetURLSpecFromFile(pFile, getter_Copies(pURL));
-            attachment->SetUrl(pURL) ;
-
-            if (aFiles[i].lpszFileName)
-            {
-                if (! aIsUnicode)
-                {
-                    nsAutoString realFileName ;
-                    realFileName.AssignWithConversion ((char *) aFiles[i].lpszFileName) ;
-                    attachment->SetName(realFileName.get()) ;
-                    // attachment->SetName( (nsDependentString(aFiles[i].lpszFileName)).get() );
-            }
-                else
-                    attachment->SetName(aFiles[i].lpszFileName) ;
-        }
-
-            attachment->SetTemporary(PR_FALSE) ;
-
-            rv = aCompFields->AddAttachment (attachment);
-        }
-    }
-    return rv ;
-}
-
-
-// this is used to convert non Unicode data and then populate comp fields
-nsresult nsMapiHook::PopulateCompFieldsWithConversion(lpnsMapiMessage aMessage, 
-                                    nsIMsgCompFields * aCompFields)
-{
-    nsresult rv = NS_OK ;
-
-    if (aMessage->lpOriginator)
-    {
-        nsAutoString From ;
-        From.AssignWithConversion((char *) aMessage->lpOriginator->lpszAddress);
-        aCompFields->SetFrom (From.get()) ;
-    }
-
-    nsAutoString To ;
-    nsAutoString Cc ; 
-    nsAutoString Bcc ;
-
-    nsAutoString Comma ;
-    Comma.AssignWithConversion(",");
-
-    if (aMessage->lpRecips)
-    {
-        for (int i=0 ; i < (int) aMessage->nRecipCount ; i++)
-        {
-            if (aMessage->lpRecips[i].lpszAddress)
-            {
-                switch (aMessage->lpRecips[i].ulRecipClass)
-                {
-                case MAPI_TO :
-                    if (To.Length() > 0)
-                        To += Comma ;
-                    To.AppendWithConversion ((char *) aMessage->lpRecips[i].lpszAddress);
-                    break ;
-
-                case MAPI_CC :
-                    if (Cc.Length() > 0)
-                        Cc += Comma ;
-                    Cc.AppendWithConversion ((char *) aMessage->lpRecips[i].lpszAddress); 
-                    break ;
-
-                case MAPI_BCC :
-                    if (Bcc.Length() > 0)
-                        Bcc += Comma ;
-                    Bcc.AppendWithConversion ((char *) aMessage->lpRecips[i].lpszAddress) ; 
-                    break ;
-                }
-            }
-        }
-    }
-    
-    // set To, Cc, Bcc
-    aCompFields->SetTo (To.get()) ;
-    aCompFields->SetCc (Cc.get()) ;
-    aCompFields->SetBcc (Bcc.get()) ;
-
-    nsCAutoString platformCharSet;
-    // set subject
-    if (aMessage->lpszSubject)
-    {
-        nsAutoString Subject ;
-        if (platformCharSet.IsEmpty())
-            platformCharSet.Assign(nsMsgI18NFileSystemCharset());
-        rv = ConvertToUnicode(platformCharSet.get(), (char *) aMessage->lpszSubject, Subject);
-        if (NS_FAILED(rv)) return rv ;         
-        aCompFields->SetSubject(Subject.get()) ;
-    }
-
-    // handle attachments as File URL
-    rv = HandleAttachments (aCompFields, aMessage->nFileCount, aMessage->lpFiles, PR_FALSE) ;
-    if (NS_FAILED(rv)) return rv ;    
-
-    // set body
-    if (aMessage->lpszNoteText)
-    {
-        nsAutoString Body ;
-        if (platformCharSet.IsEmpty())
-            platformCharSet.Assign(nsMsgI18NFileSystemCharset());
-        rv = ConvertToUnicode(platformCharSet.get(), (char *) aMessage->lpszNoteText, Body);
-        if (NS_FAILED(rv)) return rv ;
-        rv = aCompFields->SetBody(Body.get()) ;
-    }
-
-#ifdef RAJIV_DEBUG
-    // testing what all was set in CompFields
-    printf ("To : %S \n", To.get()) ;
-    printf ("CC : %S \n", Cc.get() ) ;
-    printf ("BCC : %S \n", Bcc.get() ) ;
-#endif
-
-    return rv ;
-}
-
-// this is used to populate the docs as attachments in the Comp fields for Send Documents
-nsresult nsMapiHook::PopulateCompFieldsForSendDocs(nsIMsgCompFields * aCompFields, ULONG aFlags, 
-                            PRUnichar * aDelimChar, PRUnichar * aFilePaths)
-{
-    nsAutoString strDelimChars ;
-    nsString strFilePaths;
-    nsresult rv = NS_OK ;
-
-    if (aFlags & MAPI_UNICODE)
-    {
-        if (aDelimChar)
-            strDelimChars.Assign (aDelimChar) ;
-        if (aFilePaths)
-            strFilePaths.Assign (aFilePaths) ;
-    }
-	else
-    {
-        if (aDelimChar)
-            strDelimChars.AssignWithConversion ((char*) aDelimChar) ;
-        if (aFilePaths)
-            strFilePaths.AssignWithConversion ((char *) aFilePaths) ;
-    }
-
-    // check for comma in filename 
-    if (strDelimChars.Find (",") == kNotFound)  // if comma is not in the delimiter specified by user
-    {
-        if (strFilePaths.Find(",") != kNotFound) // if comma found in filenames return error
-            return NS_ERROR_FILE_INVALID_PATH ;
-    }
-
-    nsCString Attachments ;
-
-    // only 1 file is to be sent, no delim specified
-    if ((!strDelimChars.Length()) && (strFilePaths.Length()>0))
-    {
-        nsCOMPtr <nsILocalFile> pFile = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID, &rv) ;
-        if (NS_FAILED(rv) || (!pFile) ) return rv ;        
-        pFile->InitWithUnicodePath (strFilePaths.get()) ;
-
-        PRBool bExist ;
-        rv = pFile->Exists(&bExist) ;
-        if (NS_FAILED(rv) || (!bExist) ) return NS_ERROR_FILE_TARGET_DOES_NOT_EXIST ;
-
-        nsXPIDLCString pURL ;
-        NS_GetURLSpecFromFile(pFile, getter_Copies(pURL));
-        if (pURL)
-            Attachments.Assign(pURL) ;
-
-        // set attachments for comp field and return
-        rv = aCompFields->SetAttachments (Attachments.get());
-        return rv ;
-    }
-
-    // multiple files to be sent, delim specified
-    nsCOMPtr <nsILocalFile> pFile = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID, &rv) ;
-    if (NS_FAILED(rv) || (!pFile) ) return rv ;        
-    PRInt32 offset = 0 ;
-    PRInt32 FilePathsLen = strFilePaths.Length() ;
-    if (FilePathsLen)
-    {
-        PRUnichar * newFilePaths = (PRUnichar *) strFilePaths.get() ;
-        while (offset != kNotFound)
-        {
-            nsString RemainingPaths ;
-            RemainingPaths.Assign(newFilePaths) ;
-            offset = RemainingPaths.Find (strDelimChars) ;
-            if (offset != kNotFound)
-            {
-                RemainingPaths.SetLength (offset) ;
-                if ((offset + strDelimChars.Length()) < FilePathsLen)
-                    newFilePaths += offset + strDelimChars.Length() ;
-            }
-
-            pFile->InitWithUnicodePath (RemainingPaths.get()) ;
-
-    #ifdef RAJIV_DEBUG
-            printf ("File : %S \n", RemainingPaths.get()) ; 
-    #endif 
-            PRBool bExist ;
-            rv = pFile->Exists(&bExist) ;
-            if (NS_FAILED(rv) || (!bExist) ) return NS_ERROR_FILE_TARGET_DOES_NOT_EXIST ;
-
-            nsXPIDLCString pURL ;
-            NS_GetURLSpecFromFile(pFile, getter_Copies(pURL));
-            if (pURL)
-            {
-				if (Attachments.Length() > 0)
-					Attachments.Append(",") ;
-                Attachments.Append(pURL) ;
-            }
-        }
-        rv = aCompFields->SetAttachments (Attachments.get());
-    }
-
-    return rv ;
-}
-
-// this used for Send with UI
-nsresult nsMapiHook::ShowComposerWindow (unsigned long aSession, nsIMsgCompFields * aCompFields) 
-{
-    nsresult rv = NS_OK ;
-
-    // create a send listener to get back the send status
-    nsCOMPtr <nsIMsgSendListener> sendListener ;
-    rv = nsMAPISendListener::CreateMAPISendListener(getter_AddRefs(sendListener)) ; 
-    if (NS_FAILED(rv) || (!sendListener) ) return rv ;
-
-    // create the compose params object 
-    nsCOMPtr<nsIMsgComposeParams> pMsgComposeParams (do_CreateInstance(NS_MSGCOMPOSEPARAMS_CONTRACTID, &rv));
-    if (NS_FAILED(rv) || (!pMsgComposeParams) ) return rv ;
-
-    // populate the compose params
-    pMsgComposeParams->SetType(nsIMsgCompType::New);
-    pMsgComposeParams->SetFormat(nsIMsgCompFormat::Default);
-    pMsgComposeParams->SetComposeFields(aCompFields); 
-    pMsgComposeParams->SetSendListener(sendListener) ;
-
-    /** get the nsIMsgComposeService object to open the compose window **/
-    nsCOMPtr <nsIMsgComposeService> compService = do_GetService (NS_MSGCOMPOSESERVICE_CONTRACTID) ;
-    if (NS_FAILED(rv)|| (!compService) ) return rv ;
-
-    rv = compService->OpenComposeWindowWithParams(nsnull, pMsgComposeParams) ;
-    if (NS_FAILED(rv)) return rv ;
-
-    return rv ;
-}

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

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

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

@@ -1,266 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corp.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
- * Contributor(s): Rajiv Dayal (rdayal@netscape.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <mapidefs.h>
-#include <mapi.h>
-#include "msgMapi.h"
-#include "msgMapiImp.h"
-#include "msgMapiFactory.h"
-#include "msgMapiMain.h"
-
-#include "nsMsgCompFields.h"
-#include "msgMapiHook.h"
-#include "nsString.h"
-#include "nsCOMPtr.h"
-#include "nsISupports.h"
-#include "nsMsgCompCID.h"
-
-
-
-CMapiImp::CMapiImp()
-: m_cRef(1)
-{
-    m_Lock = PR_NewLock();
-}
-
-CMapiImp::~CMapiImp() 
-{ 
-    if (m_Lock)
-        PR_DestroyLock(m_Lock);
-}
-
-STDMETHODIMP CMapiImp::QueryInterface(const IID& aIid, void** aPpv)
-{    
-    if (aIid == IID_IUnknown)
-    {
-        *aPpv = static_cast<nsIMapi*>(this); 
-    }
-    else if (aIid == IID_nsIMapi)
-    {
-        *aPpv = static_cast<nsIMapi*>(this);
-    }
-    else
-    {
-        *aPpv = nsnull;
-        return E_NOINTERFACE;
-    }
-
-    reinterpret_cast<IUnknown*>(*aPpv)->AddRef();
-    return S_OK;
-}
-
-STDMETHODIMP_(ULONG) CMapiImp::AddRef()
-{
-    return PR_AtomicIncrement(&m_cRef);
-}
-
-STDMETHODIMP_(ULONG) CMapiImp::Release() 
-{
-    PRInt32 temp;
-    temp = PR_AtomicDecrement(&m_cRef);
-    if (m_cRef == 0)
-    {
-        delete this;
-        return 0;
-    }
-
-    return temp;
-}
-
-STDMETHODIMP CMapiImp::IsValid()
-{
-    return S_OK;
-}
-
-STDMETHODIMP CMapiImp::IsValidSession(unsigned long aSession)
-{
-    nsMAPIConfiguration *pConfig = nsMAPIConfiguration::GetMAPIConfiguration();
-    if (pConfig && pConfig->IsSessionValid(aSession))
-        return S_OK;
-
-    return E_FAIL;
-}
-
-STDMETHODIMP CMapiImp::Initialize()
-{
-    HRESULT hr = E_FAIL;
-
-    if (!m_Lock)
-        return E_FAIL;
-
-    PR_Lock(m_Lock);
-
-    // Initialize MAPI Configuration
-
-    nsMAPIConfiguration *pConfig = nsMAPIConfiguration::GetMAPIConfiguration();
-    if (pConfig != nsnull)
-        if (nsMapiHook::Initialize())
-            hr = S_OK;
-
-    PR_Unlock(m_Lock);
-
-    return hr;
-}
-
-STDMETHODIMP CMapiImp::Login(unsigned long aUIArg, LOGIN_PW_TYPE aLogin, LOGIN_PW_TYPE aPassWord,
-                unsigned long aFlags, unsigned long *aSessionId)
-{
-    HRESULT hr = E_FAIL;
-    PRBool bNewSession = PR_FALSE;
-    char *id_key = nsnull;
-
-    if (aFlags & MAPI_NEW_SESSION)
-        bNewSession = PR_TRUE;
-
-    // Check For Profile Name
-
-    if (aLogin != nsnull && aLogin[0] != '\0')
-    {
-        if (nsMapiHook::VerifyUserName(aLogin, &id_key) == PR_FALSE)
-    {
-        *aSessionId = MAPI_E_LOGIN_FAILURE;
-        return hr;
-    }
-    }
-
-    // finally register(create) the session.
-
-    PRUint32 nSession_Id;
-    PRInt16 nResult = 0;
-
-    nsMAPIConfiguration *pConfig = nsMAPIConfiguration::GetMAPIConfiguration();
-    if (pConfig != nsnull)
-        nResult = pConfig->RegisterSession(aUIArg, aLogin, aPassWord,
-                                           (aFlags & MAPI_FORCE_DOWNLOAD), bNewSession,
-                                           &nSession_Id, id_key);
-
-    switch (nResult)
-    {
-        case -1 :
-        {
-            *aSessionId = MAPI_E_TOO_MANY_SESSIONS;
-            return hr;
-        }
-        case 0 :
-        {
-            *aSessionId = MAPI_E_INSUFFICIENT_MEMORY;
-            return hr;
-        }
-        default :
-        {
-            *aSessionId = nSession_Id;
-            break;
-        }
-    }
-
-    return S_OK;
-}
-
-STDMETHODIMP CMapiImp::SendMail( unsigned long aSession, lpnsMapiMessage aMessage,
-     short aRecipCount, lpnsMapiRecipDesc aRecips , short aFileCount, lpnsMapiFileDesc aFiles , 
-     unsigned long aFlags, unsigned long aReserved)
-{
-    nsresult rv = NS_OK ;
-
-    // Assign the pointers in the aMessage struct to the array of Recips and Files
-    // recieved here from MS COM. These are used in BlindSendMail and ShowCompWin fns 
-    aMessage->lpRecips = aRecips ;
-    aMessage->lpFiles = aFiles ;
-
-    /** create nsIMsgCompFields obj and populate it **/
-    nsCOMPtr<nsIMsgCompFields> pCompFields = do_CreateInstance(NS_MSGCOMPFIELDS_CONTRACTID, &rv) ;
-    if (NS_FAILED(rv) || (!pCompFields) ) return MAPI_E_INSUFFICIENT_MEMORY ;
-
-    if (aFlags & MAPI_UNICODE)
-        rv = nsMapiHook::PopulateCompFields(aMessage, pCompFields) ;
-    else
-        rv = nsMapiHook::PopulateCompFieldsWithConversion(aMessage, pCompFields) ;
-    
-    if (NS_SUCCEEDED (rv))
-    {
-        // see flag to see if UI needs to be brought up
-        if (!(aFlags & MAPI_DIALOG))
-        {
-            rv = nsMapiHook::BlindSendMail(aSession, pCompFields);
-        }
-        else
-        {
-            rv = nsMapiHook::ShowComposerWindow(aSession, pCompFields);
-        }
-    }
-    
-    return nsMAPIConfiguration::GetMAPIErrorFromNSError (rv) ;
-}
-
-
-STDMETHODIMP CMapiImp::SendDocuments( unsigned long aSession, LPTSTR aDelimChar,
-                            LPTSTR aFilePaths, LPTSTR aFileNames, ULONG aFlags)
-{
-    nsresult rv = NS_OK ;
-
-    /** create nsIMsgCompFields obj and populate it **/
-    nsCOMPtr<nsIMsgCompFields> pCompFields = do_CreateInstance(NS_MSGCOMPFIELDS_CONTRACTID, &rv) ;
-    if (NS_FAILED(rv) || (!pCompFields) ) return MAPI_E_INSUFFICIENT_MEMORY ;
-
-    if (aFilePaths)
-    {
-        rv = nsMapiHook::PopulateCompFieldsForSendDocs(pCompFields, aFlags, aDelimChar, aFilePaths) ;
-    }
-
-    if (NS_SUCCEEDED (rv)) 
-        rv = nsMapiHook::ShowComposerWindow(aSession, pCompFields);
-
-    return nsMAPIConfiguration::GetMAPIErrorFromNSError (rv) ;
-}
-
-STDMETHODIMP CMapiImp::Logoff (unsigned long aSession)
-{
-    nsMAPIConfiguration *pConfig = nsMAPIConfiguration::GetMAPIConfiguration();
-
-    if (pConfig->UnRegisterSession((PRUint32)aSession))
-        return S_OK;
-
-    return E_FAIL;
-}
-
-STDMETHODIMP CMapiImp::CleanUp()
-{
-    nsMapiHook::CleanUp();
-    return S_OK;
-}
-
-

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

@@ -1,92 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corp.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef MSG_MAPI_IMP_H
-#define MSG_MAPI_IMP_H
-
-#include <windows.h>
-#include <mapi.h>
-#include "msgMapi.h"
-#include "nsXPIDLString.h"
-#include "nspr.h"
-
-const CLSID CLSID_CMapiImp = {0x29f458be, 0x8866, 0x11d5, {0xa3, 0xdd, 0x0, 0xb0, 0xd0, 0xf3, 0xba, 0xa7}};
-
-// this class implements the MS COM interface nsIMapi that provides the methods
-// called by mapi32.dll to perform the mail operations as specified by MAPI.
-// These class methods in turn use the Mozilla Mail XPCOM interfaces to do so.
-class CMapiImp : public nsIMapi
-{
-
-public :
-
-    // IUnknown
-
-    STDMETHODIMP            QueryInterface(const IID& aIid, void** aPpv);
-    STDMETHODIMP_(ULONG)    AddRef();
-    STDMETHODIMP_(ULONG)    Release();
-
-    // Interface INsMapi
-
-    STDMETHODIMP Login(unsigned long aUIArg, LOGIN_PW_TYPE aLogin, 
-                       LOGIN_PW_TYPE aPassWord, unsigned long aFlags,
-                       unsigned long *aSessionId);
-
-    STDMETHODIMP SendMail( unsigned long aSession, lpnsMapiMessage aMessage,
-         short aRecipCount, lpnsMapiRecipDesc aRecips , 
-         short aFileCount, lpnsMapiFileDesc aFiles , 
-         unsigned long aFlags, unsigned long aReserved) ;
-
-    STDMETHODIMP SendDocuments( unsigned long aSession, LPTSTR aDelimChar,
-                                LPTSTR aFilePaths, LPTSTR aFileNames, ULONG aFlags);
-
-    STDMETHODIMP Initialize();
-    STDMETHODIMP IsValid();
-    STDMETHODIMP IsValidSession(unsigned long aSession);
-
-    STDMETHODIMP Logoff (unsigned long aSession);
-    STDMETHODIMP CleanUp();
-
-    CMapiImp();
-    ~CMapiImp();
-
-private :
-
-    PRLock *m_Lock;
-    PRInt32 m_cRef;
-};
-
-#endif // MSG_MAPI_IMP_H

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

@@ -1,376 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corp.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include <mapidefs.h>
-#include <mapi.h>
-
-#include "msgCore.h"
-#include "nsMsgComposeStringBundle.h"
-#include "msgMapiMain.h"
-#include "nsIServiceManager.h"
-#include "nsCOMPtr.h"
-
-// move to xpcom bug 81956.
-class nsPRUintKey : public nsHashKey {
-protected:
-    PRUint32 mKey;
-public:
-    nsPRUintKey(PRUint32 key) : mKey(key) {}
-
-    PRUint32 HashCode(void) const {
-        return mKey;
-    }
-
-    PRBool Equals(const nsHashKey *aKey) const {
-        return mKey == ((const nsPRUintKey *) aKey)->mKey;
-    }
-    nsHashKey *Clone() const {
-        return new nsPRUintKey(mKey);
-    }
-    PRUint32 GetValue() { return mKey; }
-};
-//
-
-
-nsMAPIConfiguration *nsMAPIConfiguration::m_pSelfRef = nsnull;
-PRUint32 nsMAPIConfiguration::session_generator = 0;
-PRUint32 nsMAPIConfiguration::sessionCount = 0;
-
-nsMAPIConfiguration *nsMAPIConfiguration::GetMAPIConfiguration()
-{
-    if (m_pSelfRef == nsnull)
-        m_pSelfRef = new nsMAPIConfiguration();
-
-    return m_pSelfRef;
-}
-
-nsMAPIConfiguration::nsMAPIConfiguration()
-: m_nMaxSessions(MAX_SESSIONS)
-{
-    m_Lock = PR_NewLock();
-}
-
-static PRBool
-FreeSessionMapEntries(nsHashKey *aKey, void *aData, void* aClosure)
-{
-    nsMAPISession *pTemp = (nsMAPISession*) aData;
-    if (pTemp)
-    {
-    delete pTemp;
-    pTemp = nsnull;
-    }
-    return PR_TRUE;
-}
-
-static PRBool
-FreeProfileMapEntries(nsHashKey *aKey, void *aData, void* aClosure)
-{
-    return PR_TRUE;
-}
-
-nsMAPIConfiguration::~nsMAPIConfiguration()
-{
-    if (m_Lock)
-        PR_DestroyLock(m_Lock);
-
-    m_SessionMap.Reset(FreeSessionMapEntries);
-    m_ProfileMap.Reset(FreeProfileMapEntries);
-    }
-
-void nsMAPIConfiguration::OpenConfiguration()
-{
-    // No. of max. sessions is set to MAX_SESSIONS.  In future
-    // if it is decided to have configuration (registry)
-    // parameter, this function can be used to set the
-    // max sessions;
-
-    return;
-}
-
-PRInt16 nsMAPIConfiguration::RegisterSession(PRUint32 aHwnd,
-                const PRUnichar *aUserName, const PRUnichar *aPassword,
-                PRBool aForceDownLoad, PRBool aNewSession,
-                PRUint32 *aSession, char *aIdKey)
-{
-    PRInt16 nResult = 0;
-    PRUint32 n_SessionId = 0;
-
-    PR_Lock(m_Lock);
-
-    // Check whether max sessions is exceeded
-
-    if (sessionCount >= m_nMaxSessions)
-    {
-        PR_Unlock(m_Lock);
-        return -1;
-    }
-
-    if (aUserName != nsnull && aUserName[0] != '\0')
-    {
-    nsStringKey usernameKey(aUserName);
-    n_SessionId = (PRUint32) m_ProfileMap.Get(&usernameKey);
-    }
-
-    // try to share a session; if not create a session
-
-    if (n_SessionId > 0)
-    {
-        nsPRUintKey sessionKey(n_SessionId);
-        nsMAPISession *pTemp = (nsMAPISession *)m_SessionMap.Get(&sessionKey);
-        if (pTemp != nsnull)
-        {
-            pTemp->IncrementSession();
-            *aSession = n_SessionId;
-            nResult = 1;
-        }
-    }
-    else if (aNewSession || n_SessionId == 0) // checking for n_SessionId is a concession
-    {
-        // create a new session ; if new session is specified OR there is no session
-        nsMAPISession *pTemp = nsnull;
-        pTemp = new nsMAPISession(aHwnd, aUserName,
-                               aPassword, aForceDownLoad, aIdKey);
-
-        if (pTemp != nsnull)
-        {
-            session_generator++;
-
-            // I don't think there will be (2 power 32) sessions alive
-            // in a cycle.  This is an assumption
-
-            if (session_generator == 0)
-                session_generator++;
-
-            nsPRUintKey sessionKey(session_generator);
-            m_SessionMap.Put(&sessionKey, pTemp);
-            if (aUserName != nsnull && aUserName[0] != '\0')
-            {
-                nsStringKey usernameKey(aUserName);
-            m_ProfileMap.Put(&usernameKey, (void*)session_generator);
-            }
-
-            *aSession = session_generator;
-            sessionCount++;
-            nResult = 1;
-        }
-    }
-
-    PR_Unlock(m_Lock);
-    return nResult;
-}
-
-PRBool nsMAPIConfiguration::UnRegisterSession(PRUint32 aSessionID)
-{
-    PRBool bResult = PR_FALSE;
-
-    PR_Lock(m_Lock);
-
-    if (aSessionID != 0)
-    {
-        nsPRUintKey sessionKey(aSessionID);
-        nsMAPISession *pTemp = (nsMAPISession *)m_SessionMap.Get(&sessionKey);
-
-        if (pTemp != nsnull)
-        {
-            if (pTemp->DecrementSession() == 0)
-            {
-                if (pTemp->m_pProfileName.get() != nsnull)
-                {
-                nsStringKey stringKey(pTemp->m_pProfileName.get());
-                m_ProfileMap.Remove(&stringKey);
-                }
-                m_SessionMap.Remove(&sessionKey);
-                sessionCount--;
-                bResult = PR_TRUE;
-            }
-        }
-    }
-
-    PR_Unlock(m_Lock);
-    return bResult;
-}
-
-PRBool nsMAPIConfiguration::IsSessionValid(PRUint32 aSessionID)
-{
-    if (aSessionID == 0)
-        return PR_FALSE;
-
-    PRBool retValue = PR_FALSE;
-    nsPRUintKey sessionKey(aSessionID);
-
-    PR_Lock(m_Lock);
-
-    retValue = m_SessionMap.Exists(&sessionKey);
-        
-    PR_Unlock(m_Lock);
-
-    return retValue;
-}
-
-
-PRUnichar *nsMAPIConfiguration::GetPassword(PRUint32 aSessionID)
-{
-    PRUnichar *pResult = nsnull;
-
-    PR_Lock(m_Lock);
-
-    if (aSessionID != 0)
-    {
-        nsPRUintKey sessionKey(aSessionID);
-        nsMAPISession *pTemp = (nsMAPISession *)m_SessionMap.Get(&sessionKey);
-
-        if (pTemp)
-        {
-            pResult = pTemp->GetPassword();
-        }
-    }
-
-    PR_Unlock(m_Lock);
-
-    return pResult;
-}
-
-char *nsMAPIConfiguration::GetIdKey(PRUint32 aSessionID)
-{
-    char *pResult = nsnull;
-
-    PR_Lock(m_Lock);
-
-    if (aSessionID != 0)
-    {
-        nsPRUintKey sessionKey(aSessionID);
-        nsMAPISession *pTemp = (nsMAPISession *)m_SessionMap.Get(&sessionKey);
-        if (pTemp)
-        {
-           pResult = pTemp->GetIdKey();
-        }
-    }
-
-    PR_Unlock(m_Lock);
-    return pResult;
-}
-
-// util func
-HRESULT nsMAPIConfiguration::GetMAPIErrorFromNSError (nsresult res)
-{
-    HRESULT hr = SUCCESS_SUCCESS ;
-
-    if (NS_SUCCEEDED (hr)) return hr ;
-
-    // if failure return the related MAPI failure code
-    switch (res)
-    {
-        case NS_MSG_NO_RECIPIENTS :
-            hr = MAPI_E_BAD_RECIPTYPE ;
-            break ;
-        case NS_ERROR_COULD_NOT_GET_USERS_MAIL_ADDRESS :
-            hr = MAPI_E_INVALID_RECIPS ; 
-            break ;
-        case NS_ERROR_COULD_NOT_LOGIN_TO_SMTP_SERVER :
-            hr = MAPI_E_LOGIN_FAILURE ;
-            break ;
-        case NS_MSG_UNABLE_TO_OPEN_FILE :                 
-        case NS_MSG_UNABLE_TO_OPEN_TMP_FILE :
-        case NS_MSG_COULDNT_OPEN_FCC_FOLDER :
-        case NS_ERROR_FILE_INVALID_PATH :
-            hr = MAPI_E_ATTACHMENT_OPEN_FAILURE ;
-            break ;
-        case NS_ERROR_FILE_TARGET_DOES_NOT_EXIST :
-            hr = MAPI_E_ATTACHMENT_NOT_FOUND ;
-            break ;
-        case NS_MSG_CANCELLING :
-            hr = MAPI_E_USER_ABORT ;
-            break ;
-        case NS_MSG_ERROR_WRITING_FILE :
-        case NS_MSG_UNABLE_TO_SAVE_TEMPLATE :
-        case NS_MSG_UNABLE_TO_SAVE_DRAFT :
-            hr = MAPI_E_ATTACHMENT_WRITE_FAILURE ;
-            break ;
-        default :
-            hr = MAPI_E_FAILURE ;
-            break ;
-    }
-
-    return hr ;
-}
-
-
-nsMAPISession::nsMAPISession(PRUint32 aHwnd, const PRUnichar *aUserName,\
-                             const PRUnichar *aPassword, \
-                             PRBool aForceDownLoad, char *aKey)
-: m_bIsForcedDownLoad(aForceDownLoad),
-  m_hAppHandle(aHwnd),
-  m_nShared(1),
-  m_pIdKey(aKey)
-{
-    m_pProfileName.Assign(aUserName);
-    m_pPassword.Assign(aPassword);
-}
-
-nsMAPISession::~nsMAPISession()
-{
-    if (m_pIdKey != nsnull)
-    {
-        delete [] m_pIdKey;
-        m_pIdKey = nsnull;
-    }
-}
-
-PRUint32 nsMAPISession::IncrementSession()
-{
-    return ++m_nShared;
-}
-
-PRUint32 nsMAPISession::DecrementSession()
-{
-    return --m_nShared;
-}
-
-PRUint32 nsMAPISession::GetSessionCount()
-{
-    return m_nShared;
-}
-
-PRUnichar *nsMAPISession::GetPassword()
-{
-    return (PRUnichar *)m_pPassword.get();
-}
-
-char *nsMAPISession::GetIdKey()
-{
-    return m_pIdKey;
-}
-

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

@@ -1,112 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corp.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Krishna Mohan Khandrika (kkhandrika@netscape.com)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef MSG_MAPI_MAIN_H_
-#define NSG_MAPI_MAIN_H_
-
-#define        MAX_NAME_LEN    256
-#define        MAX_PW_LEN      256
-#define        MAX_SESSIONS    50
-#define        MAPI_SENDCOMPLETE_EVENT   "SendCompletionEvent"
-
-#define MAPI_PROPERTIES_CHROME "chrome://messenger-mapi/locale/mapi.properties"
-#define PREF_MAPI_WARN_PRIOR_TO_BLIND_SEND "mapi.blind-send.warn"
-#define PREF_MAPI_BLIND_SEND_ENABLED "mapi.blind-send.enabled"
-
-#include "nsXPIDLString.h"
-#include "nspr.h"
-#include "nsString.h"
-#include "nsHashtable.h"
-
-class nsMAPIConfiguration
-{
-private :
-
-    static PRUint32 session_generator;
-    static PRUint32 sessionCount;
-    static nsMAPIConfiguration *m_pSelfRef;
-    PRLock *m_Lock;
-    PRUint32  m_nMaxSessions;
-
-
-    nsHashtable m_ProfileMap;
-    nsHashtable m_SessionMap;
-    nsMAPIConfiguration();
-
-public :
-    static nsMAPIConfiguration *GetMAPIConfiguration();
-    void OpenConfiguration();
-    PRInt16 RegisterSession(PRUint32 aHwnd, const PRUnichar *aUserName, \
-                            const PRUnichar *aPassword, PRBool aForceDownLoad, \
-                            PRBool aNewSession, PRUint32 *aSession, char *aIdKey);
-    PRBool IsSessionValid(PRUint32 aSessionID);
-    PRBool UnRegisterSession(PRUint32 aSessionID);
-    PRUnichar *GetPassword(PRUint32 aSessionID);
-    char *GetIdKey(PRUint32 aSessionID);
-    ~nsMAPIConfiguration();
-
-    // a util func
-    static HRESULT GetMAPIErrorFromNSError (nsresult res) ;
-};
-
-class nsMAPISession
-{
-    friend class nsMAPIConfiguration;
-
-    private :
-
-        PRBool   m_bIsForcedDownLoad;
-        PRBool   m_bApp_or_Service;
-        PRUint32 m_hAppHandle;
-        PRUint32 m_nShared;
-        char     *m_pIdKey;
-        nsString m_pProfileName;
-        nsString m_pPassword;
-
-    public :
-
-        nsMAPISession(PRUint32 aHwnd, const PRUnichar *aUserName, \
-                      const PRUnichar *aPassword, \
-                      PRBool aForceDownLoad, char *aKey);
-        PRUint32 IncrementSession();
-        PRUint32 DecrementSession();
-        PRUint32 GetSessionCount();
-        PRUnichar *nsMAPISession::GetPassword();
-        char *nsMAPISession::GetIdKey();
-        ~nsMAPISession();
-};
-
-#endif    // MSG_MAPI_MAIN_H_

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

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

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

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

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

@@ -1,167 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Srilatha Moturi <srilatha@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
- 
-#include "nsIServiceManager.h"
-#include "nsXPIDLString.h"
-#include "nsIPromptService.h"
-#include "nsIProxyObjectManager.h"
-#include "nsProxiedService.h"
-
-#include "nsMapiRegistryUtils.h" 
-#include "nsMapiRegistry.h"
-
-static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
-
-/** Implementation of the nsIMapiRegistry interface.
- *  Use standard implementation of nsISupports stuff.
- */
-NS_IMPL_ISUPPORTS1(nsMapiRegistry, nsIMapiRegistry);
-
-nsMapiRegistry::nsMapiRegistry() {
-    NS_INIT_ISUPPORTS();
-    m_ShowDialog = ! m_registryUtils.verifyRestrictedAccess();
-    m_DefaultMailClient = m_registryUtils.IsDefaultMailClient();
-}
-
-nsMapiRegistry::~nsMapiRegistry() {
-}
-
-NS_IMETHODIMP
-nsMapiRegistry::GetIsDefaultMailClient(PRBool * retval) {
-    // we need to get the value from registry everytime
-    // because the registry settings can be changed from
-    // other mail applications.
-    *retval = m_registryUtils.IsDefaultMailClient();
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMapiRegistry::GetShowDialog(PRBool * retval) {
-    *retval = m_ShowDialog;
-    return NS_OK;
-}
-
-NS_IMETHODIMP
-nsMapiRegistry::SetIsDefaultMailClient(PRBool aIsDefaultMailClient) 
-{
-    nsresult rv = NS_OK ;
-
-    if (aIsDefaultMailClient)
-    {
-        rv = m_registryUtils.setDefaultMailClient();
-    if (NS_SUCCEEDED(rv))
-        m_DefaultMailClient = PR_TRUE;
-    else
-            m_registryUtils.ShowMapiErrorDialog();
-}
-    else
-    {
-        rv = m_registryUtils.unsetDefaultMailClient();
-    if (NS_SUCCEEDED(rv))
-        m_DefaultMailClient = PR_FALSE;
-    else
-            m_registryUtils.ShowMapiErrorDialog();
-}
-
-    return rv ;
-}
-
-/** This will bring up the dialog box only once per session and 
- * only if the current app is not default Mail Client.
- * This also checks the registry if the registry key
- * showMapiDialog is set
- */
-NS_IMETHODIMP
-nsMapiRegistry::ShowMailIntegrationDialog(nsIDOMWindow *aParentWindow) {
-    nsresult rv;
-    if (!m_ShowDialog || !m_registryUtils.getShowDialog()) return NS_OK;
-    nsCOMPtr<nsIPromptService> promptService(do_GetService(
-                  "@mozilla.org/embedcomp/prompt-service;1", &rv));
-    if (NS_SUCCEEDED(rv) && promptService)
-    {
-        nsCOMPtr<nsIStringBundle> bundle;
-        rv = m_registryUtils.MakeMapiStringBundle (getter_AddRefs (bundle)) ;
-        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-
-        nsXPIDLString dialogTitle;
-        const PRUnichar *brandStrings[] = { m_registryUtils.brandName() };
-        NS_NAMED_LITERAL_STRING(dialogTitlePropertyTag, "dialogTitle");
-        rv = bundle->FormatStringFromName(dialogTitlePropertyTag.get(),
-                                          brandStrings, 1,
-                                          getter_Copies(dialogTitle));
-        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-        
-        nsXPIDLString dialogText;
-        NS_NAMED_LITERAL_STRING(dialogTextPropertyTag, "dialogText");
-        rv = bundle->FormatStringFromName(dialogTextPropertyTag.get(),
-                                          brandStrings, 1,
-                                          getter_Copies(dialogText));
-        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-
-        nsXPIDLString checkboxText;
-        rv = bundle->GetStringFromName(
-                           NS_LITERAL_STRING("checkboxText").get(),
-                           getter_Copies(checkboxText));
-        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-
-        PRBool checkValue = PR_FALSE;
-        PRInt32 buttonPressed = 0;
-        rv = promptService->ConfirmEx(aParentWindow,
-                                      dialogTitle,
-                                      dialogText.get(),
-                                      (nsIPromptService::BUTTON_TITLE_YES * 
-                                      nsIPromptService::BUTTON_POS_0) +
-                                      (nsIPromptService::BUTTON_TITLE_NO * 
-                                      nsIPromptService::BUTTON_POS_1),
-                                      nsnull,
-                                      nsnull,
-                                      nsnull,
-                                      checkboxText,
-                                      &checkValue,
-                                      &buttonPressed);
-        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-        rv = m_registryUtils.SetRegistryKey(HKEY_LOCAL_MACHINE, "Software\\Mozilla\\Desktop", 
-                                "showMapiDialog", (checkValue) ? "0" : "1");
-        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-
-        m_ShowDialog = PR_FALSE;
-        if (!buttonPressed)
-            rv = SetIsDefaultMailClient(PR_TRUE) ; // SetDefaultMailClient();
-    }
-    return rv;
-}
-

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

@@ -1,76 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Srilatha Moturi <srilatha@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nsmapiregistry_h____
-#define nsmapiregistry_h____
-
-#include "nsIMapiRegistry.h"
-
-#ifndef MAX_BUF
-#define MAX_BUF 4096
-#endif
-
-/* c5be14ba-4e0a-4eec-a1b8-04363761d63c */
-#define NS_IMAPIREGISTRY_CID \
- { 0xc5be14ba, 0x4e0a, 0x4eec, {0xa1, 0xb8, 0x04, 0x36, 0x37, 0x61, 0xd6, 0x3c} }
-#define NS_IMAPIREGISTRY_CONTRACTID    "@mozilla.org/mapiregistry;1"
-#define NS_IMAPIREGISTRY_CLASSNAME "Mozilla MAPI Registry"
-
-#define MAILNEWS_ALLOW_DEFAULT_MAIL_CLIENT  "mailnews.default_mail_client"
-
-class nsMapiRegistry : public nsIMapiRegistry {
-public:
-    // ctor/dtor
-    nsMapiRegistry();
-    virtual ~nsMapiRegistry();
-
-    // Declare all interface methods we must implement.
-    NS_DECL_ISUPPORTS
-    NS_DECL_NSIMAPIREGISTRY
-
-protected:
-    
-    PRBool m_DefaultMailClient;
-    PRBool m_ShowDialog;
-    nsMapiRegistryUtils m_registryUtils ;
-
-private:
-    // Special member to handle initialization.
-    PRBool mHaveBeenSet;
-}; // nsMapiRegistry
-
-#endif // nsmapiregistry_h____

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

@@ -1,743 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- * Srilatha Moturi <srilatha@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#undef UNICODE
-#undef _UNICODE
-
-#include "nsIServiceManager.h"
-#include "msgMapiImp.h"
-#include "msgMapiMain.h"
-#include "nsMapiRegistryUtils.h"
-#include "nsString.h"
-#include "nsIStringBundle.h"
-#include "nsIPromptService.h"
-#include "nsXPIDLString.h"
-#include "nsSpecialSystemDirectory.h"
-#include "nsDirectoryService.h"
-#include "nsDirectoryServiceDefs.h"
-#include "nsAppDirectoryServiceDefs.h"
-#include "nsIPref.h"
-
-static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID);
-
-#define EXE_EXTENSION ".exe" 
-#define USERAGENT_VERSION_PREF "general.useragent.misc"
-#define USERAGENT_VERSION_NS_PREF "general.useragent.vendorSub"
-#define USERAGENT_PREF_PREFIX "rv:"
-
-nsMapiRegistryUtils::nsMapiRegistryUtils()
-{
-   m_mapiStringBundle = nsnull ;
-}
-    
-const char * nsMapiRegistryUtils::thisApplication()
-{
-    if (m_thisApp.IsEmpty()) {
-        char buffer[MAX_PATH] = {0};
-        DWORD len = ::GetModuleFileName(NULL, buffer, MAX_PATH);
-        if (!len) return nsnull ; 
-        char shortPathBuf[MAX_PATH] = {0};
-        len = ::GetShortPathName(buffer, shortPathBuf, MAX_PATH);
-        if (!len) return nsnull ; 
-        m_thisApp = buffer;
-        m_thisApp.ToUpperCase();
-    }
-
-    return m_thisApp.get() ;
-}
-
-const PRUnichar * nsMapiRegistryUtils::brandName() 
-{
-    nsresult rv;
-    if (m_brand.IsEmpty()) {
-        nsCOMPtr<nsIStringBundleService> bundleService(do_GetService(
-                                         kStringBundleServiceCID, &rv));
-        if (NS_SUCCEEDED(rv) && bundleService) {
-            nsCOMPtr<nsIStringBundle> brandBundle;
-            rv = bundleService->CreateBundle(
-                        "chrome://global/locale/brand.properties",
-                        getter_AddRefs(brandBundle));
-            if (NS_SUCCEEDED(rv)) {
-                nsXPIDLString brandName;
-                rv = brandBundle->GetStringFromName(
-                           NS_LITERAL_STRING("brandShortName").get(),
-                           getter_Copies(brandName));
-                if (NS_SUCCEEDED(rv)) {
-                    m_brand = brandName ;
-                }
-            }
-        }
-    }
-
-    return m_brand.get()  ;
-}
-
-const PRUnichar * nsMapiRegistryUtils::versionNo()
-{
- if (!m_versionNo.IsEmpty())
-   return m_versionNo.get() ;
-
- nsCOMPtr<nsIPref> prefs = do_GetService(NS_PREF_CONTRACTID);
- if (prefs) {
-     nsXPIDLCString versionStr ;
-     nsresult rv = prefs->GetCharPref(USERAGENT_VERSION_NS_PREF, getter_Copies(versionStr));
-     if (NS_SUCCEEDED(rv) && versionStr)
-         m_versionNo.AssignWithConversion (versionStr.get()) ;
-     else {
-         rv = prefs->GetCharPref(USERAGENT_VERSION_PREF, getter_Copies(versionStr));
-         if (NS_SUCCEEDED(rv) && versionStr)  {
-             m_versionNo.AssignWithConversion (versionStr.get()) ;
-             m_versionNo.StripChars (USERAGENT_PREF_PREFIX) ;
-         }
-     }
- }
-
- return m_versionNo.get() ;
-}
-
-
-PRBool nsMapiRegistryUtils::verifyRestrictedAccess() {
-    char   subKey[] = "Software\\Mozilla - Test Key";
-    PRBool result = PR_FALSE;
-    DWORD  dwDisp = 0;
-    HKEY   key;
-    // Try to create/open a subkey under HKLM.
-    DWORD rc = ::RegCreateKeyEx(HKEY_LOCAL_MACHINE,
-                                subKey,
-                                0,
-                                NULL,
-                                REG_OPTION_NON_VOLATILE,
-                                KEY_WRITE,
-                                NULL,
-                                &key,
-                                &dwDisp);
-
-    if (rc == ERROR_SUCCESS) {
-        // Key was opened; first close it.
-        ::RegCloseKey(key);
-        // Delete it if we just created it.
-        switch(dwDisp) {
-            case REG_CREATED_NEW_KEY:
-                ::RegDeleteKey(HKEY_LOCAL_MACHINE, subKey);
-                break;
-            case REG_OPENED_EXISTING_KEY:
-                break;
-        }
-    } else {
-        // Can't create/open it; we don't have access.
-        result = PR_TRUE;
-    }
-    return result;
-}
-
-nsresult nsMapiRegistryUtils::SetRegistryKey(HKEY baseKey, const char * keyName, 
-                        const char * valueName, char * value)
-{
-    nsresult result = NS_ERROR_FAILURE;
-    HKEY   key;
-    LONG   rc = ::RegCreateKey(baseKey, keyName, &key);
-  
-    if (rc == ERROR_SUCCESS) {
-        rc = ::RegSetValueEx(key, valueName, NULL, REG_SZ, 
-                                 (LPBYTE)(const char*)value, strlen(value));
-        if (rc == ERROR_SUCCESS) {
-            result = NS_OK;
-        }
-        ::RegCloseKey(key);
-    }
-    return result;
-}
-
-nsresult nsMapiRegistryUtils::DeleteRegistryValue(HKEY baseKey, const char * keyName, 
-                        const char * valueName)
-{
-    nsresult result = NS_ERROR_FAILURE;
-    HKEY   key;
-    LONG   rc = ::RegOpenKey(baseKey, keyName, &key);
-  
-    if (rc == ERROR_SUCCESS) {
-        rc = ::RegDeleteValue(key, valueName);
-        if (rc == ERROR_SUCCESS)
-            result = NS_OK;
-        ::RegCloseKey(key);
-    }
-    return result;
-}
-
-void nsMapiRegistryUtils::GetRegistryKey(HKEY baseKey, const char * keyName, 
-                         const char * valueName, nsCAutoString & value)
-{
-    HKEY   key;
-    LONG   rc = ::RegOpenKey(baseKey, keyName, &key);
-    if (rc == ERROR_SUCCESS) {
-        char buffer[MAX_PATH] = {0};
-        DWORD len = sizeof buffer;
-        rc = ::RegQueryValueEx(key, valueName, NULL, NULL, 
-                               (LPBYTE)buffer, &len);
-        if (rc == ERROR_SUCCESS) {
-            if (len)
-                value = buffer;
-        }
-        ::RegCloseKey(key);
-     }
-}
-
-
-
-PRBool nsMapiRegistryUtils::IsDefaultMailClient()
-{
-    if (!isSmartDll() && !isMozDll()) 
-        return PR_FALSE;
-    nsCAutoString name; 
-    GetRegistryKey(HKEY_LOCAL_MACHINE, "Software\\Clients\\Mail", "", name);
-    if (!name.IsEmpty()) {
-         nsCAutoString keyName("Software\\Clients\\Mail\\");
-         keyName += name.get(); 
-         keyName += "\\protocols\\mailto\\shell\\open\\command";
-
-         nsCAutoString result;
-         GetRegistryKey(HKEY_LOCAL_MACHINE, keyName.get(), "", result);
-         if (!result.IsEmpty()) {
-             nsCAutoString strExtension;
-             strExtension.Assign(EXE_EXTENSION);
-             result.ToUpperCase();
-             strExtension.ToUpperCase();
-             PRInt32 index = result.RFind(strExtension.get());
-             if (index != kNotFound) {
-                 result.Truncate(index + strExtension.Length());
-             }
-             nsCAutoString thisApp (thisApplication()) ;
-             return (result == thisApp);
-        }
-    }
-    return PR_FALSE;
-
-}
-
-nsresult nsMapiRegistryUtils::saveDefaultMailClient()
-{
-    nsresult rv;
-    nsCAutoString name ;
-    GetRegistryKey(HKEY_LOCAL_MACHINE,"Software\\Clients\\Mail", "", name);
-    if (!name.IsEmpty()) {
-        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                            "Software\\Mozilla\\Desktop", 
-                            "HKEY_LOCAL_MACHINE\\Software\\Clients\\Mail", 
-                            (char *)name.get());
-        if (NS_SUCCEEDED(rv)) {
-            nsCAutoString keyName("Software\\Clients\\Mail\\");
-            keyName += name.get(); 
-            keyName += "\\protocols\\mailto\\shell\\open\\command";
-            nsCAutoString appPath ;
-            GetRegistryKey(HKEY_LOCAL_MACHINE, keyName.get(), "", appPath);
-            if (!appPath.IsEmpty()) {
-                nsCAutoString stringName("HKEY_LOCAL_MACHINE\\");
-                stringName += keyName.get();
-                rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                                  "Software\\Mozilla\\Desktop", 
-                                  stringName.get(), (char *)appPath.get());
-            }
-        }
-    }
-    else
-        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                            "Software\\Mozilla\\Desktop", 
-                            "HKEY_LOCAL_MACHINE\\Software\\Clients\\Mail", 
-                            "");
-    return rv;
-} 
-
-nsresult nsMapiRegistryUtils::saveUserDefaultMailClient()
-{
-    nsresult rv;
-    nsCAutoString name ;
-    GetRegistryKey(HKEY_CURRENT_USER,"Software\\Clients\\Mail", "", name);
-    if (!name.IsEmpty()) {
-        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                            "Software\\Mozilla\\Desktop", 
-                            "HKEY_CURRENT_USER\\Software\\Clients\\Mail", 
-                            (char *)name.get());
-    }
-    else {
-        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                            "Software\\Mozilla\\Desktop", 
-                            "HKEY_CURRENT_USER\\Software\\Clients\\Mail", 
-                            "");
-   }
-   return rv;
-}
-
-/**
- * Check whether it is a smart dll or not. Smart dll is the one installed by
- * IE5 or Outlook Express which forwards the MAPI calls to the dll based on the 
- * registry key setttings.
- * Returns TRUE if is a smart dll.
- */
-
-typedef HRESULT (FAR PASCAL GetOutlookVersionFunc)(); 
-PRBool nsMapiRegistryUtils::isSmartDll() 
-{ 
-    char buffer[MAX_PATH] = {0};
-    if (GetSystemDirectory(buffer, sizeof(buffer)) == 0) 
-        return PR_FALSE;
-    PL_strcatn(buffer, sizeof(buffer), "\\Mapi32.dll");
-    
-    HINSTANCE hInst; 
-    GetOutlookVersionFunc *doesExist = nsnull;
-    hInst = LoadLibrary(buffer); 
-    if (hInst == nsnull) 
-        return PR_FALSE;
-        
-    doesExist = (GetOutlookVersionFunc *) GetProcAddress (hInst, "GetOutlookVersion"); 
-    FreeLibrary(hInst); 
-
-    return (doesExist != nsnull); 
-} 
-
-typedef HRESULT (FAR PASCAL GetMapiDllVersion)(); 
-/**
- * Checks whether mapi32.dll is installed by this app. 
- * Returns TRUE if it is.
- */
-PRBool nsMapiRegistryUtils::isMozDll() 
-{ 
-    char buffer[MAX_PATH] = {0};
-    if (GetSystemDirectory(buffer, sizeof(buffer)) == 0) 
-        return PR_FALSE;
-    PL_strcatn(buffer, sizeof(buffer), "\\Mapi32.dll"); 
-
-    HINSTANCE hInst; 
-    GetMapiDllVersion *doesExist = nsnull;
-    hInst = LoadLibrary(buffer); 
-    if (hInst == nsnull) 
-        return PR_FALSE;
-        
-    doesExist = (GetMapiDllVersion *) GetProcAddress (hInst, "GetMapiDllVersion"); 
-    FreeLibrary(hInst); 
-
-    return (doesExist != nsnull); 
-} 
-
-/** Renames Mapi32.dl in system directory to Mapi32_moz_bak.dll
- *  copies the mozMapi32.dll from bin directory to the system directory
- */
-nsresult nsMapiRegistryUtils::CopyMozMapiToWinSysDir()
-{
-    nsresult rv;
-    char buffer[MAX_PATH] = {0};
-    if (GetSystemDirectory(buffer, sizeof(buffer)) == 0) 
-        return NS_ERROR_FAILURE;
-
-    nsCAutoString filePath(buffer);
-    filePath.Append("\\Mapi32_moz_bak.dll");
-
-    nsCOMPtr<nsILocalFile> pCurrentMapiFile = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID, &rv);
-    if (NS_FAILED(rv) || !pCurrentMapiFile) return rv;        
-    pCurrentMapiFile->InitWithPath(filePath.get());
-
-    nsCOMPtr<nsIFile> pMozMapiFile;
-    nsCOMPtr<nsIProperties> directoryService =
-          do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID, &rv);
-    if (!directoryService) return NS_ERROR_FAILURE;
-    rv = directoryService->Get(NS_OS_CURRENT_PROCESS_DIR,
-                              NS_GET_IID(nsIFile),
-                              getter_AddRefs(pMozMapiFile));
-
-    if (NS_FAILED(rv)) return rv;
-    pMozMapiFile->Append("mozMapi32.dll");
-
-    PRBool bExist;
-    rv = pMozMapiFile->Exists(&bExist);
-    if (NS_FAILED(rv) || !bExist) return rv;
-
-    rv = pCurrentMapiFile->Exists(&bExist);
-    if (NS_SUCCEEDED(rv) && bExist)
-    {
-        rv = pCurrentMapiFile->Remove(PR_FALSE);
-    }
-    if (NS_FAILED(rv)) return rv;
-    filePath.Assign(buffer);
-    filePath.Append("\\Mapi32.dll");
-    pCurrentMapiFile->InitWithPath(filePath.get());
-    rv = pCurrentMapiFile->Exists(&bExist);
-    if (NS_SUCCEEDED(rv) && bExist)
-    {
-        rv = pCurrentMapiFile->MoveTo(nsnull, "Mapi32_moz_bak.dll");
-        if (NS_FAILED(rv)) return rv;
-        nsCAutoString fullFilePath(buffer);
-        fullFilePath.Append("\\Mapi32_moz_bak.dll");
-        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                            "Software\\Mozilla\\Desktop", 
-                            "Mapi_backup_dll", 
-                            (char *)fullFilePath.get());
-        if (NS_FAILED(rv)) {
-             RestoreBackedUpMapiDll();
-             return rv;
-        }
-    }
-    
-    NS_NAMED_LITERAL_STRING(fileName, "Mapi32.dll");
-    filePath.Assign(buffer);
-    pCurrentMapiFile->InitWithPath(filePath.get());
-    rv = pMozMapiFile->CopyToUnicode(pCurrentMapiFile, fileName.get());
-    if (NS_FAILED(rv))
-        RestoreBackedUpMapiDll();
-    return rv;
-}
-
-/** deletes the Mapi32.dll in system directory and renames Mapi32_moz_bak.dll
- *  to Mapi32.dll
- */
-nsresult nsMapiRegistryUtils::RestoreBackedUpMapiDll()
-{
-    nsresult rv;
-    char buffer[MAX_PATH] = {0};
-    if (GetSystemDirectory(buffer, sizeof(buffer)) == 0) 
-        return NS_ERROR_FAILURE;
-
-    nsCAutoString filePath(buffer);
-    nsCAutoString previousFileName(buffer);
-    filePath.Append("\\Mapi32.dll");
-    previousFileName.Append("\\Mapi32_moz_bak.dll");
-
-    nsCOMPtr <nsILocalFile> pCurrentMapiFile = do_CreateInstance(NS_LOCAL_FILE_CONTRACTID, &rv);
-    if (NS_FAILED(rv) || !pCurrentMapiFile) return NS_ERROR_FAILURE;        
-    pCurrentMapiFile->InitWithPath(filePath.get());
-    
-    nsCOMPtr<nsILocalFile> pPreviousMapiFile = do_CreateInstance (NS_LOCAL_FILE_CONTRACTID, &rv);
-    if (NS_FAILED(rv) || !pPreviousMapiFile) return NS_ERROR_FAILURE;       
-    pPreviousMapiFile->InitWithPath(previousFileName.get());
-
-    PRBool bExist;
-    rv = pCurrentMapiFile->Exists(&bExist);
-    if (NS_SUCCEEDED(rv) && bExist) {
-        rv = pCurrentMapiFile->Remove(PR_FALSE);
-        if (NS_FAILED(rv)) return rv;
-    }
-
-    rv = pPreviousMapiFile->Exists(&bExist);
-    if (NS_SUCCEEDED(rv) && bExist)
-        rv = pPreviousMapiFile->MoveTo(nsnull, "Mapi32.dll");
-    if (NS_SUCCEEDED(rv))
-        DeleteRegistryValue(HKEY_LOCAL_MACHINE,
-                            "Software\\Mozilla\\Desktop", 
-                            "Mapi_backup_dll");
-    return rv;
-}
-
-/** Sets Mozilla as default Mail Client
- */
-nsresult nsMapiRegistryUtils::setDefaultMailClient()
-{
-    nsresult rv;
-    nsresult mailKeySet=NS_ERROR_FAILURE;
-    if (verifyRestrictedAccess()) return NS_ERROR_FAILURE;
-    if (!isSmartDll()) {
-        if (NS_FAILED(CopyMozMapiToWinSysDir())) return NS_ERROR_FAILURE;
-    }
-    rv = saveDefaultMailClient();
-    if (NS_FAILED(saveUserDefaultMailClient()) ||
-        NS_FAILED(rv)) return NS_ERROR_FAILURE;
-    nsCAutoString keyName("Software\\Clients\\Mail\\");
-
-    nsCAutoString appName (NS_ConvertUCS2toUTF8(brandName()).get());
-    if (!appName.IsEmpty()) {
-        keyName.Append(appName.get());
-
- nsCOMPtr<nsIStringBundle> bundle;
- rv = MakeMapiStringBundle (getter_AddRefs (bundle)) ;
- if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-
- nsXPIDLString defaultMailTitle;
- const PRUnichar *keyValuePrefixStr[] = { brandName(), versionNo() };
- NS_NAMED_LITERAL_STRING(defaultMailTitleTag, "defaultMailDisplayTitle");
- rv = bundle->FormatStringFromName(defaultMailTitleTag.get(),
- keyValuePrefixStr, 2,
- getter_Copies(defaultMailTitle));
- if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-
-        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                        keyName.get(), 
- "", NS_CONST_CAST(char *, NS_ConvertUCS2toUTF8(defaultMailTitle).get()) ) ; 
-    }
-    else
-        rv = NS_ERROR_FAILURE;
-    if (NS_SUCCEEDED(rv)) {
-        nsCAutoString thisApp (thisApplication()) ;
-        if (NS_FAILED(rv)) return rv ;
-
-        nsCAutoString dllPath (thisApp) ;
-        PRInt32 index = dllPath.RFind("\\");
-        if (index != kNotFound)
-            dllPath.Truncate(index + 1);
-        dllPath += "mozMapi32.dll";
-        rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                            keyName.get(), "DLLPath", 
-                            (char *)dllPath.get());
-        if (NS_SUCCEEDED(rv)) {
-            keyName.Append("\\protocols\\mailto");
-            rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                                keyName.get(), 
-                                "", "URL:MailTo Protocol");
-            if (NS_SUCCEEDED(rv)) {
-                nsCAutoString appPath (thisApp);
-                appPath += " \"%1\"";
-                keyName.Append("\\shell\\open\\command");
-                rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                       keyName.get(), 
-                       "", (char *)appPath.get());
-                if (NS_SUCCEEDED(rv)) {
-                    rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                                        "Software\\Clients\\Mail", 
-                                        "", (char *)appName.get());
-                }
-                if (NS_SUCCEEDED(rv)) {
-                    nsCAutoString mailAppPath(thisApp);
-                    mailAppPath += " -mail";
-                    nsCAutoString appKeyName ("Software\\Clients\\Mail\\");
-                    appKeyName.Append(appName.get());
-                    appKeyName.Append("\\shell\\open\\command");
-                    rv = SetRegistryKey(HKEY_LOCAL_MACHINE,
-                                        appKeyName.get(),
-                                        "", (char *)mailAppPath.get());
-                }
-                if (NS_SUCCEEDED(rv)) {
-                    nsCAutoString iconPath(thisApp);
-                    iconPath += ",0";
-                    nsCAutoString iconKeyName ("Software\\Clients\\Mail\\");
-                    iconKeyName.Append(appName.get());
-                    iconKeyName.Append("\\DefaultIcon");
-                    mailKeySet = SetRegistryKey(HKEY_LOCAL_MACHINE,
-                                        iconKeyName.get(),
-                                        "", (char *)iconPath.get());
-                }
-            }            
-        }
-    }
-
-    if (NS_SUCCEEDED(mailKeySet)) {
-        nsresult desktopKeySet = SetRegistryKey(HKEY_CURRENT_USER, 
-                                                "Software\\Clients\\Mail",
-                                                "", (char *)appName.get());
-        if (NS_SUCCEEDED(desktopKeySet)) {
-            desktopKeySet = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                                           "Software\\Mozilla\\Desktop", 
-                                           "defaultMailHasBeenSet", "1");
-        }
-        ::SendMessage(HWND_BROADCAST, WM_SETTINGCHANGE, 0, 
-                     (LPARAM)"Software\\Clients\\Mail");
-        RegisterServer(CLSID_CMapiImp, "Mozilla MAPI", "mozMapi", "mozMapi.1");
-        return desktopKeySet;
-    }
-    
-    return mailKeySet;
-}
-
-/** Removes Mozilla as the default Mail client and restores the previous setting
- */
-nsresult nsMapiRegistryUtils::unsetDefaultMailClient() {
-    nsresult result = NS_OK;
-    nsresult mailKeySet = NS_ERROR_FAILURE;
-    if (verifyRestrictedAccess()) return NS_ERROR_FAILURE;
-    if (!isSmartDll()) {
-        if (NS_FAILED(RestoreBackedUpMapiDll())) return NS_ERROR_FAILURE;
-    }
-    nsCAutoString name ;
-    GetRegistryKey(HKEY_LOCAL_MACHINE, "Software\\Mozilla\\Desktop", 
-                                      "HKEY_LOCAL_MACHINE\\Software\\Clients\\Mail", name);
-    nsCAutoString appName (NS_ConvertUCS2toUTF8(brandName()).get());
-
-    if (!name.IsEmpty() && !appName.IsEmpty() && name.Equals(appName)) {
-        nsCAutoString keyName("HKEY_LOCAL_MACHINE\\Software\\Clients\\Mail\\");
-        keyName.Append(appName.get());
-        keyName.Append("\\protocols\\mailto\\shell\\open\\command");
-        nsCAutoString appPath ;
-        GetRegistryKey(HKEY_LOCAL_MACHINE, "Software\\Mozilla\\Desktop", 
-                        keyName.get(), appPath);
-        if (!appPath.IsEmpty()) {
-            keyName.Assign("Software\\Clients\\Mail\\");
-            keyName.Append(appName.get());
-            keyName.Append("\\protocols\\mailto\\shell\\open\\command");
-            result = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                       keyName.get(), 
-                       "", (char *)appPath.get());
-            if (NS_SUCCEEDED(result)) {
-                PRInt32 index = appPath.RFind("\\");
-                if (index != kNotFound)
-                    appPath.Truncate(index + 1);
-                appPath += "mozMapi32.dll";
-                keyName.Assign("Software\\Clients\\Mail\\");
-                keyName.Append(appName.get());
-                result = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                                        keyName.get(), 
-                                        "DLLPath", (char *) appPath.get());
-            }
-        }
-    }
-    if (!name.IsEmpty()) {
-        if (NS_SUCCEEDED(result)) {
-            mailKeySet = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                                "Software\\Clients\\Mail", 
-                                "", (char *)name.get());
-        }
-    }
-    else
-        mailKeySet = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                                "Software\\Clients\\Mail", 
-                                "", "");
-
-    if (NS_SUCCEEDED(mailKeySet)) {
-        nsCAutoString userAppName ;
-        GetRegistryKey(HKEY_LOCAL_MACHINE, 
-                                  "Software\\Mozilla\\Desktop", 
-                                  "HKEY_CURRENT_USER\\Software\\Clients\\Mail", userAppName);
-        nsresult desktopKeySet = NS_OK;
-        if (!userAppName.IsEmpty()) {
-            desktopKeySet = SetRegistryKey(HKEY_CURRENT_USER, 
-                                           "Software\\Clients\\Mail", 
-                                           "", (char *)userAppName.get());
-        }
-        else {
-            DeleteRegistryValue(HKEY_CURRENT_USER, "Software\\Clients\\Mail", "");
-        }
-        if (NS_SUCCEEDED(desktopKeySet)) {
-            desktopKeySet = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                                           "Software\\Mozilla\\Desktop", 
-                                           "defaultMailHasBeenSet", "0");
-        }
-        ::SendMessage(HWND_BROADCAST, WM_SETTINGCHANGE, 0, 
-                     (LPARAM)"Software\\Clients\\Mail");
-        UnregisterServer(CLSID_CMapiImp, "mozMapi", "mozMapi.1");
-        return desktopKeySet;
-    }
-    return mailKeySet;
-}
-
-/** Returns FALSE if showMapiDialog is set to 0.
- *  Returns TRUE otherwise
- *  Also returns TRUE if the Mozilla has been set as the default mail client
- *  and some other application has changed that setting.
- *  This function gets called only if the current app is not the default mail
- *  client
- */
-PRBool nsMapiRegistryUtils::getShowDialog() {
-    PRBool rv = PR_FALSE;
-    nsCAutoString showDialog ;
-    GetRegistryKey(HKEY_LOCAL_MACHINE, "Software\\Mozilla\\Desktop", 
-                                        "showMapiDialog", showDialog);
-    // if the user has not selected the checkbox, show dialog 
-    if (showDialog.IsEmpty() || showDialog.Equals("1"))
-            rv = PR_TRUE;
-
-    if (!rv) {
-        // even if the user has selected the checkbox
-        // show it if some other application has changed the 
-        // default setting.
-        nsCAutoString setMailDefault ;
-        GetRegistryKey(HKEY_LOCAL_MACHINE,"Software\\Mozilla\\Desktop", 
-                                       "defaultMailHasBeenSet", setMailDefault);
-        if (setMailDefault.Equals("1")) {
-            // need to reset the defaultMailHasBeenSet to "0"
-            // so that after the dialog is displayed once,
-            // we do not keep displaying this dialog after the user has
-            // selected the checkbox
-            rv = SetRegistryKey(HKEY_LOCAL_MACHINE, 
-                                "Software\\Mozilla\\Desktop", 
-                                "defaultMailHasBeenSet", "0");
-            rv = PR_TRUE;
-        }
-    }
-    return rv;
-}
-
-nsresult nsMapiRegistryUtils::MakeMapiStringBundle(nsIStringBundle ** aMapiStringBundle)
-{
-    nsresult rv = NS_OK ;
-
-    if (m_mapiStringBundle)
-    {
-        *aMapiStringBundle = m_mapiStringBundle ;
-        NS_ADDREF(*aMapiStringBundle);
-        return rv ;
-    }
-
-    nsCOMPtr<nsIStringBundleService> bundleService(do_GetService(
-                                     kStringBundleServiceCID, &rv));
-    if (NS_FAILED(rv) || !bundleService) return NS_ERROR_FAILURE;
-
-    rv = bundleService->CreateBundle(
- MAPI_PROPERTIES_CHROME,
-                    getter_AddRefs(m_mapiStringBundle));
-    if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-
- NS_ADDREF(*aMapiStringBundle = m_mapiStringBundle) ;
-
-    return rv ;
-}
-
-nsresult nsMapiRegistryUtils::ShowMapiErrorDialog() 
-{
-    nsresult rv;
-    nsCOMPtr<nsIPromptService> promptService(do_GetService(
-                  "@mozilla.org/embedcomp/prompt-service;1", &rv));
-    if (NS_SUCCEEDED(rv) && promptService)
-    {
-        nsCOMPtr<nsIStringBundle> bundle;
-        rv = MakeMapiStringBundle (getter_AddRefs (bundle)) ;
-        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-
-        nsXPIDLString dialogTitle;
-        const PRUnichar *brandStrings[] = { brandName() };
-        NS_NAMED_LITERAL_STRING(dialogTitlePropertyTag, "errorMessageTitle");
-        rv = bundle->FormatStringFromName(dialogTitlePropertyTag.get(),
-                                          brandStrings, 1,
-                                          getter_Copies(dialogTitle));
-        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-
-        nsXPIDLString dialogText;
-        NS_NAMED_LITERAL_STRING(dialogTextPropertyTag, "errorMessage");
-        rv = bundle->FormatStringFromName(dialogTextPropertyTag.get(),
-                                          brandStrings, 1,
-                                          getter_Copies(dialogText));
-        if (NS_FAILED(rv)) return NS_ERROR_FAILURE;
-
-        rv = promptService->Alert(nsnull, dialogTitle,
-                                  dialogText);
-    }
-    return rv;
-}
-

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

mozilla/mailnews/mapi/resources/makefile.win

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

mozilla/xpinstall/packager/windows/browser.jst

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,111 @@
+#!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/src/Makefile.in

@@ -0,0 +1,83 @@
+#
+# 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 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#     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
+LIBRARY_NAME	= xpinstall
+SHORT_LIBNAME	= xpinstal
+IS_COMPONENT	= 1
+
+EXTRA_DSO_LIBS	= jsdom
+
+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)
+
+include $(topsrcdir)/config/rules.mk
+

mozilla/xpinstall/src/PatchableAppleSingle.cpp

@@ -0,0 +1,924 @@
+/* -*- 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) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ *     Douglas Turner <dougt@netscape.com>
+ */
+#include "PatchableAppleSingle.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+OSErr PAS_EncodeFile(FSSpec *inSpec, FSSpec *outSpec);
+OSErr PAS_DecodeFile(FSSpec *inSpec, FSSpec *outSpec);
+
+OSErr PAS_encodeResource(FSSpec *inFile, short outRefNum);
+OSErr PAS_decodeResource(PASEntry *entry, FSSpec *outFile, short inRefNum);
+
+OSErr PAS_encodeMisc(FSSpec *inFile, short outRefNum);
+OSErr PAS_decodeMisc(PASEntry *entry, FSSpec *outFile, short inRefNum);
+
+OSErr PAS_encodeData(FSSpec *inFile, short outRefNum);
+OSErr PAS_decodeData(PASEntry *entry, FSSpec *outFile, short inRefNum);
+
+OSErr PAS_encodeHeader(short refnum);
+OSErr PAS_decodeHeader(short refNum, PASHeader *header);
+
+
+unsigned long PAS_getDataSize(FSSpec *spec);
+short PAS_getResourceID(Handle resource);
+
+OSErr PAS_flattenResource(ResType type, short *ids, long count, short source, short dest);
+OSErr PAS_unflattenResource(PASResource *pasRes, Ptr buffer);
+
+void PAS_sortTypes(short sourceRefNum, ResType **resTypePtr, long *count);
+void PAS_sortIDs(short sourceRefNum, OSType theType, short **IdPtr, long *count);
+void PAS_bubbleSortResType(ResType *types, long count);
+void PAS_bubbleSortIDS(short *ids, long count);
+
+OSErr PAS_EncodeFile(FSSpec *inSpec, FSSpec *outSpec)
+{
+	OSErr		err;
+	short		outRefNum;
+	
+	PASEntry 	dataEntry, miscEntry, resourceEntry;
+	long		sizeOfEntry;
+
+
+	if (inSpec == NULL || outSpec == NULL)
+		return paramErr;
+		
+
+	memset(&dataEntry, 0, sizeof(PASEntry));
+	memset(&miscEntry, 0, sizeof(PASEntry));
+	memset(&resourceEntry, 0, sizeof(PASEntry));
+	
+	FSpDelete( outSpec ) ;
+	
+	err = FSpCreate( outSpec, kCreator, kType ,smSystemScript );
+	
+	if (err != noErr) 	return err;
+	
+	
+	err = FSpOpenDF(outSpec, fsRdWrPerm, &outRefNum);
+	
+	if (err != noErr)  goto error;
+	
+
+	// Write Out Header
+		
+	err = PAS_encodeHeader(outRefNum);
+	if (err != noErr)  goto error;
+	
+	/* Why am I using three (3)?
+		
+		E stand for entry.
+		
+	   The data for the entry is after the THREE headers 
+	
+		|---------|----|----|----|---------------------->
+		   header    E    E    E
+	
+	*/
+	
+	
+	// Write Out Data Entry 
+	dataEntry.entryID		=	ePas_Data;
+	dataEntry.entryLength	=	PAS_getDataSize(inSpec);
+	dataEntry.entryOffset	=	sizeof(PASHeader) + (3 * sizeof(PASEntry));
+	
+	sizeOfEntry			=	sizeof(PASEntry);
+	if(dataEntry.entryLength < 0)
+	{
+		err	= dataEntry.entryLength;
+		goto error;
+	}
+	
+	err = FSWrite(outRefNum, &sizeOfEntry, &dataEntry);
+	if (err != noErr) 	goto error;
+	
+	
+	
+	// Write Out Misc Entry 
+	miscEntry.entryID		=	ePas_Misc;
+	miscEntry.entryLength	=	sizeof(PASMiscInfo);
+	miscEntry.entryOffset	=	sizeof(PASHeader) + (3 * sizeof(PASEntry)) + dataEntry.entryLength;
+
+	sizeOfEntry			=	sizeof(PASEntry);
+	err = FSWrite(outRefNum, &sizeOfEntry, &miscEntry);
+	if (err != noErr) 	goto error;
+	
+	
+	// Write Out Resource Entry 
+	resourceEntry.entryID		=	ePas_Resource;
+	resourceEntry.entryLength	=	-1;
+	resourceEntry.entryOffset	=	sizeof(PASHeader) + (3 * sizeof(PASEntry)) + dataEntry.entryLength + miscEntry.entryLength;
+
+
+	sizeOfEntry			=	sizeof(PASEntry);
+	err = FSWrite(outRefNum, &sizeOfEntry, &resourceEntry);
+	if (err != noErr) 	goto error;
+	
+	err =  PAS_encodeData(inSpec, outRefNum);	
+	if (err != noErr) 	goto error;
+	
+	
+	err =  PAS_encodeMisc(inSpec, outRefNum);	
+	if (err != noErr) 	goto error;
+	
+	err =  PAS_encodeResource(inSpec, outRefNum);	
+	
+	if (err == kResFileNotOpened)
+	{
+		// there was no resource fork
+		err = noErr;
+	}
+	else if (err != noErr)
+	{
+		goto error;
+	}
+		
+	FSClose(outRefNum);
+	
+	return noErr;
+	
+	
+	
+error:
+		
+		
+	if (outRefNum != kResFileNotOpened)
+	{
+		FSClose(outRefNum);
+	}
+		
+	FSpDelete( outSpec ) ;
+	 
+	return err;
+
+}
+
+
+
+OSErr PAS_DecodeFile(FSSpec *inSpec, FSSpec *outSpec)
+{
+	OSErr		err;
+	short		inRefNum;
+	
+	PASHeader	header;
+	
+	PASEntry 	dataEntry, miscEntry, resourceEntry;
+	long		sizeOfEntry;
+
+	if (inSpec == NULL || outSpec == NULL)
+		return paramErr;
+		
+		
+	FSpDelete( outSpec ) ;
+	
+	err = FSpCreate( outSpec, kCreator, kType ,smSystemScript );
+	
+	if (err != noErr) 	return err;
+	
+	
+	
+	err = FSpOpenDF(inSpec, fsRdPerm, &inRefNum);
+	
+	if (err != noErr)  goto error;
+
+	
+	// Read Header 
+		
+	err	= PAS_decodeHeader(inRefNum, &header);
+	if (err != noErr)  goto error;
+	
+	if(	header.magicNum != PAS_MAGIC_NUM ||
+		header.versionNum != PAS_VERSION)
+	{
+		err = -1;
+		goto error;
+	}
+	
+	
+	
+	// Read Data Entry 
+	
+	
+	err = SetFPos(inRefNum, fsFromStart, sizeof(PASHeader));
+	if (err != noErr) 	goto error;
+	
+	sizeOfEntry			=	sizeof(PASEntry);
+
+	err = FSRead(inRefNum, &sizeOfEntry, &dataEntry);
+	if (err != noErr) 	goto error;
+	
+	
+	
+	
+	// Read Misc Entry 
+	
+	
+	err = SetFPos(inRefNum, fsFromStart, (sizeof(PASHeader) + sizeof(PASEntry)));
+	if (err != noErr) 	goto error;
+	
+	sizeOfEntry			=	sizeof(PASEntry);
+
+	err = FSRead(inRefNum, &sizeOfEntry, &miscEntry);
+	if (err != noErr) 	goto error;
+	
+
+	// Read Resource Entry 
+	
+	
+	err = SetFPos(inRefNum, fsFromStart, (sizeof(PASHeader) + (2 * sizeof(PASEntry)))) ;
+	if (err != noErr) 	goto error;
+	
+	sizeOfEntry			=	sizeof(PASEntry);
+
+	err = FSRead(inRefNum, &sizeOfEntry, &resourceEntry);
+	if (err != noErr) 	goto error;
+
+
+
+
+
+	err =  PAS_decodeData(&dataEntry, outSpec, inRefNum);	
+	if (err != noErr) 	goto error;
+
+	err =  PAS_decodeMisc(&miscEntry, outSpec, inRefNum);
+	if (err != noErr) 	goto error;
+
+	err =  PAS_decodeResource(&resourceEntry, outSpec, inRefNum);	
+	if (err == kResFileNotOpened)
+	{
+		// there was no resource fork
+		err = noErr;
+	}
+	else if (err != noErr)
+	{
+		goto error;
+	}
+
+	
+	FSClose(inRefNum);
+	
+	return noErr;
+	
+	
+	
+error:
+
+	if (inRefNum != kResFileNotOpened)
+	{
+		FSClose(inRefNum);
+	}
+		
+	FSpDelete( outSpec ) ;
+	
+	return err;
+	
+}
+
+
+
+
+#pragma mark -
+
+
+OSErr PAS_encodeResource(FSSpec *inFile, short outRefNum)
+{
+	OSErr 			err;	
+	short			inRefNum;
+	PASResFork		resInfo;
+	SInt32			currentWrite;
+	
+	ResType 		*resTypes;
+	long			typeCount;
+	
+	short			*ids;
+	long			idCount;
+	
+	short			oldResFile;
+	
+	oldResFile=CurResFile();
+	inRefNum = FSpOpenResFile(inFile, fsRdPerm);
+	if (inRefNum < noErr)	return inRefNum;
+
+	UseResFile(inRefNum);
+		
+	memset(&resInfo, 0, sizeof(PASResFork));   
+	
+	PAS_sortTypes(inRefNum, &resTypes, &typeCount);
+
+	resInfo.NumberOfTypes	=	typeCount;
+	
+	currentWrite	= sizeof(PASResFork);
+	
+	err = FSWrite(outRefNum, &currentWrite, &resInfo);
+	if (err != noErr)	return err;
+	
+	for (typeCount = 0; ((typeCount < resInfo.NumberOfTypes) && (err == noErr)); typeCount++)
+	{
+		PAS_sortIDs(inRefNum, resTypes[typeCount], &ids, &idCount);
+		err = PAS_flattenResource(resTypes[typeCount], ids, idCount, inRefNum, outRefNum);
+		DisposePtr((Ptr)ids);
+	}
+	
+	DisposePtr((Ptr)resTypes);
+	
+	
+	UseResFile(oldResFile);		
+	CloseResFile(inRefNum);
+	
+	return err;
+}
+
+OSErr PAS_decodeResource(PASEntry *entry, FSSpec *outFile, short inRefNum)
+{
+	OSErr 			err = noErr;	
+	short			outRefNum;
+	PASResFork		info;
+	SInt32			infoSize;
+	short			oldResFile;
+	
+	PASResource		pasRes;
+	SInt32			pasResSize;
+	
+	long			bufSize;
+	Handle			buffer;
+	long			counter=0;
+	
+	infoSize	=	sizeof(PASResFork);
+	
+	err = SetFPos(inRefNum, fsFromStart, (*entry).entryOffset );
+	if (err != noErr)	return err;
+
+	err	= FSRead( inRefNum, &infoSize, &info);
+	if (err != noErr)	return err;
+
+	if(infoSize != sizeof(PASResFork))
+	{
+		err = -1;
+		goto error;
+	}
+	
+	oldResFile=CurResFile();
+	
+	outRefNum = FSpOpenResFile(outFile, fsRdWrPerm);
+	if (outRefNum < noErr)	return outRefNum;
+				
+	UseResFile(outRefNum);
+	
+	
+	while (1)
+	{
+		pasResSize	=	sizeof(PASResource);
+		err	= FSRead( inRefNum, &pasResSize, &pasRes);
+		
+		if (err != noErr)
+		{
+			if(err == eofErr)
+				err = noErr;
+				
+			break;
+		}
+		
+		bufSize	=	pasRes.length;
+		buffer	=	NewHandle(bufSize);
+		HLock(buffer);
+		
+		if(buffer == NULL)
+		{
+			//  if we did not get our memory, try updateresfile 
+		
+			HUnlock(buffer);
+
+
+			UpdateResFile(outRefNum);
+			counter=0;
+			
+			buffer	=	NewHandle(bufSize);
+			HLock(buffer);
+			
+			if(buffer == NULL)
+			{
+				err = memFullErr;
+				break;
+			}
+		}
+		
+		err	= FSRead( inRefNum, &bufSize, &(**buffer));
+		if (err != noErr && err != eofErr)	break;
+		
+		AddResource(buffer, pasRes.attrType, pasRes.attrID, pasRes.attrName);
+		WriteResource(buffer);
+		
+		SetResAttrs(buffer, pasRes.attr);
+		ChangedResource(buffer);	
+		WriteResource(buffer);
+		
+		ReleaseResource(buffer);	
+		
+		if (counter++ > 100)
+		{
+			UpdateResFile(outRefNum);
+			counter=0;
+		}
+	
+	}
+
+error:
+		
+	UseResFile(oldResFile);	
+	CloseResFile(outRefNum);
+		
+	return err;
+}
+
+#pragma mark -
+
+OSErr PAS_encodeMisc(FSSpec *inFile, short outRefNum)
+{
+	OSErr 		err;	
+	short		inRefNum;
+	PASMiscInfo	infoBlock;
+	FInfo		fInfo;
+	SInt32		currentRead;
+	
+	err = FSpOpenDF(inFile, fsRdPerm, &inRefNum);
+	if (err != noErr)	return err;
+	
+	memset(&infoBlock, 0, sizeof(PASMiscInfo));   
+	
+	err = FSpGetFInfo(inFile, &fInfo);
+	if (err != noErr)	return err;
+	
+	infoBlock.fileType		=	fInfo.fdType;
+	infoBlock.fileCreator	=	fInfo.fdCreator;
+	infoBlock.fileFlags		=	fInfo.fdFlags;
+	
+		
+	FSClose(inRefNum);
+	
+	
+	inRefNum = FSpOpenResFile(inFile, fsRdPerm);
+	if (inRefNum > noErr)
+	{
+		infoBlock.fileHasResFork	= 1;
+		infoBlock.fileResAttrs 		= GetResFileAttrs(inRefNum);
+		FSClose(inRefNum);
+	}
+	else
+	{
+		infoBlock.fileHasResFork	= 0;
+		infoBlock.fileResAttrs 		= 0;
+	}
+	currentRead	= sizeof(PASMiscInfo);
+	
+	err = FSWrite(outRefNum, &currentRead, &infoBlock);
+	if (err != noErr)	return err;
+		
+	CloseResFile(inRefNum);
+	
+	return noErr;
+}
+
+
+OSErr PAS_decodeMisc(PASEntry *entry, FSSpec *outFile, short inRefNum)
+{
+	OSErr 		err = noErr;	
+	short		outRefNum;
+	PASMiscInfo	info;
+	SInt32		infoSize;
+	FInfo		theFInfo;
+		
+	
+	infoSize	=	sizeof(PASMiscInfo);
+	
+	err = SetFPos(inRefNum, fsFromStart, (*entry).entryOffset );
+	if (err != noErr)	return err;
+
+	err	= FSRead( inRefNum, &infoSize, &info);
+	if (err != noErr)	return err;
+
+	if(infoSize != sizeof(PASMiscInfo))
+	{
+		return -1;
+	}
+
+	err = FSpOpenDF(outFile, fsRdWrPerm, &outRefNum);
+	if (err != noErr)	return err;
+	
+	memset(&theFInfo, 0, sizeof(FInfo));   
+		
+	theFInfo.fdType		=	info.fileType;
+	theFInfo.fdCreator	=	info.fileCreator;	
+	theFInfo.fdFlags	=	info.fileFlags;
+	
+	err = FSpSetFInfo(outFile, &theFInfo);
+	if (err != noErr)	return err;
+		
+	FSClose(outRefNum);
+	
+	if (info.fileHasResFork)
+	{
+		outRefNum = FSpOpenResFile(outFile, fsRdWrPerm);
+		if (outRefNum < noErr)
+		{
+			// maybe it does not have one!
+			
+			FSpCreateResFile(outFile, info.fileCreator, info.fileType, smSystemScript);
+			
+			outRefNum = FSpOpenResFile(outFile, fsRdWrPerm);	
+			if (outRefNum < noErr) 
+			{
+				return outRefNum;
+			}
+		}
+		
+		SetResFileAttrs(outRefNum, info.fileResAttrs);
+		
+		
+		CloseResFile(outRefNum);
+	}	
+	
+	
+	if(info.fileType == 'APPL')
+	{
+		// we need to add applications to the desktop database.
+		
+/*	FIX :: need to find DTSetAPPL() function	
+		err = DTSetAPPL( NULL,
+                    	 outFile->vRefNum,
+			             info.fileCreator,
+			             outFile->parID,
+                         outFile->name);
+*/	}
+	
+	
+	return err;
+	
+	
+
+}
+
+#pragma mark -
+
+OSErr PAS_encodeData(FSSpec *inFile, short outRefNum)
+{
+	OSErr 		err;	
+	short		inRefNum;
+	Ptr 		buffer;
+	SInt32 		currentRead = 	PAS_BUFFER_SIZE;
+		
+	buffer	=	NewPtr(currentRead);
+
+	err = FSpOpenDF(inFile, fsRdPerm, &inRefNum);
+	if (err != noErr)	return err;
+	
+	while ( currentRead > 0 )
+    {
+		err	= FSRead( inRefNum, &currentRead, buffer);
+		if (err != noErr && err != eofErr)	return err;
+		
+		err = FSWrite(outRefNum, &currentRead, buffer);
+		if (err != noErr)	return err;
+	}
+	
+	FSClose(inRefNum);
+	
+	DisposePtr(buffer);
+	
+	return noErr;
+}
+
+OSErr PAS_decodeData(PASEntry *entry, FSSpec *outFile, short inRefNum)
+{
+	OSErr 		err;	
+	short		outRefNum;
+	Ptr 		buffer;
+	SInt32 		currentWrite = 	PAS_BUFFER_SIZE;
+	SInt32		totalSize;
+	
+	
+	buffer = NewPtr(currentWrite);
+	
+	
+	err = FSpOpenDF(outFile, fsRdWrPerm, &outRefNum);
+	if (err != noErr)	return err;
+	
+	
+	err = SetFPos(inRefNum, fsFromStart, (*entry).entryOffset );
+	if (err != noErr)	return err;
+	
+	err = SetFPos(outRefNum, fsFromStart, 0 );
+	if (err != noErr)	return err;
+	
+	totalSize = (*entry).entryLength;
+	
+	while(totalSize > 0)
+	{	
+		currentWrite = PAS_BUFFER_SIZE;
+
+		if (totalSize < currentWrite)
+		{
+			currentWrite = totalSize;
+		}
+
+		err	= FSRead( inRefNum, &currentWrite, buffer);
+		if (err != noErr && err != eofErr)	return err;
+	
+		err = FSWrite(outRefNum, &currentWrite, buffer);
+		if (err != noErr)	return err;
+		
+		totalSize = totalSize - currentWrite;
+
+	}
+	
+	FSClose(outRefNum);
+	
+	DisposePtr(buffer);
+	
+	return noErr;
+
+}
+
+#pragma mark -
+
+OSErr PAS_encodeHeader(short refnum)
+{
+	PASHeader 	header;
+	long		sizeOfHeader;
+	OSErr		err;
+	
+	
+	sizeOfHeader = sizeof(PASHeader);
+		
+	memset(&header, 0, sizeOfHeader);   
+	
+	header.magicNum 	= PAS_MAGIC_NUM;
+	header.versionNum 	= PAS_VERSION;
+	header.numEntries 	= 3;
+	
+	// Write Out Header 
+	err = FSWrite(refnum, &sizeOfHeader, &header);
+	
+	return err;
+
+}
+
+OSErr PAS_decodeHeader(short refNum, PASHeader *header)
+{
+	OSErr 	err;
+	long 	sizeOfHeader = sizeof(PASHeader);
+	
+	memset(header, 0, sizeOfHeader);   
+	
+	err = FSRead(refNum, &sizeOfHeader, header);
+	
+	return err;
+}
+
+#pragma mark -
+
+
+unsigned long PAS_getDataSize(FSSpec *spec)
+{
+	short		refNum;
+	OSErr		err;
+	Str255 		temp;	
+	CInfoPBRec 	cbrec;
+	err = FSpOpenDF(spec, fsRdPerm, &refNum);
+
+	memcpy( temp, spec->name, spec->name[0] + 1);
+
+	cbrec.hFileInfo.ioNamePtr 		= temp;
+	cbrec.hFileInfo.ioDirID 		= spec->parID;
+	cbrec.hFileInfo.ioVRefNum 		= spec->vRefNum;
+	cbrec.hFileInfo.ioFDirIndex     = 0;
+
+	err = PBGetCatInfoSync(&cbrec);
+	FSClose(refNum);
+	
+	if(err != noErr)
+	{
+		cbrec.hFileInfo.ioFlLgLen = err;
+	}
+
+	return (cbrec.hFileInfo.ioFlLgLen);
+}
+
+short PAS_getResourceID(Handle resource)
+{
+	ResType			theType;
+	Str255			name;
+	short			theID;
+	
+	memset(&name, 0, sizeof(Str255));  
+			
+	GetResInfo(resource, &theID, &theType, name);
+	
+	return theID;
+}
+
+
+#pragma mark -
+OSErr PAS_flattenResource(ResType type, short *ids, long count, short source, short dest)
+{
+	long 			idIndex;
+	
+	
+	Handle			resToCopy;
+	long			handleLength;
+	
+	PASResource		pasResource;
+	long			pasResLen;
+	
+	OSErr			err;
+	
+	for (idIndex=0; idIndex < count; idIndex++)
+	{
+		if( (type == 'SIZE') && ( ids[idIndex] == 1 || ids[idIndex] == 0  ) )
+		{
+			/* 	
+				We do not want to encode/flatten SIZE 0 or 1 because this
+				is the resource that the user can modify.  Most applications
+				will not be affected if we remove these resources
+			*/
+		}
+		else
+		{	
+			resToCopy=Get1Resource(type,ids[idIndex]);
+					
+			if(!resToCopy)	
+			{
+				return resNotFound;
+			}	
+				
+			memset(&pasResource, 0, sizeof(PASResource));	
+				
+			GetResInfo(	resToCopy, 	
+						&pasResource.attrID, 
+						&pasResource.attrType, 
+						pasResource.attrName);	
+			
+			pasResource.attr = GetResAttrs(resToCopy);
+			
+			DetachResource(resToCopy);	
+			HLock(resToCopy);
+			
+			pasResource.length 	= GetHandleSize(resToCopy);
+			handleLength 		= pasResource.length;
+			
+			pasResLen			=	sizeof(PASResource);
+			
+			err = FSWrite(dest, &pasResLen, &pasResource);
+			
+			if(err != noErr) 
+			{
+				return err;
+			}
+			
+			err = FSWrite(dest, &handleLength, &(**resToCopy));
+
+			if(err != noErr) 
+			{
+				return err;
+			}
+			
+			HUnlock(resToCopy);
+			DisposeHandle(resToCopy);		
+		}
+	}
+	
+	
+	return noErr;
+}
+
+
+#pragma mark -
+
+void PAS_sortTypes(short sourceRefNum, ResType **resTypePtr, long *count)
+{
+	short				oldRef;
+	short				typeIndex;
+	short				numberOfTypes;
+		
+	*count	=	-1;
+	
+	oldRef = CurResFile();
+		
+	UseResFile(sourceRefNum);
+
+	numberOfTypes = Count1Types();
+	
+	*resTypePtr	=	(ResType*) NewPtrClear( numberOfTypes * sizeof(OSType) );
+	
+	for (typeIndex=1; typeIndex <= numberOfTypes; typeIndex++)
+	{
+		Get1IndType(&(*resTypePtr)[typeIndex-1], typeIndex);
+	}
+	
+	UseResFile(oldRef);
+	
+	PAS_bubbleSortResType(*resTypePtr, numberOfTypes);
+	
+	*count = numberOfTypes;
+}	
+
+
+void PAS_sortIDs(short sourceRefNum, OSType theType, short **IdPtr, long *count)
+{
+	short				oldRef;
+	Handle				theHandle;
+	short				resCount;
+	short				resIndex;
+	
+	*count	=	-1;
+	
+	oldRef = CurResFile();
+		
+	UseResFile(sourceRefNum);
+
+	resCount = Count1Resources(theType);
+	
+	*IdPtr	=	(short*) NewPtrClear( resCount * sizeof(short) );
+	
+	for (resIndex=1; resIndex <= resCount; resIndex++)
+	{
+		theHandle = Get1IndResource(theType, resIndex);
+		
+		if(theHandle == NULL) return;
+	
+		(*IdPtr)[resIndex-1] = PAS_getResourceID(theHandle);
+		
+		ReleaseResource(theHandle);
+	}
+	
+	UseResFile(oldRef);
+	
+	PAS_bubbleSortIDS(*IdPtr, resCount);
+	
+	
+	*count = resCount;
+}
+
+#pragma mark -
+
+void
+PAS_bubbleSortResType(ResType *types, long count)
+{
+	long 	x, y;
+	OSType	temp;
+	
+	for (x=0; x < count-1; x++)      
+	{
+    	for (y=0; y < count-x-1; y++)        
+		{
+        	if (types[y] > types[y+1])        
+	        {  
+				temp=types[y];  
+            	types[y]=types[y+1];  
+            	types[y+1]=temp;        
+        	} 
+		}
+	}
+}
+
+void
+PAS_bubbleSortIDS(short *ids, long count)
+{
+	long 	x, y;
+	short	temp;
+	
+	for (x=0; x < count-1; x++)      
+	{
+    	for (y=0; y < count-x-1; y++)        
+		{
+        	if (ids[y] > ids[y+1])        
+	        {  
+				temp=ids[y];  
+            	ids[y]=ids[y+1];  
+            	ids[y+1]=temp;        
+        	} 
+		}
+	}
+}

mozilla/xpinstall/src/PatchableAppleSingle.h

@@ -0,0 +1,117 @@
+/* -*- 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) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ *     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 */

mozilla/xpinstall/src/ScheduledTasks.cpp

@@ -0,0 +1,481 @@
+/* -*- 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) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+#include "nscore.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)
+{
+    // 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().
+
+    PRInt32 err = -1;
+
+    /* Get OS version info */
+    DWORD dwVersion = GetVersion();
+
+    /* Get build numbers for Windows NT or Win32s */
+
+    if (dwVersion > 0x80000000)
+    {
+        // 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
+
+        char* final   = strdup(finalSpec.GetNativePathCString());
+        char* current = strdup(currentSpec.GetNativePathCString());
+
+        strlen = GetShortPathName( (LPCTSTR)current, (LPTSTR)Src, (DWORD)sizeof(Src) );
+        if ( strlen > 0 ) 
+        {
+            free(current);
+            current   = strdup(Src);
+        }
+
+        strlen = GetShortPathName( (LPCTSTR) final, (LPTSTR) Dest, (DWORD) sizeof(Dest));
+        if ( strlen > 0 ) 
+        {
+            free(final);
+            final   = strdup(Dest);
+        }
+        
+        /* NOTE: use OEM filenames! Even though it looks like a Windows
+         *       .INI file, WININIT.INI is processed under DOS 
+         */
+        
+        AnsiToOem( final, final );
+        AnsiToOem( current, current );
+
+        if ( WritePrivateProfileString( "Rename", final, current, "WININIT.INI" ) )
+            err = 0;
+
+        free(final);
+        free(current);
+    }
+    
+    return err;
+}
+#endif
+
+
+
+
+PRInt32 DeleteFileNowOrSchedule(const nsFileSpec& filename)
+{
+
+    PRInt32 result = nsInstall::SUCCESS;
+
+    filename.Delete(PR_FALSE);
+    if (filename.Exists())
+    {
+        // could not delete, schedule it for later
+
+        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 ) 
+            {
+                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);
+                    }
+                }
+            }
+
+            NR_RegClose(reg);
+        }
+    }
+
+    return result;
+}
+
+
+
+
+//-----------------------------------------------------------------------------
+//
+//          STARTUP: DO SCHEDULED ACTIONS
+//
+//-----------------------------------------------------------------------------
+
+void DeleteScheduledFiles(HREG);
+void ReplaceScheduledFiles(HREG);
+
+void PerformScheduledTasks(HREG reg)
+{
+    DeleteScheduledFiles( reg );
+    ReplaceScheduledFiles( reg );
+}
+
+
+
+void DeleteScheduledFiles( HREG reg )
+{
+    REGERR  err;
+    RKEY    key;
+    REGENUM state = 0;
+
+    /* perform scheduled file deletions  */
+    if (REGERR_OK == NR_RegGetKey(reg,ROOTKEY_PRIVATE,REG_DELETE_LIST_KEY,&key))
+    {
+        // the delete key exists, so we loop through its children
+        // and try to delete all the listed files
+
+        char    namebuf[MAXREGNAMELEN];
+        char    valbuf[MAXREGPATHLEN];
+
+        nsFileSpec              doomedFile;
+        nsCOMPtr<nsIFileSpec>   spec;
+
+        nsresult rv = NS_NewFileSpec(getter_AddRefs(spec));
+        if (NS_SUCCEEDED(rv))
+        {
+            while (REGERR_OK == NR_RegEnumEntries( reg, key, &state, namebuf,
+                                                   sizeof(namebuf), 0 ) )
+            {
+                uint32 bufsize = sizeof(valbuf); // gets changed, must reset
+                err = NR_RegGetEntry( reg, key, namebuf, valbuf, &bufsize );
+                if ( err == REGERR_OK )
+                {
+                    // 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 );
+                        }
+                    }
+                }
+            }
+
+            /* delete list node if empty */
+            state = 0;
+            err = NR_RegEnumEntries(reg, key, &state, namebuf, sizeof(namebuf), 0);
+            if ( err == REGERR_NOMORE )
+            {
+                NR_RegDeleteKey(reg, ROOTKEY_PRIVATE, REG_DELETE_LIST_KEY);
+            }
+        }
+    }
+}
+
+
+
+void ReplaceScheduledFiles( HREG reg )
+{
+    RKEY    key;
+
+    /* replace files if any listed */
+    if (REGERR_OK == NR_RegGetKey(reg,ROOTKEY_PRIVATE,REG_REPLACE_LIST_KEY,&key))
+    {
+        char keyname[MAXREGNAMELEN];
+        char doomedFile[MAXREGPATHLEN];
+        char srcFile[MAXREGPATHLEN];
+
+        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))
+        {
+            uint32 bufsize;
+            REGENUM state = 0;
+            while (REGERR_OK == NR_RegEnumSubkeys( reg, key, &state, 
+                                   keyname, sizeof(keyname), REGENUM_CHILDREN))
+            {
+                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);
+
+                if ( err1 == REGERR_OK && err2 == REGERR_OK )
+                {
+                    src->SetPersistentDescriptorString(srcFile);
+                    rv1 = src->GetFileSpec(&srcSpec);
+
+                    dest->SetPersistentDescriptorString(doomedFile);
+                    rv2 = dest->GetFileSpec(&doomedSpec);
+
+                    if (NS_SUCCEEDED(rv1) && NS_SUCCEEDED(rv2))
+                    {
+                        // finally now try to do the replace
+                        PRInt32 result = ReplaceFileNow( srcSpec, doomedSpec );
+
+                        if ( result == nsInstall::DOES_NOT_EXIST ||
+                             result == nsInstall::SUCCESS )
+                        {
+                            // This one is done
+                            NR_RegDeleteKey( reg, key, keyname );
+                        }
+                    }
+                }
+            }
+
+
+            /* delete list node if empty */
+            state = 0;
+            if (REGERR_NOMORE == NR_RegEnumSubkeys( reg, key, &state, keyname,
+                                          sizeof(keyname), REGENUM_CHILDREN ))
+            {
+                NR_RegDeleteKey(reg, ROOTKEY_PRIVATE, REG_REPLACE_LIST_KEY);
+            }
+        }
+    }
+}

mozilla/xpinstall/src/ScheduledTasks.h

@@ -0,0 +1,44 @@
+/* -*- 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) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ *     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 );
+
+
+void PerformScheduledTasks(HREG reg);
+
+PR_END_EXTERN_C
+
+#endif

mozilla/xpinstall/src/gdiff.h

@@ -0,0 +1,139 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+/*--------------------------------------------------------------
+ * GDIFF.H
+ *
+ * Constants used in processing the GDIFF format
+ *--------------------------------------------------------------*/
+
+
+#include "prio.h"
+#include "nsFileSpec.h"
+
+#define GDIFF_MAGIC         "\xD1\xFF\xD1\xFF"
+#define GDIFF_MAGIC_LEN     4
+#define GDIFF_VER           5
+#define GDIFF_EOF           "\0"
+
+#define GDIFF_VER_POS       4
+#define GDIFF_CS_POS        5
+#define GDIFF_CSLEN_POS     6
+
+#define GDIFF_HEADERSIZE    7
+#define GDIFF_APPDATALEN    4
+
+#define GDIFF_CS_NONE       0
+#define GDIFF_CS_MD5        1
+#define GDIFF_CS_SHA        2
+#define GDIFF_CS_CRC32      32
+
+#define CRC32_LEN           4
+
+/*--------------------------------------
+ *  GDIFF opcodes
+ *------------------------------------*/
+#define ENDDIFF     0
+#define ADD8MAX     246
+#define ADD16       247
+#define ADD32       248
+#define COPY16BYTE  249
+#define COPY16SHORT 250
+#define COPY16LONG  251
+#define COPY32BYTE  252
+#define COPY32SHORT 253
+#define COPY32LONG  254
+#define COPY64      255
+
+/* instruction sizes */
+#define ADD16SIZE           2
+#define ADD32SIZE           4
+#define COPY16BYTESIZE      3
+#define COPY16SHORTSIZE     4
+#define COPY16LONGSIZE      6
+#define COPY32BYTESIZE      5
+#define COPY32SHORTSIZE     6
+#define COPY32LONGSIZE      8
+#define COPY64SIZE          12
+
+
+/*--------------------------------------
+ *  error codes
+ *------------------------------------*/
+#define GDIFF_OK                0
+#define GDIFF_ERR_UNKNOWN       -1
+#define GDIFF_ERR_ARGS          -2
+#define GDIFF_ERR_ACCESS        -3
+#define GDIFF_ERR_MEM           -4
+#define GDIFF_ERR_HEADER        -5
+#define GDIFF_ERR_BADDIFF       -6
+#define GDIFF_ERR_OPCODE        -7
+#define GDIFF_ERR_OLDFILE       -8
+#define GDIFF_ERR_CHKSUMTYPE    -9
+#define GDIFF_ERR_CHECKSUM      -10
+#define GDIFF_ERR_CHECKSUM_TARGET  -11
+#define GDIFF_ERR_CHECKSUM_RESULT  -12
+
+
+/*--------------------------------------
+ *  types
+ *------------------------------------*/
+#ifndef AIX
+#ifdef OSF1
+#include <sys/types.h>
+#else
+typedef unsigned char uchar;
+#endif
+#endif
+
+typedef struct _diffdata {
+    PRFileDesc*	fSrc;
+    PRFileDesc*	fOut;
+    PRFileDesc*	fDiff;
+    uint8       checksumType;
+    uint8       checksumLength;
+    uchar*      oldChecksum;
+    uchar*      newChecksum;
+    PRBool      bMacAppleSingle;
+    PRBool      bWin32BoundImage;
+    uchar*      databuf;
+    uint32      bufsize;
+} DIFFDATA;
+
+typedef DIFFDATA* pDIFFDATA;
+
+
+/*--------------------------------------
+ *  miscellaneous
+ *------------------------------------*/
+
+#define APPFLAG_W32BOUND        "autoinstall:Win32PE"
+#define APPFLAG_APPLESINGLE     "autoinstall:AppleSingle"
+
+#ifndef TRUE
+  #define TRUE  1
+#endif
+
+#ifndef FALSE
+  #define FALSE 0
+#endif
+
+

mozilla/xpinstall/src/makefile.win

@@ -0,0 +1,106 @@
+
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is Mozilla 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.
+#
+# Contributor(s): 
+#     Daniel Veditz <dveditz@netscape.com>
+#     Douglas Turner <dougt@netscape.com>
+
+
+DEPTH=..\..
+
+include <$(DEPTH)/config/config.mak>
+
+MAKE_OBJ_TYPE = DLL
+MODULE=xpinstal
+XPIDL_MODULE=xpinstall
+
+DLL=.\$(OBJDIR)\$(MODULE).dll
+
+DEFINES=-D_IMPL_NS_DOM -DWIN32_LEAN_AND_MEAN
+
+LCFLAGS =          \
+        $(LCFLAGS) \
+        $(DEFINES) \
+        $(NULL)
+
+
+LLIBS =                                \
+        $(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         \
+        $(LIBNSPR)                     \
+        $(DIST)\lib\mozreg.lib         \
+        $(NULL)
+
+
+OBJS =                                          \
+       .\$(OBJDIR)\nsInstall.obj                \
+       .\$(OBJDIR)\nsInstallTrigger.obj         \
+       .\$(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)\nsInstallFile.obj            \
+       .\$(OBJDIR)\nsInstallDelete.obj          \
+       .\$(OBJDIR)\nsInstallExecute.obj         \
+       .\$(OBJDIR)\nsInstallPatch.obj           \
+       .\$(OBJDIR)\nsInstallUninstall.obj       \
+       .\$(OBJDIR)\nsInstallResources.obj       \
+       .\$(OBJDIR)\nsTopProgressNotifier.obj    \
+       .\$(OBJDIR)\nsLoggingProgressNotifier.obj\
+       .\$(OBJDIR)\ScheduledTasks.obj           \
+       .\$(OBJDIR)\nsWinReg.obj                 \
+       .\$(OBJDIR)\nsJSWinReg.obj               \
+       .\$(OBJDIR)\nsWinRegItem.obj             \
+       .\$(OBJDIR)\nsWinRegValue.obj            \
+       .\$(OBJDIR)\nsWinProfile.obj             \
+       .\$(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>
+
+install:: $(DLL)
+    $(MAKE_INSTALL) .\$(OBJDIR)\$(MODULE).lib $(DIST)\lib
+    $(MAKE_INSTALL) .\$(OBJDIR)\$(MODULE).dll $(DIST)\bin\components
+
+clobber::
+        $(RM) $(DIST)\lib\$(MODULE).lib
+        $(RM) $(DIST)\bin\components\$(MODULE).dll
+

mozilla/xpinstall/src/nsAppleSingleDecoder.cpp

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

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

@@ -0,0 +1,323 @@
+/* -*- 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) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+
+#ifndef __NS_INSTALL_H__
+#define __NS_INSTALL_H__
+
+#include "nscore.h"
+#include "nsISupports.h"
+
+#include "jsapi.h"
+
+#include "plevent.h"
+
+#include "nsString.h"
+#include "nsFileSpec.h"
+#include "nsVoidArray.h"
+#include "nsHashtable.h"
+#include "nsCOMPtr.h"
+
+#include "nsSoftwareUpdate.h"
+
+#include "nsInstallObject.h"
+#include "nsInstallVersion.h"
+#include "nsInstallFolder.h"
+
+#include "nsIXPINotifier.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);
+
+    virtual ~nsInstallInfo();
+
+    nsresult GetLocalFile(nsFileSpec& aSpec);
+
+    void GetURL(nsString& aURL) { aURL = mURL; }
+
+    void GetArguments(nsString& aArgs) { aArgs = mArgs; }
+    
+    long GetFlags() { return mFlags; }
+
+    nsIXPINotifier* GetNotifier() { return mNotifier; };
+    
+  private:
+    
+    nsresult  mError;
+
+    long       mFlags;
+    nsString   mURL;
+    nsString   mArgs;
+
+    nsCOMPtr<nsIFileSpec>       mFile;
+    nsCOMPtr<nsIXPINotifier>    mNotifier;
+};
+
+#ifdef XP_PC
+#define FILESEP '\\'
+#elif defined XP_MAC
+#define FILESEP ':'
+#elif defined XP_BEOS
+#define FILESEP '/'
+#else
+#define FILESEP '/'
+#endif
+
+class nsInstall
+{
+    friend class nsWinReg;
+    friend class nsWinProfile;
+
+    public:
+       
+        enum 
+        {
+            BAD_PACKAGE_NAME            = -200,
+            UNEXPECTED_ERROR            = -201,
+            ACCESS_DENIED               = -202,
+            TOO_MANY_CERTIFICATES       = -203,
+            NO_INSTALL_SCRIPT           = -204,
+            NO_CERTIFICATE              = -205,
+            NO_MATCHING_CERTIFICATE     = -206,
+            CANT_READ_ARCHIVE           = -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,
+            NETWORK_FILE_IS_IN_USE      = -217,
+            APPLE_SINGLE_ERR            = -218,
+            INVALID_PATH_ERR            = -219,
+            PATCH_BAD_DIFF              = -220,
+            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,
+            
+            SUCCESS                     = 0,
+            REBOOT_NEEDED               = 999,
+            
+            LIMITED_INSTALL             = 0,
+            FULL_INSTALL                = 1,
+            NO_STATUS_DLG               = 2,
+            NO_FINALIZE_DLG             = 4,
+
+            INSTALL_FILE_UNEXPECTED_MSG_ID = 0,
+            DETAILS_REPLACE_FILE_MSG_ID = 1,
+            DETAILS_INSTALL_FILE_MSG_ID = 2
+        };
+
+
+        nsInstall(nsIZipReader * theJARFile);
+        virtual ~nsInstall();
+        
+        PRInt32    SetScriptObject(void* aScriptObject);
+
+        PRInt32    SaveWinRegPrototype(void* aScriptObject);
+        PRInt32    SaveWinProfilePrototype(void* aScriptObject);
+        
+        JSObject*  RetrieveWinRegPrototype(void);
+        JSObject*  RetrieveWinProfilePrototype(void);
+
+        PRInt32    GetUserPackageName(nsString& aUserPackageName);
+        PRInt32    GetRegPackageName(nsString& aRegPackageName);
+
+        PRInt32    AbortInstall(PRInt32 aErrorNumber);
+        
+        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& 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& 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    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    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    ResetError();
+        PRInt32    SetPackageFolder(nsInstallFolder& 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    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       GetJarFileLocation(nsString& aFile);
+        void       SetJarFileLocation(const nsFileSpec& 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            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;        
+        nsHashtable*        mPatchList;
+        
+        nsIXPINotifier      *mNotifier;
+
+        nsCOMPtr<nsIStringBundle>   mStringBundle;
+
+        PRInt32             mLastError;
+        
+        void        ParseFlags(int flags);
+        PRInt32     SanityCheck(void);
+        void        GetTime(nsString &aString);
+
+        
+        PRInt32     GetQualifiedRegName(const nsString& name, nsString& qualifiedRegName );
+        PRInt32     GetQualifiedPackageName( const nsString& name, nsString& qualifiedName );
+        
+        void        CurrentUserNode(nsString& userRegNode);
+        PRBool      BadRegName(const nsString& regName);
+
+        void        CleanUp();
+
+        PRInt32     ExtractDirEntries(const nsString& directory, nsVoidArray *paths);
+
+        PRInt32     ScheduleForInstall(nsInstallObject* ob);
+
+        static void DeleteVector(nsVoidArray* vector);    
+};
+
+#endif

mozilla/xpinstall/src/nsInstallDelete.cpp

@@ -0,0 +1,291 @@
+/* -*- 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) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+
+#include "prmem.h"
+
+#include "nsFileSpec.h"
+
+#include "VerReg.h"
+#include "ScheduledTasks.h"
+#include "nsInstallDelete.h"
+#include "nsInstallResources.h"
+
+#include "nsInstall.h"
+#include "nsIDOMInstallVersion.h"
+
+MOZ_DECL_CTOR_COUNTER(nsInstallDelete);
+
+nsInstallDelete::nsInstallDelete( nsInstall* inInstall,
+                                  nsInstallFolder* folderSpec,
+                                  const nsString& inPartialPath,
+                                  PRInt32 *error)
+
+: nsInstallObject(inInstall)
+{
+    MOZ_COUNT_CTOR(nsInstallDelete);
+
+    if ((folderSpec == nsnull) || (inInstall == nsnull)) 
+    {
+        *error = nsInstall::INVALID_ARGUMENTS;
+        return;
+    }
+    
+    mDeleteStatus = DELETE_FILE;
+    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 += inPartialPath;
+
+    *error = ProcessInstallDelete();
+}
+
+nsInstallDelete::nsInstallDelete( nsInstall* inInstall,
+                                  const nsString& inComponentName,
+                                  PRInt32 *error)
+
+: nsInstallObject(inInstall)
+{
+    MOZ_COUNT_CTOR(nsInstallDelete);
+
+    if (inInstall == NULL) 
+    {
+        *error = nsInstall::INVALID_ARGUMENTS;
+        return;
+    }
+    
+    mDeleteStatus = DELETE_COMPONENT;
+    mFinalFile    = nsnull;
+    mRegistryName = inComponentName;
+
+    *error = ProcessInstallDelete();
+}
+
+
+nsInstallDelete::~nsInstallDelete()
+{
+    if (mFinalFile == nsnull)
+        delete mFinalFile;
+
+    MOZ_COUNT_DTOR(nsInstallDelete);
+}
+
+
+PRInt32 nsInstallDelete::Prepare()
+{
+    // no set-up necessary
+    return nsInstall::SUCCESS;
+}
+
+PRInt32 nsInstallDelete::Complete()
+{
+    PRInt32 err = nsInstall::SUCCESS;
+
+    if (mInstall == NULL) 
+       return nsInstall::INVALID_ARGUMENTS;
+
+    if (mDeleteStatus == DELETE_COMPONENT) 
+    {
+        char* temp = mRegistryName.ToNewCString();
+        if (temp)
+        {
+            err = VR_Remove(temp);
+            Recycle(temp);
+        }
+    }
+
+    if ((mDeleteStatus == DELETE_FILE) || (err == REGERR_OK)) 
+    {
+        err = NativeComplete();
+    }	
+    else 
+    {
+        err = nsInstall::UNEXPECTED_ERROR;
+    }
+
+    
+    return err;
+}
+
+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);
+    }
+    else
+    {
+        if (mFinalFile)
+        {
+            rsrcVal = mInstall->GetResourcedString("DeleteComponent");
+
+            if (rsrcVal)
+            {
+                sprintf( buffer, rsrcVal, mFinalFile->GetCString());
+                nsCRT::free(rsrcVal);
+            }
+        }
+    }
+
+    return buffer;
+}
+
+
+PRBool
+nsInstallDelete::CanUninstall()
+{
+    return PR_FALSE;
+}
+
+PRBool
+nsInstallDelete::RegisterPackageNode()
+{
+    return PR_FALSE;
+}
+
+
+PRInt32 nsInstallDelete::ProcessInstallDelete()
+{
+    PRInt32 err;
+    
+    char* tempCString = nsnull;
+
+    if (mDeleteStatus == DELETE_COMPONENT) 
+    {
+        /* Check if the component is in the registry */
+        tempCString = mRegistryName.ToNewCString();
+        
+        if (tempCString == nsnull)
+                return nsInstall::OUT_OF_MEMORY;
+
+        err = VR_InRegistry( tempCString );
+                
+        if (err != REGERR_OK) 
+        {
+            return err;
+        } 
+        else 
+        {
+            char* tempRegistryString;
+
+            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)
+            {
+                if (mFinalFile)
+                    delete mFinalFile;
+
+                mFinalFile = new nsFileSpec(tempRegistryString);
+                
+                if (mFinalFile == nsnull)
+                    return nsInstall::OUT_OF_MEMORY;
+                
+            }
+
+            PR_FREEIF(tempRegistryString);
+        }
+    }
+    
+    if(tempCString)
+        Recycle(tempCString);
+
+    if (mFinalFile->Exists())
+    {
+        if (mFinalFile->IsFile())
+        {
+            err = nsInstall::SUCCESS;
+        }
+        else
+        {
+            err = nsInstall::IS_DIRECTORY;
+        }
+    }
+    else
+    {
+        err = nsInstall::DOES_NOT_EXIST;
+    }
+
+    return err;
+}
+
+
+
+PRInt32 nsInstallDelete::NativeComplete()
+{
+    NS_WARN_IF_FALSE(mFinalFile->Exists(),"nsInstallDelete::Complete -- file should exist!");
+    if (mFinalFile->Exists())
+    {
+        if (mFinalFile->IsFile())
+        {
+           return DeleteFileNowOrSchedule(*mFinalFile);
+        }
+        else
+        {
+            NS_ASSERTION(0,"nsInstallDelete::Complete -- expected file was a directory!");
+            return nsInstall::IS_DIRECTORY;
+        }
+    }
+    
+    return nsInstall::DOES_NOT_EXIST;
+}
+

mozilla/xpinstall/src/nsInstallDelete.h

@@ -0,0 +1,78 @@
+/* -*- 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) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+
+#ifndef nsInstallDelete_h__
+#define nsInstallDelete_h__
+
+#include "prtypes.h"
+#include "nsString.h"
+
+#include "nsInstallObject.h"
+
+#include "nsInstall.h"
+
+#define DELETE_COMPONENT 1
+#define DELETE_FILE      2
+
+class nsInstallDelete : public nsInstallObject 
+{
+    public:
+
+        nsInstallDelete(  nsInstall* inInstall,
+                          nsInstallFolder* folderSpec,
+                          const nsString& inPartialPath,
+                          PRInt32 *error);
+
+        nsInstallDelete(  nsInstall* inInstall,
+                          const nsString& ,
+                          PRInt32 *error);
+
+        virtual ~nsInstallDelete();
+
+        PRInt32 Prepare();
+        PRInt32 Complete();
+        void    Abort();
+        char*   toString();
+
+        PRBool CanUninstall();
+        PRBool RegisterPackageNode();
+	    
+  
+    private:
+
+        /* Private Fields */
+
+        nsFileSpec* mFinalFile;
+        
+        nsString    mRegistryName;
+        PRInt32     mDeleteStatus;
+
+        PRInt32 ProcessInstallDelete();
+        PRInt32 NativeComplete();
+        
+};
+
+#endif /* nsInstallDelete_h__ */

mozilla/xpinstall/src/nsInstallExecute.cpp

@@ -0,0 +1,159 @@
+/* -*- 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) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+
+
+#include "prmem.h"
+
+#include "nsFileSpec.h"
+
+#include "VerReg.h"
+#include "nsInstallExecute.h"
+#include "nsInstallResources.h"
+#include "ScheduledTasks.h"
+
+#include "nsInstall.h"
+#include "nsIDOMInstallVersion.h"
+
+MOZ_DECL_CTOR_COUNTER(nsInstallExecute);
+
+nsInstallExecute:: nsInstallExecute(  nsInstall* inInstall,
+                                      const nsString& inJarLocation,
+                                      const nsString& inArgs,
+                                      PRInt32 *error)
+
+: nsInstallObject(inInstall)
+{
+    MOZ_COUNT_CTOR(nsInstallExecute);
+
+    if ((inInstall == nsnull) || (inJarLocation.Equals("")) )
+    {
+        *error = nsInstall::INVALID_ARGUMENTS;
+        return;
+    }
+
+    mJarLocation        = inJarLocation;
+    mArgs               = inArgs;
+    mExecutableFile     = nsnull;
+
+}
+
+
+nsInstallExecute::~nsInstallExecute()
+{
+    if (mExecutableFile)
+        delete mExecutableFile;
+
+    MOZ_COUNT_DTOR(nsInstallExecute);
+}
+
+
+
+PRInt32 nsInstallExecute::Prepare()
+{
+    if (mInstall == NULL || mJarLocation.Equals("")) 
+        return nsInstall::INVALID_ARGUMENTS;
+
+    return mInstall->ExtractFileFromJar(mJarLocation, nsnull, &mExecutableFile);
+}
+
+PRInt32 nsInstallExecute::Complete()
+{
+    if (mExecutableFile == nsnull)
+        return nsInstall::INVALID_ARGUMENTS;
+
+    nsFileSpec app( *mExecutableFile);
+    
+    if (!app.Exists())
+	{
+		return nsInstall::INVALID_ARGUMENTS;
+	}
+
+    PRInt32 result = app.Execute( mArgs );
+    
+    DeleteFileNowOrSchedule( app );
+    
+    return result;
+}
+
+void nsInstallExecute::Abort()
+{
+    /* Get the names */
+    if (mExecutableFile == nsnull) 
+        return;
+
+    DeleteFileNowOrSchedule(*mExecutableFile);
+}
+
+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);
+    }
+    else
+    {
+        rsrcVal = mInstall->GetResourcedString("Execute");
+
+        if (rsrcVal)
+        {
+            sprintf( buffer, rsrcVal, mExecutableFile->GetCString());
+            nsCRT::free(rsrcVal);
+        }
+    }
+    return buffer;
+}
+
+
+PRBool
+nsInstallExecute::CanUninstall()
+{
+    return PR_FALSE;
+}
+
+PRBool
+nsInstallExecute::RegisterPackageNode()
+{
+    return PR_FALSE;
+}
+

mozilla/xpinstall/src/nsInstallExecute.h

@@ -0,0 +1,73 @@
+/* -*- 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) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+
+#ifndef nsInstallExecute_h__
+#define nsInstallExecute_h__
+
+#include "prtypes.h"
+#include "nsString.h"
+
+#include "nsInstallObject.h"
+
+#include "nsInstall.h"
+#include "nsIDOMInstallVersion.h"
+
+
+class nsInstallExecute : public nsInstallObject 
+{
+    public:
+          
+        nsInstallExecute( nsInstall* inInstall,
+                          const nsString& inJarLocation,
+                          const nsString& inArgs,
+                          PRInt32 *error);
+
+
+        virtual ~nsInstallExecute();
+
+        PRInt32 Prepare();
+        PRInt32 Complete();
+        void  Abort();
+        char* toString();
+
+        PRBool CanUninstall();
+        PRBool RegisterPackageNode();
+	  
+  
+    private:
+          
+        nsString mJarLocation; // Location in the JAR
+        nsString mArgs;        // command line arguments
+        
+        nsFileSpec *mExecutableFile;    // temporary file location
+        
+
+        PRInt32 NativeComplete(void);
+        void NativeAbort(void);
+
+};
+
+#endif /* nsInstallExecute_h__ */

mozilla/xpinstall/src/nsInstallFile.cpp

@@ -0,0 +1,452 @@
+/* -*- 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) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+#include "prprf.h"
+#include "nsInstallFile.h"
+#include "nsFileSpec.h"
+#include "VerReg.h"
+#include "ScheduledTasks.h"
+#include "nsInstall.h"
+#include "nsIDOMInstallVersion.h"
+#include "nsInstallResources.h"
+
+/* Public Methods */
+
+/*	Constructor
+        inInstall    - softUpdate object we belong to
+        inComponentName	- full path of the registry component
+        inVInfo	        - full version info
+        inJarLocation   - location inside the JAR file
+        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& inPartialPath,
+                             PRInt32 mode,
+                             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)
+{
+    MOZ_COUNT_CTOR(nsInstallFile);
+
+    if ((folderSpec == nsnull) || (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
+
+    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 ) ) 
+    {
+        nsInstallVersion *newVersion = new nsInstallVersion();
+        
+        if (newVersion == nsnull)
+        {
+            Recycle(qualifiedRegNameString);
+            *error = nsInstall::OUT_OF_MEMORY;
+            return;
+        }
+
+        newVersion->Init(inVInfo);
+        
+        VERSION versionStruct;
+        
+        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,
+                         versionStruct.release,
+                         versionStruct.build);
+
+        PRInt32 areTheyEqual;
+        newVersion->CompareTo(oldVersion, &areTheyEqual);
+        
+        delete oldVersion;
+        delete newVersion;
+
+        if ( areTheyEqual < 0 )
+        {
+            // 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;
+            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);
+    }
+
+    *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);
+    }
+
+    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() ) 
+    {
+        // in the "current communicator package" absolute pathnames (start
+        // with slash) indicate shared files -- all others are children
+        mChildFile = ( mVersionRegistryName->CharAt(0) != '/' );
+    } 
+    else 
+    {
+        mChildFile = mVersionRegistryName->Equals( regPackageName,
+                                                   PR_FALSE,
+                                                   regPackageName.Length() );
+    }
+}
+
+
+nsInstallFile::~nsInstallFile()
+{
+    if (mVersionRegistryName)
+        delete mVersionRegistryName;
+  
+    if (mJarLocation)
+        delete mJarLocation;
+  
+    if (mExtractedFile)
+        delete mExtractedFile;
+
+    if (mFinalFile)
+        delete mFinalFile;
+  
+    if (mVersionInfo)
+      delete mVersionInfo;
+
+    MOZ_COUNT_DTOR(nsInstallFile);
+}
+
+/* Prepare
+ * Extracts file out of the JAR archive
+ */
+PRInt32 nsInstallFile::Prepare()
+{
+    if (mSkipInstall)
+        return nsInstall::SUCCESS;
+
+    if (mInstall == nsnull || mFinalFile == nsnull || mJarLocation == nsnull )
+        return nsInstall::INVALID_ARGUMENTS;
+
+    return mInstall->ExtractFileFromJar(*mJarLocation, mFinalFile, &mExtractedFile);
+}
+
+/* Complete
+ * Completes the install:
+ * - move the downloaded file to the final location
+ * - updates the registry
+ */
+PRInt32 nsInstallFile::Complete()
+{
+    PRInt32 err;
+
+    if (mInstall == nsnull || mVersionRegistryName == nsnull || mFinalFile == nsnull ) 
+    {
+       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();
+    }
+    
+    return err;
+
+}
+
+void nsInstallFile::Abort()
+{
+    if (mExtractedFile != nsnull)
+        mExtractedFile->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';
+    
+    if (mReplaceFile)
+    {
+        rsrcVal = mInstall->GetResourcedString("ReplaceFile");
+    }
+    else if (mSkipInstall)
+    {
+        rsrcVal = mInstall->GetResourcedString("SkipFile");
+    }
+    else
+    {
+        rsrcVal = mInstall->GetResourcedString("InstallFile");
+    }
+
+    if (rsrcVal)
+    {
+        if (mFinalFile)
+            fname = mFinalFile->GetCString();
+
+        PR_snprintf( buffer, RESBUFSIZE, rsrcVal, fname );
+
+        Recycle(rsrcVal);
+    }
+
+    return buffer;
+}
+
+
+PRInt32 nsInstallFile::CompleteFileMove()
+{
+    int result = 0;
+    
+    if (mExtractedFile == nsnull) 
+    {
+        return nsInstall::UNEXPECTED_ERROR;
+    }
+   	
+    if ( *mExtractedFile == *mFinalFile ) 
+    {
+        /* No need to rename, they are the same */
+        result = nsInstall::SUCCESS;
+    } 
+    else 
+    {
+        result = ReplaceFileNowOrSchedule(*mExtractedFile, *mFinalFile );
+    }
+
+  return result;  
+}
+
+PRInt32
+nsInstallFile::RegisterInVersionRegistry()
+{
+    int refCount;
+    nsString regPackageName;
+    mInstall->GetRegPackageName(regPackageName);
+    
+  
+    // Register file and log for Uninstall
+  
+    if (!mChildFile) 
+    {
+        int found;
+        if (!regPackageName.IsEmpty()) 
+        {
+            found = VR_UninstallFileExistsInList( (char*)(const char*)nsAutoCString(regPackageName) , 
+                                                  (char*)(const char*)nsAutoCString(*mVersionRegistryName));
+        } 
+        else 
+        {
+            found = VR_UninstallFileExistsInList( "", (char*)(const char*)nsAutoCString(*mVersionRegistryName) );
+        }
+        
+        if (found != REGERR_OK)
+            mUpgradeFile = PR_FALSE;
+        else
+            mUpgradeFile = PR_TRUE;
+    } 
+    else if (REGERR_OK == VR_InRegistry( (char*)(const char*)nsAutoCString(*mVersionRegistryName))) 
+    {
+        mUpgradeFile = PR_TRUE;
+    } 
+    else 
+    {
+        mUpgradeFile = PR_FALSE;
+    }
+
+    if ( REGERR_OK != VR_GetRefCount( (char*)(const char*)nsAutoCString(*mVersionRegistryName), &refCount )) 
+    {
+        refCount = 0;
+    }
+
+    VR_Install( (char*)(const char*)nsAutoCString(*mVersionRegistryName), 
+                (char*)(const char*)mFinalFile->GetNativePathCString(),  // DO NOT CHANGE THIS. 
+                (char*)(const char*)nsAutoCString(*mVersionInfo), 
+                PR_FALSE );
+
+    if (mUpgradeFile) 
+    {
+        if (refCount == 0) 
+            VR_SetRefCount( (char*)(const char*)nsAutoCString(*mVersionRegistryName), 1 );
+        else 
+            VR_SetRefCount( (char*)(const char*)nsAutoCString(*mVersionRegistryName), refCount );  //FIX?? what should the ref count be/
+    }
+    else
+    {
+        if (refCount != 0) 
+        {
+            VR_SetRefCount( (char*)(const char*)nsAutoCString(*mVersionRegistryName), refCount + 1 );
+        } 
+        else 
+        {
+            if (mReplaceFile)
+                VR_SetRefCount( (char*)(const char*)nsAutoCString(*mVersionRegistryName), 2 );
+            else
+                VR_SetRefCount( (char*)(const char*)nsAutoCString(*mVersionRegistryName), 1 );
+        }
+    }
+    
+    if ( !mChildFile && !mUpgradeFile ) 
+    {
+        if (!regPackageName.IsEmpty()) 
+        { 
+            VR_UninstallAddFileToList( (char*)(const char*)nsAutoCString(regPackageName), 
+                                       (char*)(const char*)nsAutoCString(*mVersionRegistryName));
+        } 
+        else 
+        {
+            VR_UninstallAddFileToList( "", (char*)(const char*)nsAutoCString(*mVersionRegistryName) );
+        }
+    }
+
+    return nsInstall::SUCCESS;
+}
+
+/* CanUninstall
+* InstallFile() installs files which can be uninstalled,
+* hence this function returns true. 
+*/
+PRBool
+nsInstallFile::CanUninstall()
+{
+    return PR_TRUE;
+}
+
+/* RegisterPackageNode
+* InstallFile() installs files which need to be registered,
+* hence this function returns true.
+*/
+PRBool
+nsInstallFile::RegisterPackageNode()
+{
+    return PR_TRUE;
+}

mozilla/xpinstall/src/nsInstallFile.h

@@ -0,0 +1,105 @@
+/* -*- 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) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+
+#ifndef nsInstallFile_h__
+#define nsInstallFile_h__
+
+#include "prtypes.h"
+#include "nsString.h"
+
+#include "nsInstallObject.h"
+
+#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:
+
+      /*************************************************************
+       * Public Methods 
+       *
+       *	Constructor
+       *    inSoftUpdate    - softUpdate object we belong to
+       *    inComponentName	- full path of the registry component
+       *    inVInfo	        - full version info
+       *    inJarLocation   - location inside the JAR file
+       *    inFinalFileSpec	- final	location on	disk
+       *************************************************************/
+        nsInstallFile(  nsInstall* inInstall,
+                        const nsString& inVRName,
+                        const nsString& inVInfo,
+                        const nsString& inJarLocation,
+                        nsInstallFolder *folderSpec,
+                        const nsString& inPartialPath,
+                        PRInt32 mode,
+                        PRInt32 *error);
+
+        virtual ~nsInstallFile();
+
+        PRInt32 Prepare();
+        PRInt32 Complete();
+        void  Abort();
+        char* toString();
+
+        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*   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

@@ -0,0 +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/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" 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 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
+
+} nsInstallFileOpEnums;
+
+#endif /* nsInstallFileOpEnums_h__ */

mozilla/xpinstall/src/nsInstallFileOpItem.h

@@ -0,0 +1,156 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsInstallFileOpItem_h__
+#define nsInstallFileOpItem_h__
+
+#include "prtypes.h"
+
+#include "nsFileSpec.h"
+#include "nsSoftwareUpdate.h"
+#include "nsInstallObject.h"
+#include "nsInstall.h"
+
+class nsInstallFileOpItem : public nsInstallObject
+{
+  public:
+    /* Public Fields */
+    enum 
+    {
+      ACTION_NONE                 = -401,
+      ACTION_SUCCESS              = -402,
+      ACTION_FAILED               = -403
+    };
+
+
+    /* Public Methods */
+    // used by:
+    //   FileOpFileDelete()
+    nsInstallFileOpItem(nsInstall*    installObj,
+                        PRInt32       aCommand,
+                        nsFileSpec&   aTarget,
+                        PRInt32       aFlags,
+                        PRInt32*      aReturn);
+
+    // used by:
+    //   FileOpDirRemove()
+    //   FileOpFileCopy()
+    //   FileOpFileMove()
+    //   FileMacAlias()
+    nsInstallFileOpItem(nsInstall*    installObj,
+                        PRInt32       aCommand,
+                        nsFileSpec&   aSrc,
+                        nsFileSpec&   aTarget,
+                        PRInt32*      aReturn);
+
+    // used by:
+    //   FileOpDirCreate()
+    nsInstallFileOpItem(nsInstall*    aInstallObj,
+                        PRInt32       aCommand,
+                        nsFileSpec&   aTarget,
+                        PRInt32*      aReturn);
+
+    // used by:
+    //   FileOpDirRename()
+    //   FileOpFileExecute()
+    //   FileOpFileRename()
+    nsInstallFileOpItem(nsInstall*    aInstallObj,
+                        PRInt32       aCommand,
+                        nsFileSpec&   a1,
+                        nsString&     a2,
+                        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();
+
+    PRInt32       Prepare(void);
+    PRInt32       Complete();
+    char*         toString();
+    void          Abort();
+    
+  /* should these be protected? */
+    PRBool        CanUninstall();
+    PRBool        RegisterPackageNode();
+      
+  private:
+    
+    /* Private Fields */
+    
+    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();
+
+};
+
+#endif /* nsInstallFileOpItem_h__ */
+

mozilla/xpinstall/src/nsInstallFolder.cpp

@@ -0,0 +1,467 @@
+/* -*- 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) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+#include "nsInstall.h"
+#include "nsInstallFolder.h"
+
+#include "nscore.h"
+#include "prtypes.h"
+#include "nsRepository.h"
+
+#include "nsString.h"
+#include "nsFileSpec.h"
+#include "nsIFileSpec.h"
+#include "nsSpecialSystemDirectory.h"
+
+#include "nsFileLocations.h"
+#include "nsIFileLocator.h"
+
+struct DirectoryTable
+{
+	char *  directoryName;			/* The formal directory name */
+	PRInt32 folderEnum;		        /* Directory ID */
+};
+
+struct DirectoryTable DirectoryTable[] = 
+{
+    {"Plugins",             100 },
+	{"Program",             101 },
+	{"Communicator",        102 },
+	{"User Pick",           103 },
+	{"Temporary",           104 },
+	{"Installed",           105 },
+	{"Current User",        106 },
+	{"Preferences",         107 },
+	{"OS Drive",            108 },
+	{"file:///",            109 },
+
+    {"Components",          110 },
+    {"Chrome",              111 },
+
+	{"Win System",          200 },
+	{"Windows",             201 },
+
+	{"Mac System",          300 },
+	{"Mac Desktop",         301 },
+	{"Mac Trash",           302 },
+	{"Mac Startup",         303 },
+	{"Mac Shutdown",        304 },
+	{"Mac Apple Menu",      305 },
+	{"Mac Control Panel",   306 },
+	{"Mac Extension",       307 },
+	{"Mac Fonts",           308 },
+	{"Mac Preferences",     309 },
+    {"Mac Documents",       310 },
+
+	{"Unix Local",          400 },
+	{"Unix Lib",            401 },
+
+	{"",                    -1  }
+};
+
+
+MOZ_DECL_CTOR_COUNTER(nsInstallFolder);
+
+nsInstallFolder::nsInstallFolder(const nsString& aFolderID)
+{
+    nsInstallFolder( 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.  
+    */
+
+    SetDirectoryPath( aFolderID, aRelativePath );
+
+    // check to see if that worked
+    if ( !mFileSpec )
+    {
+        // 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 );
+
+            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);
+        }
+    }
+}
+
+
+nsInstallFolder::nsInstallFolder(nsInstallFolder& inFolder, const nsString& subString)
+{
+    MOZ_COUNT_CTOR(nsInstallFolder);
+
+    mFileSpec = new nsFileSpec();
+    if (mFileSpec != nsnull)
+    {
+        *mFileSpec = *inFolder.mFileSpec;
+
+        if (!subString.IsEmpty())
+            *mFileSpec += subString;
+    }
+}
+
+
+nsInstallFolder::~nsInstallFolder()
+{
+    if (mFileSpec != nsnull)
+        delete mFileSpec;
+
+    MOZ_COUNT_DTOR(nsInstallFolder);
+}
+
+void 
+nsInstallFolder::GetDirectoryPath(nsString& aDirectoryPath)
+{
+	aDirectoryPath = "";
+    
+    if (mFileSpec != nsnull)
+    {
+        // We want the a NATIVE path.
+       aDirectoryPath.Assign(mFileSpec->GetCString());
+
+       if (mFileSpec->IsDirectory())
+       {
+          if (aDirectoryPath.Last() != FILESEP)
+              aDirectoryPath.Append(FILESEP);
+       }
+    }
+}
+
+void
+nsInstallFolder::SetDirectoryPath(const nsString& aFolderID, const nsString& aRelativePath)
+{
+    if ( aFolderID.EqualsIgnoreCase("User Pick") )
+    {
+        PickDefaultDirectory();
+        return;
+    }
+    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;
+                }
+                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;
+                }
+                break;
+            
+            case 103: ///////////////////////////////////////////////////////////  User Pick
+                // we should never be here.
+                mFileSpec = nsnull;
+                break;
+
+            case 104: ///////////////////////////////////////////////////////////  Temporary
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::OS_TemporaryDirectory ));
+                break;
+
+            case 105: ///////////////////////////////////////////////////////////  Installed
+                // we should never be here.
+                mFileSpec = nsnull;
+                break;
+
+            case 106: ///////////////////////////////////////////////////////////  Current User
+                SetAppShellDirectory(nsSpecialFileSpec::App_UserProfileDirectory50 );
+                break;
+
+            case 107: ///////////////////////////////////////////////////////////  Preferences
+                SetAppShellDirectory(nsSpecialFileSpec::App_PrefsDirectory50 );
+                break;
+
+            case 108: ///////////////////////////////////////////////////////////  OS Drive
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::OS_DriveDirectory ));
+                break;
+
+            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
+                    }
+                }
+                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
+                    }
+                }
+                break;
+
+            case 200: ///////////////////////////////////////////////////////////  Win System
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Win_SystemDirectory ));
+                break;
+
+            case 201: ///////////////////////////////////////////////////////////  Windows
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Win_WindowsDirectory ));
+                break;
+
+            case 300: ///////////////////////////////////////////////////////////  Mac System
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_SystemDirectory ));
+                break;
+
+            case 301: ///////////////////////////////////////////////////////////  Mac Desktop
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_DesktopDirectory ));
+                break;
+
+            case 302: ///////////////////////////////////////////////////////////  Mac Trash
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_TrashDirectory ));
+                break;
+
+            case 303: ///////////////////////////////////////////////////////////  Mac Startup
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_StartupDirectory ));
+                break;
+
+            case 304: ///////////////////////////////////////////////////////////  Mac Shutdown
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_ShutdownDirectory ));
+                break;
+
+            case 305: ///////////////////////////////////////////////////////////  Mac Apple Menu
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_AppleMenuDirectory ));
+                break;
+
+            case 306: ///////////////////////////////////////////////////////////  Mac Control Panel
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_ControlPanelDirectory ));
+                break;
+
+            case 307: ///////////////////////////////////////////////////////////  Mac Extension
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_ExtensionDirectory ));
+                break;
+
+            case 308: ///////////////////////////////////////////////////////////  Mac Fonts
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_FontsDirectory ));
+                break;
+
+            case 309: ///////////////////////////////////////////////////////////  Mac Preferences
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_PreferencesDirectory ));
+                break;
+                    
+            case 310: ///////////////////////////////////////////////////////////  Mac Documents
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Mac_DocumentsDirectory ));
+                break;
+                    
+            case 400: ///////////////////////////////////////////////////////////  Unix Local
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Unix_LocalDirectory ));
+                break;
+
+            case 401: ///////////////////////////////////////////////////////////  Unix Lib
+                mFileSpec = new nsFileSpec( nsSpecialSystemDirectory( nsSpecialSystemDirectory::Unix_LibDirectory ));
+                break;
+
+
+            case -1:
+		    default:
+                mFileSpec = nsnull;
+			   return;
+		}
+
+        if (aRelativePath.Length() > 0 && mFileSpec)
+        {
+            nsString tempPath(aRelativePath);
+
+            if (aRelativePath.Last() != '/' || aRelativePath.Last() != '\\')
+                tempPath += '/';
+
+            *mFileSpec += tempPath;
+        }
+    }
+}
+
+void nsInstallFolder::PickDefaultDirectory()
+{
+    //FIX:  Need to put up a dialog here and set mFileSpec
+    return;   
+}
+
+/* MapNameToEnum
+ * maps name from the directory table to its enum */
+PRInt32 
+nsInstallFolder::MapNameToEnum(const nsString& name)
+{
+	int i = 0;
+
+	if ( name.Equals(""))
+        return -1;
+
+	while ( DirectoryTable[i].directoryName[0] != 0 )
+	{
+		if ( name.EqualsIgnoreCase(DirectoryTable[i].directoryName) )
+			return DirectoryTable[i].folderEnum;
+		i++;
+	}
+	return -1;
+}
+
+void
+nsInstallFolder::SetAppShellDirectory(PRUint32 value)
+{
+    nsIFileSpec* fs = NS_LocateFileOrDirectory(value);
+    if ( fs )
+    {
+        mFileSpec = new nsFileSpec();
+        fs->GetFileSpec(mFileSpec);
+	    NS_RELEASE(fs);
+    }
+}
+
+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

@@ -0,0 +1,61 @@
+/* -*- 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) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+
+#ifndef __NS_INSTALLFOLDER_H__
+#define __NS_INSTALLFOLDER_H__
+
+#include "nscore.h"
+#include "prtypes.h"
+
+#include "nsString.h"
+#include "nsFileSpec.h"
+#include "nsSpecialSystemDirectory.h"
+
+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         PickDefaultDirectory();
+        PRInt32      MapNameToEnum(const nsString&  name);
+        void         SetAppShellDirectory(PRUint32 value);
+};
+
+
+#endif

mozilla/xpinstall/src/nsInstallObject.h

@@ -0,0 +1,57 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsInstallObject_h__
+#define nsInstallObject_h__
+
+#include "prtypes.h"
+
+class nsInstall;
+
+class nsInstallObject 
+{
+    public:
+        /* Public Methods */
+        nsInstallObject(nsInstall* inInstall) {mInstall = inInstall; }
+        virtual ~nsInstallObject() {}
+
+        /* Override with your set-up action */
+        virtual PRInt32 Prepare() = 0;
+
+        /* Override with your Completion action */
+        virtual PRInt32 Complete() = 0;
+
+        /* Override with an explanatory string for the progress dialog */
+        virtual char* toString() = 0;
+
+        /* Override with your clean-up function */
+        virtual void Abort() = 0;
+
+        /* should these be protected? */
+        virtual PRBool CanUninstall() = 0;
+        virtual PRBool RegisterPackageNode() = 0;
+
+    protected:
+        nsInstall* mInstall;
+};
+
+#endif /* nsInstallObject_h__ */

mozilla/xpinstall/src/nsInstallPatch.h

@@ -0,0 +1,83 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#ifndef nsInstallPatch_h__
+#define nsInstallPatch_h__
+
+#include "prtypes.h"
+#include "nsString.h"
+
+#include "nsInstallObject.h"
+
+#include "nsInstall.h"
+#include "nsInstallFolder.h"
+#include "nsInstallVersion.h"
+
+
+class nsInstallPatch : public nsInstallObject 
+{
+    public:
+
+        nsInstallPatch( nsInstall* inInstall,
+                        const nsString& inVRName,
+                        const nsString& inVInfo,
+                        const nsString& inJarLocation,
+                        nsInstallFolder* folderSpec,
+                        const nsString& inPartialPath,
+                        PRInt32 *error);
+
+        nsInstallPatch( nsInstall* inInstall,
+                        const nsString& inVRName,
+                        const nsString& inVInfo,
+                        const nsString& inJarLocation,
+                        PRInt32 *error);
+
+        virtual ~nsInstallPatch();
+
+        PRInt32 Prepare();
+        PRInt32 Complete();
+        void  Abort();
+        char* toString();
+
+        PRBool CanUninstall();
+        PRBool RegisterPackageNode();
+	  
+  
+    private:
+        
+        
+        nsInstallVersion        *mVersionInfo;
+        
+        nsFileSpec              *mTargetFile;
+        nsFileSpec              *mPatchFile;
+        nsFileSpec              *mPatchedFile;
+
+        nsString                *mJarLocation;
+        nsString                *mRegistryName;
+        
+       
+
+        PRInt32  NativePatch(const nsFileSpec &sourceFile, const nsFileSpec &patchfile, nsFileSpec **newFile);
+        void*    HashFilePath(const nsFilePath& aPath);
+};
+
+#endif /* nsInstallPatch_h__ */

mozilla/xpinstall/src/nsInstallProgressDialog.cpp

@@ -0,0 +1,364 @@
+/* -*- 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) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ *     Douglas Turner <dougt@netscape.com>
+ *     Pierre Phaneuf <pp@ludusdesign.com>
+ */
+
+
+#include "nsIXPINotifier.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 "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_CID(kDialogParamBlockCID, NS_DialogParamBlock_CID);
+
+nsInstallProgressDialog::nsInstallProgressDialog(nsPIXPIManagerCallbacks *aManager)
+  : mManager(aManager)
+{
+    NS_INIT_ISUPPORTS();
+}
+
+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(NS_GET_IID(nsIXPINotifier))) {
+    *aInstancePtr = (void*) ((nsIXPINotifier*)this);
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+  if (aIID.Equals(NS_GET_IID(nsIXPIProgressDlg))) {
+    *aInstancePtr = (void*) ((nsIXPIProgressDlg*)this);
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+  if (aIID.Equals(kISupportsIID)) {
+    *aInstancePtr = (void*) (nsISupports*)((nsIXPINotifier*)this);
+    NS_ADDREF_THIS();
+    return NS_OK;
+  }
+
+  return NS_ERROR_NO_INTERFACE;
+}
+
+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)
+{
+    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 );
+    if ( NS_SUCCEEDED( rv ) ) 
+    {
+        nsCOMPtr<nsIDOMWindow> hiddenWindow;
+        JSContext* jsContext;
+        rv = appShell->GetHiddenWindowAndJSContext( getter_AddRefs(hiddenWindow), &jsContext);
+        if (NS_SUCCEEDED(rv))
+        {
+            nsCOMPtr<nsPIXPIManagerCallbacks> mgr = do_QueryInterface(mManager);
+
+            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 = hiddenWindow->OpenDialog( jsContext,
+                                               argv,
+                                               5,
+                                               getter_AddRefs( mWindow ));
+            }
+
+            JS_PopArguments( jsContext, stackPtr);  
+        }
+        
+    }
+    return rv;
+}
+
+
+NS_IMETHODIMP
+nsInstallProgressDialog::Close()
+{
+    mWindow->Close();
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsInstallProgressDialog::SetTitle(const PRUnichar * aTitle)
+{
+    return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+NS_IMETHODIMP
+nsInstallProgressDialog::SetHeading(const PRUnichar * aHeading)
+{
+    return setDlgAttribute( "dialog.uiPackageName", "value", nsString(aHeading) );
+}
+
+NS_IMETHODIMP
+nsInstallProgressDialog::SetActionText(const PRUnichar * aActionText)
+{
+    const PRInt32 maxChars = 50;
+
+    nsString theMessage(aActionText);
+    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);
+    }
+
+    return setDlgAttribute( "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;
+    return NS_OK;
+}
+
+// Utility to set element attribute.
+nsresult nsInstallProgressDialog::setDlgAttribute( const char *id,
+                                                   const char *name,
+                                                   const nsString &value )
+{
+    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");
+    }
+
+    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 );
+            }
+        } 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.
+nsresult nsInstallProgressDialog::getDlgAttribute(  const char *id,
+                                                    const char *name,
+                                                    nsString &value ) 
+{
+    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");
+    }
+
+    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;
+    }
+
+    return rv;
+}

mozilla/xpinstall/src/nsInstallProgressDialog.h

@@ -0,0 +1,72 @@
+/* -*- 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) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ *     Douglas Turner <dougt@netscape.com>
+ */
+#ifndef __nsInstallProgressDialog_h__
+#define __nsInstallProgressDialog_h__
+
+#include "nscore.h"
+#include "nsIXPINotifier.h"
+#include "nsIXPIProgressDlg.h"
+#include "nsISupports.h"
+#include "nsISupportsUtils.h"
+
+#include "nsCOMPtr.h"
+
+#include "nsIWebShell.h"
+#include "nsIWebShellWindow.h"
+#include "nsPIXPIManagerCallbacks.h"    
+
+#include "nsIDocument.h"
+#include "nsIDOMWindow.h"
+#include "nsIDOMDocument.h"
+#include "nsIDOMXULDocument.h"
+
+
+class nsInstallProgressDialog : public nsIXPINotifier,
+                                public nsIXPIProgressDlg
+{
+    public: 
+
+        nsInstallProgressDialog(nsPIXPIManagerCallbacks *aManager);
+        virtual ~nsInstallProgressDialog();
+        
+        NS_DECL_ISUPPORTS
+
+        // implement nsIXPINotifier
+        NS_DECL_NSIXPINOTIFIER
+
+        // 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);
+
+    private:
+        nsPIXPIManagerCallbacks*       mManager;
+        nsCOMPtr<nsIDOMXULDocument>    mDocument;   // Should this be a weak reference?
+        nsCOMPtr<nsIDOMWindow>         mWindow;     // Should this be a weak reference?
+};
+#endif

mozilla/xpinstall/src/nsInstallResources.cpp

@@ -0,0 +1,83 @@
+ /* -*- 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) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ *     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;
+}
+

mozilla/xpinstall/src/nsInstallResources.h

@@ -0,0 +1,48 @@
+/* -*- 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) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ *     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);
+};
+
+
+#endif

mozilla/xpinstall/src/nsInstallTrigger.cpp

@@ -0,0 +1,489 @@
+/* -*- 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.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#include "nsSoftwareUpdate.h"
+#include "nsXPInstallManager.h"
+#include "nsInstallTrigger.h"
+#include "nsInstallVersion.h"
+#include "nsIDOMInstallTriggerGlobal.h"
+
+#include "nscore.h"
+#include "nsIFactory.h"
+#include "nsISupports.h"
+#include "nsIScriptGlobalObject.h"
+
+#include "nsIPref.h"
+
+#include "nsRepository.h"
+#include "nsIServiceManager.h"
+
+#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);
+
+static NS_DEFINE_IID(kIInstallTrigger_IID, NS_IDOMINSTALLTRIGGERGLOBAL_IID);
+static NS_DEFINE_IID(kIInstallTrigger_CID, NS_SoftwareUpdateInstallTrigger_CID);
+
+
+
+
+
+
+nsInstallTrigger::nsInstallTrigger()
+{
+    mScriptObject   = nsnull;
+    NS_INIT_REFCNT();
+}
+
+nsInstallTrigger::~nsInstallTrigger()
+{
+}
+
+NS_IMETHODIMP 
+nsInstallTrigger::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(kIScriptObjectOwnerIID))
+    {
+        *aInstancePtr = (void*) ((nsIScriptObjectOwner*)this);
+        AddRef();
+        return NS_OK;
+    }
+    else if ( aIID.Equals(kIInstallTrigger_IID) )
+    {
+        *aInstancePtr = (void*) ((nsIDOMInstallTriggerGlobal*)this);
+        AddRef();
+        return NS_OK;
+    }
+    else if ( aIID.Equals(kISupportsIID) )
+    {
+        *aInstancePtr = (void*)(nsISupports*)(nsIScriptObjectOwner*)this;
+        AddRef();
+        return NS_OK;
+    }
+
+     return NS_NOINTERFACE;
+}
+
+NS_IMPL_ADDREF(nsInstallTrigger)
+NS_IMPL_RELEASE(nsInstallTrigger)
+
+
+
+NS_IMETHODIMP 
+nsInstallTrigger::GetScriptObject(nsIScriptContext *aContext, void** aScriptObject)
+{
+    NS_PRECONDITION(nsnull != aScriptObject, "null arg");
+    nsresult res = NS_OK;
+    
+    if (nsnull == mScriptObject) 
+    {
+         nsIScriptGlobalObject *global = aContext->GetGlobalObject();
+
+        res = NS_NewScriptInstallTriggerGlobal(  aContext, 
+                                                (nsISupports *)(nsIDOMInstallTriggerGlobal*)this, 
+                                                (nsISupports *)global, 
+                                                &mScriptObject);
+        NS_IF_RELEASE(global);
+
+    }
+  
+
+    *aScriptObject = mScriptObject;
+    return res;
+}
+
+NS_IMETHODIMP 
+nsInstallTrigger::SetScriptObject(void *aScriptObject)
+{
+  mScriptObject = 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)
+{
+    nsIPref * prefs;
+    
+    nsresult rv = nsServiceManager::GetService(kPrefsCID, 
+                                               kPrefsIID,
+                                               (nsISupports**) &prefs);
+
+
+    if ( NS_SUCCEEDED(rv) )
+    {
+        rv = prefs->GetBoolPref( (const char*) XPINSTALL_ENABLE_PREF, aReturn);
+
+        if (NS_FAILED(rv))
+        {
+            *aReturn = PR_FALSE;
+        }
+
+        NS_RELEASE(prefs);
+    }
+    else
+    {
+        *aReturn = PR_FALSE;  /* no prefs manager.  set to false */
+    }
+
+    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)
+{
+    PRBool enabled;
+    nsresult rv = NS_ERROR_OUT_OF_MEMORY;
+    *aReturn = PR_FALSE;
+
+    UpdateEnabled(&enabled);
+    if (!enabled)
+        return NS_OK;
+
+    // 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;
+        }
+    }
+
+    return rv;
+}
+
+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);
+}
+
+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);
+}
+
+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);
+}
+
+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);
+}
+
+NS_IMETHODIMP    
+nsInstallTrigger::ConditionalSoftwareUpdate(const nsString& aURL, const nsString& aRegName, nsIDOMInstallVersion* aVersion, PRInt32* aReturn)
+{
+    return ConditionalSoftwareUpdate(aURL, aRegName, BLD_DIFF, aVersion, 0, aReturn);
+}
+
+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);
+}
+
+NS_IMETHODIMP    
+nsInstallTrigger::CompareVersion(const nsString& aRegName, const nsString& aVersion, PRInt32* aReturn)
+{
+    nsInstallVersion inVersion;
+    inVersion.Init(aVersion);
+
+    return CompareVersion(aRegName, &inVersion, aReturn);
+}
+
+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.
+ 
+void
+nsInstallTrigger::CreateTempFileFromURL(const nsString& aURL, nsString& tempFileString)
+{
+    // Checking to see if the url is local
+
+    if ( aURL.EqualsIgnoreCase("file:/", 6) )
+    {       
+        tempFileString.Assign( nsNSPRPath(nsFileURL(aURL)) );
+    }
+    else
+    {
+        nsSpecialSystemDirectory tempFile(nsSpecialSystemDirectory::OS_TemporaryDirectory);
+    
+        PRInt32 result = aURL.RFindChar('/');
+        if (result != -1)
+        {    
+            nsString jarName;
+                       
+            aURL.Right(jarName, (aURL.Length() - result) );
+            
+            PRInt32 argOffset = jarName.RFindChar('?');
+
+            if (argOffset != -1)
+            {
+                // we need to remove ? and everything after it
+                jarName.Truncate(argOffset);
+            }
+            
+            
+            tempFile += jarName;
+        }
+        else
+        {   
+            tempFile += "xpinstall.jar";
+        }
+
+        tempFile.MakeUnique();
+
+        tempFileString.Assign( nsNSPRPath( nsFilePath(tempFile) ) );
+    }
+}
+
+

mozilla/xpinstall/src/nsInstallTrigger.h

@@ -0,0 +1,55 @@
+#ifndef __NS_INSTALLTRIGGER_H__
+#define __NS_INSTALLTRIGGER_H__
+
+#include "nscore.h"
+#include "nsString.h"
+#include "nsIFactory.h"
+#include "nsISupports.h"
+#include "nsIScriptObjectOwner.h"
+
+#include "prtypes.h"
+#include "nsHashtable.h"
+
+#include "nsIDOMInstallTriggerGlobal.h"
+#include "nsSoftwareUpdate.h"
+#include "nsXPITriggerInfo.h"
+
+
+
+
+class nsInstallTrigger: public nsIScriptObjectOwner, public nsIDOMInstallTriggerGlobal
+{
+    public:
+        static const nsIID& IID() { static nsIID iid = NS_SoftwareUpdateInstallTrigger_CID; return iid; }
+
+        nsInstallTrigger();
+        virtual ~nsInstallTrigger();
+        
+        NS_DECL_ISUPPORTS
+
+        NS_IMETHOD    GetScriptObject(nsIScriptContext *aContext, void** aScriptObject);
+        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    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);
+        NS_IMETHOD    GetVersion(const nsString& component, nsString& version);
+
+        
+    private:
+        void *mScriptObject;
+        void CreateTempFileFromURL(const nsString& aURL, nsString& tempFileString);
+
+};
+
+#define NS_INSTALLTRIGGERCOMPONENT_PROGID NS_IXPINSTALLCOMPONENT_PROGID "/installtrigger"
+#endif

mozilla/xpinstall/src/nsInstallUninstall.cpp

@@ -0,0 +1,216 @@
+/* -*- 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) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+#include "nsInstall.h"
+#include "nsInstallUninstall.h"
+#include "nsInstallResources.h"
+#include "VerReg.h"
+#include "prmem.h"
+#include "nsFileSpec.h"
+#include "ScheduledTasks.h"
+
+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,
+                                        PRInt32 *error)
+
+: nsInstallObject(inInstall)
+{
+    MOZ_COUNT_CTOR(nsInstallUninstall);
+
+    if (regName.Equals("")) 
+    {
+        *error = nsInstall::INVALID_ARGUMENTS;
+        return;
+    }
+    
+    mRegName.Assign(regName);
+
+    char* userName = (char*)PR_Malloc(MAXREGPATHLEN);
+    PRInt32 err = VR_GetUninstallUserName( (char*) (const char*) nsAutoCString(regName), 
+                                           userName, 
+                                           MAXREGPATHLEN );
+    
+    mUIName.Assign(userName);
+    
+    if (err != REGERR_OK)
+    {
+        *error = nsInstall::NO_SUCH_COMPONENT;
+    }
+    
+    PR_FREEIF(userName);
+    
+}
+
+nsInstallUninstall::~nsInstallUninstall()
+{
+    MOZ_COUNT_CTOR(nsInstallUninstall);
+}
+
+
+PRInt32 nsInstallUninstall::Prepare()
+{
+    // no set-up necessary
+    return nsInstall::SUCCESS;
+}
+
+PRInt32 nsInstallUninstall::Complete()
+{
+    PRInt32 err = nsInstall::SUCCESS;
+
+    if (mInstall == NULL) 
+       return nsInstall::INVALID_ARGUMENTS;
+
+    err = SU_Uninstall( (char*)(const char*) nsAutoCString(mRegName) );
+    
+    return err;
+}
+
+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);
+
+    return buffer;
+}
+
+
+PRBool
+nsInstallUninstall::CanUninstall()
+{
+    return PR_FALSE;
+}
+
+PRBool
+nsInstallUninstall::RegisterPackageNode()
+{
+    return PR_FALSE;
+}
+
+extern "C" NS_EXPORT PRInt32 SU_Uninstall(char *regPackageName)
+{
+    REGERR status = REGERR_FAIL;
+    char pathbuf[MAXREGPATHLEN+1] = {0};
+    char sharedfilebuf[MAXREGPATHLEN+1] = {0};
+    REGENUM state = 0;
+    int32 length;
+    int32 err;
+
+    if (regPackageName == NULL)
+        return REGERR_PARAM;
+
+    if (pathbuf == NULL)
+        return REGERR_PARAM;
+
+    /* Get next path from Registry */
+    status = VR_Enum( regPackageName, &state, pathbuf, MAXREGPATHLEN );
+
+    /* if we got a good path */
+    while (status == REGERR_OK)
+    {
+        char component_path[2*MAXREGPATHLEN+1] = {0};
+        strcat(component_path, regPackageName);
+        length = strlen(regPackageName);
+        if (component_path[length - 1] != '/')
+            strcat(component_path, "/");
+        strcat(component_path, pathbuf);
+        err = su_UninstallProcessItem(component_path);
+        status = VR_Enum( regPackageName, &state, pathbuf, MAXREGPATHLEN );  
+    }
+    
+    err = VR_Remove(regPackageName);
+    // there is a problem here.  It looks like if the file is refcounted, we still blow away the reg key
+    // FIX!
+    state = 0;
+    status = VR_UninstallEnumSharedFiles( regPackageName, &state, sharedfilebuf, MAXREGPATHLEN );
+    while (status == REGERR_OK)
+    {
+        err = su_UninstallProcessItem(sharedfilebuf);
+        err = VR_UninstallDeleteFileFromList(regPackageName, sharedfilebuf);
+        status = VR_UninstallEnumSharedFiles( regPackageName, &state, sharedfilebuf, MAXREGPATHLEN );
+    }
+
+    err = VR_UninstallDeleteSharedFilesKey(regPackageName);
+    err = VR_UninstallDestroy(regPackageName);
+    return err;
+}
+
+REGERR su_UninstallProcessItem(char *component_path)
+{
+    int refcount;
+    int err;
+    char filepath[MAXREGPATHLEN];
+
+    err = VR_GetPath(component_path, sizeof(filepath), filepath);
+    if ( err == REGERR_OK )
+    {
+        err = VR_GetRefCount(component_path, &refcount);  
+        if ( err == REGERR_OK )
+        {
+            --refcount;
+            if (refcount > 0)
+                err = VR_SetRefCount(component_path, refcount);  
+            else 
+            {
+                err = VR_Remove(component_path);
+                DeleteFileNowOrSchedule(nsFileSpec(filepath));
+            }
+        }
+        else
+        {
+            /* delete node and file */
+            err = VR_Remove(component_path);
+            DeleteFileNowOrSchedule(nsFileSpec(filepath));
+        }
+    }
+    return err;
+}

mozilla/xpinstall/src/nsInstallUninstall.h

@@ -0,0 +1,63 @@
+/* -*- 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) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+
+#ifndef nsInstallUninstall_h__
+#define nsInstallUninstall_h__
+
+#include "prtypes.h"
+#include "nsString.h"
+#include "nsInstallObject.h"
+#include "nsInstall.h"
+
+class nsInstallUninstall : public nsInstallObject 
+{
+    public:
+          
+        nsInstallUninstall( nsInstall* inInstall,
+                            const nsString& regName,
+                            PRInt32 *error);
+
+
+        virtual ~nsInstallUninstall();
+
+        PRInt32 Prepare();
+        PRInt32 Complete();
+        void  Abort();
+        char* toString();
+
+        PRBool CanUninstall();
+        PRBool RegisterPackageNode();
+	  
+  
+    private:
+          
+        nsString mRegName;        // Registry name of package
+        nsString mUIName;         // User name of package
+
+        
+};
+
+#endif /* nsInstallUninstall_h__ */

mozilla/xpinstall/src/nsInstallVersion.cpp

@@ -0,0 +1,341 @@
+/* -*- 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.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#include "nsSoftwareUpdate.h"
+
+#include "nsInstallVersion.h"
+#include "nsIDOMInstallVersion.h"
+
+#include "nscore.h"
+#include "nsIFactory.h"
+#include "nsISupports.h"
+#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);
+static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
+
+static NS_DEFINE_IID(kIInstallVersion_IID, NS_IDOMINSTALLVERSION_IID);
+
+
+nsInstallVersion::nsInstallVersion()
+{
+    mScriptObject   = nsnull;
+    NS_INIT_REFCNT();
+}
+
+nsInstallVersion::~nsInstallVersion()
+{
+}
+
+NS_IMETHODIMP 
+nsInstallVersion::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(kIScriptObjectOwnerIID))
+    {
+        *aInstancePtr = (void*) ((nsIScriptObjectOwner*)this);
+        AddRef();
+        return NS_OK;
+    }
+    else if ( aIID.Equals(kIInstallVersion_IID) )
+    {
+        *aInstancePtr = (void*) ((nsIDOMInstallVersion*)this);
+        AddRef();
+        return NS_OK;
+    }
+    else if ( aIID.Equals(kISupportsIID) )
+    {
+        *aInstancePtr = (void*)(nsISupports*)(nsIScriptObjectOwner*)this;
+        AddRef();
+        return NS_OK;
+    }
+
+     return NS_NOINTERFACE;
+}
+
+
+NS_IMPL_ADDREF(nsInstallVersion)
+NS_IMPL_RELEASE(nsInstallVersion)
+
+
+
+NS_IMETHODIMP 
+nsInstallVersion::GetScriptObject(nsIScriptContext *aContext, void** aScriptObject)
+{
+    NS_PRECONDITION(nsnull != aScriptObject, "null arg");
+    nsresult res = NS_OK;
+    
+    if (nsnull == mScriptObject) 
+    {
+        res = NS_NewScriptInstallVersion(aContext, 
+                                         (nsISupports *)(nsIDOMInstallVersion*)this, 
+                                         nsnull, 
+                                         &mScriptObject);
+    }
+  
+
+    *aScriptObject = mScriptObject;
+    return res;
+}
+
+NS_IMETHODIMP 
+nsInstallVersion::SetScriptObject(void *aScriptObject)
+{
+  mScriptObject = aScriptObject;
+  return NS_OK;
+}
+
+//  this will go away when our constructors can have parameters.
+NS_IMETHODIMP    
+nsInstallVersion::Init(PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild)
+{
+    major   = aMajor;
+    minor   = aMinor;
+    release = aRelease;
+    build   = aBuild;
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP    
+nsInstallVersion::Init(const nsString& version)
+{
+    PRInt32 errorCode;
+    PRInt32 aMajor, aMinor, aRelease, aBuild;
+
+    major = minor = release = build = 0;
+    
+    errorCode = nsInstallVersion::StringToVersionNumbers(version, &aMajor, &aMinor, &aRelease, &aBuild);    
+    if (NS_SUCCEEDED(errorCode)) 
+    {
+        Init(aMajor, aMinor, aRelease, aBuild);
+    }
+    
+    return NS_OK;
+}
+
+
+NS_IMETHODIMP    
+nsInstallVersion::GetMajor(PRInt32* aMajor)
+{
+    *aMajor = major;
+    return NS_OK;
+}
+
+NS_IMETHODIMP    
+nsInstallVersion::SetMajor(PRInt32 aMajor)
+{
+    major = aMajor;
+    return NS_OK;
+}
+
+NS_IMETHODIMP    
+nsInstallVersion::GetMinor(PRInt32* aMinor)
+{
+    *aMinor = minor;
+    return NS_OK;
+}
+
+NS_IMETHODIMP    
+nsInstallVersion::SetMinor(PRInt32 aMinor)
+{
+    minor = aMinor;
+    return NS_OK;
+}
+
+NS_IMETHODIMP    
+nsInstallVersion::GetRelease(PRInt32* aRelease)
+{
+    *aRelease = release;
+    return NS_OK;
+}
+
+NS_IMETHODIMP    
+nsInstallVersion::SetRelease(PRInt32 aRelease)
+{
+    release = aRelease;
+    return NS_OK;
+}
+
+NS_IMETHODIMP    
+nsInstallVersion::GetBuild(PRInt32* aBuild)
+{
+    *aBuild = build;
+    return NS_OK;
+}
+
+NS_IMETHODIMP    
+nsInstallVersion::SetBuild(PRInt32 aBuild)
+{
+    build = aBuild;
+    return NS_OK;
+}
+
+
+NS_IMETHODIMP    
+nsInstallVersion::CompareTo(nsIDOMInstallVersion* aVersion, PRInt32* aReturn)
+{
+    PRInt32 aMajor, aMinor, aRelease, aBuild;
+    
+    aVersion->GetMajor(&aMajor);
+    aVersion->GetMinor(&aMinor);
+    aVersion->GetRelease(&aRelease);
+    aVersion->GetBuild(&aBuild);
+
+    CompareTo(aMajor, aMinor, aRelease, aBuild, aReturn);
+    
+    return NS_OK;
+}
+
+
+NS_IMETHODIMP    
+nsInstallVersion::CompareTo(const nsString& aString, PRInt32* aReturn)
+{
+    nsInstallVersion inVersion;
+    inVersion.Init(aString);
+
+    return CompareTo(&inVersion, aReturn);
+}
+
+NS_IMETHODIMP    
+nsInstallVersion::CompareTo(PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn)
+{
+    int diff;
+    
+    if ( major == aMajor ) 
+    {
+        if ( minor == aMinor ) 
+        {
+            if ( release == aRelease ) 
+            {
+                if ( build == aBuild )
+                    diff = EQUAL;
+                else if ( build > aBuild )
+                    diff = BLD_DIFF;
+                else
+                    diff = BLD_DIFF_MINUS;
+            }
+            else if ( release > aRelease )
+                diff = REL_DIFF;
+            else
+                diff = REL_DIFF_MINUS;
+        }
+        else if (  minor > aMinor )
+            diff = MINOR_DIFF;
+        else
+            diff = MINOR_DIFF_MINUS;
+    }
+    else if ( major > aMajor )
+        diff = MAJOR_DIFF;
+    else
+        diff = MAJOR_DIFF_MINUS;
+
+    *aReturn = diff;
+
+    return NS_OK;
+}
+
+
+NS_IMETHODIMP    
+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);
+
+    return NS_OK;
+}
+
+
+nsresult
+nsInstallVersion::StringToVersionNumbers(const nsString& version, PRInt32 *aMajor, PRInt32 *aMinor, PRInt32 *aRelease, PRInt32 *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);
+               }
+            }
+        }
+    }
+
+    return errorCode;
+}
+

mozilla/xpinstall/src/nsInstallVersion.h

@@ -0,0 +1,60 @@
+#ifndef __NS_INSTALLVERSION_H__
+#define __NS_INSTALLVERSION_H__
+
+#include "nscore.h"
+#include "nsString.h"
+#include "nsIFactory.h"
+#include "nsISupports.h"
+#include "nsIScriptObjectOwner.h"
+
+#include "nsIDOMInstallVersion.h"
+#include "nsSoftwareUpdate.h"
+
+#include "prtypes.h"
+
+class nsInstallVersion: public nsIScriptObjectOwner, public nsIDOMInstallVersion
+{
+    public:
+        static const nsIID& IID() { static nsIID iid = NS_SoftwareUpdateInstallVersion_CID; return iid; }
+
+        nsInstallVersion();
+        virtual ~nsInstallVersion();
+        
+        NS_DECL_ISUPPORTS
+
+        NS_IMETHOD    GetScriptObject(nsIScriptContext *aContext, void** aScriptObject);
+        NS_IMETHOD    SetScriptObject(void* aScriptObject);
+        
+        NS_IMETHOD    Init(PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild);
+        NS_IMETHOD    Init(const nsString& aVersionString);
+
+        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    ToString(nsString& aReturn);
+        NS_IMETHOD    CompareTo(nsIDOMInstallVersion* aVersion, PRInt32* aReturn);
+        NS_IMETHOD    CompareTo(const nsString& aString, PRInt32* aReturn);
+        NS_IMETHOD    CompareTo(PRInt32 aMajor, PRInt32 aMinor, PRInt32 aRelease, PRInt32 aBuild, PRInt32* aReturn);
+
+        static nsresult StringToVersionNumbers(const nsString& version, PRInt32 *aMajor, PRInt32 *aMinor, PRInt32 *aRelease, PRInt32 *aBuild);
+
+    private:
+        void *mScriptObject;
+        PRInt32 major;
+        PRInt32 minor;
+        PRInt32 release;
+        PRInt32 build;
+};
+
+
+#define NS_INSTALLVERSIONCOMPONENT_PROGID NS_IXPINSTALLCOMPONENT_PROGID "/installversion"
+#endif

mozilla/xpinstall/src/nsJSFile.h

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

@@ -0,0 +1,150 @@
+/* -*- 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/nsJSFileSpecObj.h

@@ -0,0 +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.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_JSFILEOBJ_H__
+#define __NS_JSFILEOBJ_H__
+
+PRInt32 
+InitFileSpecObjectPrototype(JSContext *jscontext, JSObject *global, JSObject **fileSpecObjectPrototype);
+
+#endif

mozilla/xpinstall/src/nsJSInstallTriggerGlobal.cpp

@@ -0,0 +1,719 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#include "jsapi.h"
+#include "nsJSUtils.h"
+#include "nscore.h"
+#include "nsIScriptContext.h"
+#include "nsIJSScriptObject.h"
+#include "nsIScriptObjectOwner.h"
+#include "nsIScriptGlobalObject.h"
+#include "nsCRT.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,
+                             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);
+
+static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
+static NS_DEFINE_IID(kIJSScriptObjectIID, NS_IJSSCRIPTOBJECT_IID);
+static NS_DEFINE_IID(kIScriptGlobalObjectIID, NS_ISCRIPTGLOBALOBJECT_IID);
+static NS_DEFINE_IID(kIInstallTriggerGlobalIID, NS_IDOMINSTALLTRIGGERGLOBAL_IID);
+
+//
+// InstallTriggerGlobal finalizer
+//
+PR_STATIC_CALLBACK(void)
+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)
+{
+    nsresult result;
+    nsIScriptObjectOwner *owner = nsnull;
+    nsIDOMInstallTriggerGlobal *nativeThis;
+
+    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;
+}
+
+//
+// Native method UpdateEnabled
+//
+PR_STATIC_CALLBACK(JSBool)
+InstallTriggerGlobalUpdateEnabled(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsIDOMInstallTriggerGlobal *nativeThis = (nsIDOMInstallTriggerGlobal*)JS_GetPrivate(cx, obj);
+  PRBool nativeRet;
+
+  *rval = JSVAL_NULL;
+
+  if (nsnull == nativeThis  &&  (JS_FALSE == CreateNativeObject(cx, obj, &nativeThis)) )
+    return JS_FALSE;
+
+  if (argc >= 0) {
+
+    if (NS_OK != nativeThis->UpdateEnabled(&nativeRet)) {
+      return JS_FALSE;
+    }
+
+    *rval = BOOLEAN_TO_JSVAL(nativeRet);
+  }
+  else {
+    JS_ReportError(cx, "Function UpdateEnabled requires 0 parameters");
+    return JS_FALSE;
+  }
+
+  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
+//
+PR_STATIC_CALLBACK(JSBool)
+InstallTriggerGlobalStartSoftwareUpdate(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsIDOMInstallTriggerGlobal *nativeThis = (nsIDOMInstallTriggerGlobal*)JS_GetPrivate(cx, obj);
+  PRBool       nativeRet;
+  nsAutoString b0;
+  PRInt32      b1 = 0;
+
+  *rval = JSVAL_FALSE;
+
+  if (nsnull == nativeThis  &&  (JS_FALSE == CreateNativeObject(cx, obj, &nativeThis)) )
+    return JS_FALSE;
+
+  if ( argc >= 1 )
+  {
+    ConvertJSValToStr(b0, cx, argv[0]);
+
+    if (argc >= 2 && !JS_ValueToInt32(cx, argv[1], (int32 *)&b1))
+    {
+        JS_ReportError(cx, "StartSoftwareUpdate() 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);
+  }
+  else
+  {
+    JS_ReportError(cx, "Function StartSoftwareUpdate requires 2 parameters");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+
+//
+// Native method ConditionalSoftwareUpdate
+//
+PR_STATIC_CALLBACK(JSBool)
+InstallTriggerGlobalConditionalSoftwareUpdate(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsIDOMInstallTriggerGlobal *nativeThis = (nsIDOMInstallTriggerGlobal*)JS_GetPrivate(cx, obj);
+  PRInt32 nativeRet;
+  nsAutoString b0;
+  nsAutoString b1;
+  nsAutoString b2str;
+  PRInt32      b2int;
+  nsAutoString b3str;
+  PRInt32      b3int;
+  PRInt32      b4;
+
+  *rval = JSVAL_NULL;
+
+  if (nsnull == nativeThis  &&  (JS_FALSE == CreateNativeObject(cx, obj, &nativeThis)) )
+    return JS_FALSE;
+
+  if(argc >= 5)
+  {
+    //  public int ConditionalSoftwareUpdate(String url,
+    //                                       String registryName,
+    //                                       int    diffLevel,
+    //                                       String version, --OR-- VersionInfo version
+    //                                       int    mode);
+
+    ConvertJSValToStr(b0, cx, argv[0]);
+    ConvertJSValToStr(b1, cx, argv[1]);
+
+    if(!JS_ValueToInt32(cx, argv[2], (int32 *)&b2int))
+    {
+      JS_ReportError(cx, "3rd parameter must be a number");
+      return JS_FALSE;
+    }
+
+    if(!JS_ValueToInt32(cx, argv[4], (int32 *)&b4))
+    {
+      JS_ReportError(cx, "5th parameter must be a number");
+      return JS_FALSE;
+    }
+    
+    if(JSVAL_IS_OBJECT(argv[3]))
+    {
+        JSObject* jsobj = JSVAL_TO_OBJECT(argv[3]);
+        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->ConditionalSoftwareUpdate(b0, b1, b2int, version, b4, &nativeRet))
+          {
+                return JS_FALSE;
+          }
+        }
+    }
+    else
+    {
+        ConvertJSValToStr(b3str, cx, argv[3]);
+        if(NS_OK != nativeThis->ConditionalSoftwareUpdate(b0, b1, b2int, b3str, b4, &nativeRet))
+        {
+          return JS_FALSE;
+        }
+    }
+
+    *rval = INT_TO_JSVAL(nativeRet);
+  }
+  else if(argc >= 4)
+  {
+    //  public int ConditionalSoftwareUpdate(String url,
+    //                                       String registryName,
+    //                                       String version,  --OR-- VersionInfo version
+    //                                       int    mode);
+
+    ConvertJSValToStr(b0, cx, argv[0]);
+    ConvertJSValToStr(b1, cx, argv[1]);
+
+    if(!JS_ValueToInt32(cx, argv[3], (int32 *)&b3int))
+    {
+      JS_ReportError(cx, "4th parameter must be a number");
+      return JS_FALSE;
+    }
+
+    if(JSVAL_IS_OBJECT(argv[2]))
+    {
+        JSObject* jsobj = JSVAL_TO_OBJECT(argv[2]);
+        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->ConditionalSoftwareUpdate(b0, b1, version, b3int, &nativeRet))
+          {
+                return JS_FALSE;
+          }
+        }
+    }
+    else
+    {
+        ConvertJSValToStr(b2str, cx, argv[2]);
+        if(NS_OK != nativeThis->ConditionalSoftwareUpdate(b0, b1, b2str, b3int, &nativeRet))
+        {
+          return JS_FALSE;
+        }
+    }
+        
+    *rval = INT_TO_JSVAL(nativeRet);
+  }
+  else if(argc >= 3)
+  {
+    //  public int ConditionalSoftwareUpdate(String url,
+    //                                       String registryName,
+    //                                       String version);  --OR-- VersionInfo version
+
+    ConvertJSValToStr(b0, cx, argv[0]);
+    ConvertJSValToStr(b1, cx, argv[1]);
+
+    if(JSVAL_IS_OBJECT(argv[2]))
+    {
+        JSObject* jsobj = JSVAL_TO_OBJECT(argv[2]);
+        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->ConditionalSoftwareUpdate(b0, b1, version, &nativeRet))
+          {
+                return JS_FALSE;
+          }
+        }
+    }
+    else
+    {
+        ConvertJSValToStr(b2str, cx, argv[2]);
+        if(NS_OK != nativeThis->ConditionalSoftwareUpdate(b0, b1, b2str, &nativeRet))
+        {
+          return JS_FALSE;
+        }
+    }
+        
+    *rval = INT_TO_JSVAL(nativeRet);
+  }
+  else
+  {
+    JS_ReportError(cx, "Function ConditionalSoftwareUpdate requires 5 parameters");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+
+//
+// Native method CompareVersion
+//
+PR_STATIC_CALLBACK(JSBool)
+InstallTriggerGlobalCompareVersion(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsIDOMInstallTriggerGlobal *nativeThis = (nsIDOMInstallTriggerGlobal*)JS_GetPrivate(cx, obj);
+  PRInt32 nativeRet;
+  nsAutoString regname;
+  nsAutoString version;
+  int32        major,minor,release,build;
+
+  *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;
+  }
+
+  // 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
+  {
+    //  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;
+
+    if(!JS_ValueToInt32(cx, argv[1], &major))
+    {
+      JS_ReportError(cx, "2th parameter must be a number");
+      return JS_FALSE;
+    }
+    if( argc > 2 && !JS_ValueToInt32(cx, argv[2], &minor) )
+    {
+      JS_ReportError(cx, "3th parameter must be a number");
+      return JS_FALSE;
+    }
+    if( argc > 3 && !JS_ValueToInt32(cx, argv[3], &release) )
+    {
+      JS_ReportError(cx, "4th parameter must be a number");
+      return JS_FALSE;
+    }
+    if( argc > 4 && !JS_ValueToInt32(cx, argv[4], &build) )
+    {
+      JS_ReportError(cx, "5th parameter must be a number");
+      return JS_FALSE;
+    }
+
+    if(NS_OK != nativeThis->CompareVersion(regname, major, minor, release, build, &nativeRet))
+    {
+      return JS_FALSE;
+    }
+  }
+
+  *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))
+  {
+        return JS_FALSE;
+  }
+  
+  if(version.Equals(""))
+      *rval = JSVAL_NULL;
+    else
+      ConvertStrToJSVal(version, cx, rval);
+
+  return JS_TRUE;
+}
+
+/***********************************************************************/
+//
+// class for InstallTriggerGlobal
+//
+JSClass InstallTriggerGlobalClass = {
+  "InstallTrigger", 
+  JSCLASS_HAS_PRIVATE,
+  JS_PropertyStub,
+  JS_PropertyStub,
+  JS_PropertyStub,
+  JS_PropertyStub,
+  JS_EnumerateStub,
+  JS_ResolveStub,
+  JS_ConvertStub,
+  FinalizeInstallTriggerGlobal
+};
+
+//
+// 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},
+  {0}
+};
+
+
+static JSConstDoubleSpec diff_constants[] = 
+{
+    { 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;
+}
+
+
+
+//
+// InstallTriggerGlobal class initialization
+//
+nsresult NS_InitInstallTriggerGlobalClass(nsIScriptContext *aContext, void **aPrototype)
+{
+  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
+  JSObject *proto = nsnull;
+  JSObject *constructor = nsnull;
+  JSObject *global = JS_GetGlobalObject(jscontext);
+  jsval vp;
+
+  if ((PR_TRUE != JS_LookupProperty(jscontext, global, "InstallTriggerGlobal", &vp)) ||
+      !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;
+  }
+  else if ((nsnull != constructor) && JSVAL_IS_OBJECT(vp)) 
+  {
+    proto = JSVAL_TO_OBJECT(vp);
+  }
+  else 
+  {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (aPrototype) 
+    *aPrototype = proto;
+  
+  return NS_OK;
+}
+
+
+//
+// Method for creating a new InstallTriggerGlobal JavaScript object
+//
+extern "C" NS_DOM nsresult NS_NewScriptInstallTriggerGlobal(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn)
+{
+  NS_PRECONDITION(nsnull != aContext && nsnull != aSupports && nsnull != aReturn, "null argument to NS_NewScriptInstallTriggerGlobal");
+  JSObject *proto;
+  JSObject *parent;
+  nsIScriptObjectOwner *owner;
+  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
+  nsresult result = NS_OK;
+  nsIDOMInstallTriggerGlobal *aInstallTriggerGlobal;
+
+  if (nsnull == aParent) {
+    parent = nsnull;
+  }
+  else if (NS_OK == aParent->QueryInterface(kIScriptObjectOwnerIID, (void**)&owner)) {
+    if (NS_OK != owner->GetScriptObject(aContext, (void **)&parent)) {
+      NS_RELEASE(owner);
+      return NS_ERROR_FAILURE;
+    }
+    NS_RELEASE(owner);
+  }
+  else {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (NS_OK != NS_InitInstallTriggerGlobalClass(aContext, (void **)&proto)) {
+    return NS_ERROR_FAILURE;
+  }
+
+  result = aSupports->QueryInterface(kIInstallTriggerGlobalIID, (void **)&aInstallTriggerGlobal);
+  if (NS_OK != result) {
+    return result;
+  }
+
+  // create a js object for this class
+  *aReturn = JS_NewObject(jscontext, &InstallTriggerGlobalClass, proto, parent);
+  if (nsnull != *aReturn) {
+    // connect the native object to the js object
+    JS_SetPrivate(jscontext, (JSObject *)*aReturn, aInstallTriggerGlobal);
+  }
+  else {
+    NS_RELEASE(aInstallTriggerGlobal);
+    return NS_ERROR_FAILURE; 
+  }
+
+  return NS_OK;
+}

mozilla/xpinstall/src/nsJSInstallVersion.cpp

@@ -0,0 +1,651 @@
+/* -*- 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): 
+ */
+/* AUTO-GENERATED. DO NOT EDIT!!! */
+
+#include "jsapi.h"
+#include "nsJSUtils.h"
+#include "nscore.h"
+#include "nsIScriptContext.h"
+#include "nsIJSScriptObject.h"
+#include "nsIScriptObjectOwner.h"
+#include "nsIScriptGlobalObject.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);
+
+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);
+
+void ConvertJSvalToVersionString(nsString& versionString, JSContext* cx, jsval* argument);
+
+
+static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
+static NS_DEFINE_IID(kIJSScriptObjectIID, NS_IJSSCRIPTOBJECT_IID);
+static NS_DEFINE_IID(kIScriptGlobalObjectIID, NS_ISCRIPTGLOBALOBJECT_IID);
+static NS_DEFINE_IID(kIInstallVersionIID, NS_IDOMINSTALLVERSION_IID);
+
+//
+// InstallVersion property ids
+//
+enum InstallVersion_slots {
+  INSTALLVERSION_MAJOR = -1,
+  INSTALLVERSION_MINOR = -2,
+  INSTALLVERSION_RELEASE = -3,
+  INSTALLVERSION_BUILD = -4
+};
+
+/***********************************************************************/
+//
+// InstallVersion Properties Getter
+//
+PR_STATIC_CALLBACK(JSBool)
+GetInstallVersionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+  nsIDOMInstallVersion *a = (nsIDOMInstallVersion*)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 INSTALLVERSION_MAJOR:
+      {
+        PRInt32 prop;
+        if (NS_OK == a->GetMajor(&prop)) {
+          *vp = INT_TO_JSVAL(prop);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case INSTALLVERSION_MINOR:
+      {
+        PRInt32 prop;
+        if (NS_OK == a->GetMinor(&prop)) {
+          *vp = INT_TO_JSVAL(prop);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case INSTALLVERSION_RELEASE:
+      {
+        PRInt32 prop;
+        if (NS_OK == a->GetRelease(&prop)) {
+          *vp = INT_TO_JSVAL(prop);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case INSTALLVERSION_BUILD:
+      {
+        PRInt32 prop;
+        if (NS_OK == a->GetBuild(&prop)) {
+          *vp = INT_TO_JSVAL(prop);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      default:
+        return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, obj, id, vp);
+    }
+  }
+  else {
+    return nsJSUtils::nsCallJSScriptObjectGetProperty(a, cx, obj, id, vp);
+  }
+
+  return PR_TRUE;
+}
+
+/***********************************************************************/
+//
+// InstallVersion Properties Setter
+//
+PR_STATIC_CALLBACK(JSBool)
+SetInstallVersionProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+  nsIDOMInstallVersion *a = (nsIDOMInstallVersion*)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 INSTALLVERSION_MAJOR:
+      {
+        PRInt32 prop;
+        int32 temp;
+        if (JSVAL_IS_NUMBER(*vp) && JS_ValueToInt32(cx, *vp, &temp)) {
+          prop = (PRInt32)temp;
+        }
+        else {
+          JS_ReportError(cx, "Parameter must be a number");
+          return JS_FALSE;
+        }
+      
+        a->SetMajor(prop);
+        
+        break;
+      }
+      case INSTALLVERSION_MINOR:
+      {
+        PRInt32 prop;
+        int32 temp;
+        if (JSVAL_IS_NUMBER(*vp) && JS_ValueToInt32(cx, *vp, &temp)) {
+          prop = (PRInt32)temp;
+        }
+        else {
+          JS_ReportError(cx, "Parameter must be a number");
+          return JS_FALSE;
+        }
+      
+        a->SetMinor(prop);
+        
+        break;
+      }
+      case INSTALLVERSION_RELEASE:
+      {
+        PRInt32 prop;
+        int32 temp;
+        if (JSVAL_IS_NUMBER(*vp) && JS_ValueToInt32(cx, *vp, &temp)) {
+          prop = (PRInt32)temp;
+        }
+        else {
+          JS_ReportError(cx, "Parameter must be a number");
+          return JS_FALSE;
+        }
+      
+        a->SetRelease(prop);
+        
+        break;
+      }
+      case INSTALLVERSION_BUILD:
+      {
+        PRInt32 prop;
+        int32 temp;
+        if (JSVAL_IS_NUMBER(*vp) && JS_ValueToInt32(cx, *vp, &temp)) {
+          prop = (PRInt32)temp;
+        }
+        else {
+          JS_ReportError(cx, "Parameter must be a number");
+          return JS_FALSE;
+        }
+      
+        a->SetBuild(prop);
+        
+        break;
+      }
+      default:
+        return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, obj, id, vp);
+    }
+  }
+  else {
+    return nsJSUtils::nsCallJSScriptObjectSetProperty(a, cx, obj, id, vp);
+  }
+
+  return PR_TRUE;
+}
+
+
+//
+// InstallVersion finalizer
+//
+PR_STATIC_CALLBACK(void)
+FinalizeInstallVersion(JSContext *cx, JSObject *obj)
+{
+  nsJSUtils::nsGenericFinalize(cx, obj);
+}
+
+
+//
+// InstallVersion enumerate
+//
+PR_STATIC_CALLBACK(JSBool)
+EnumerateInstallVersion(JSContext *cx, JSObject *obj)
+{
+  return nsJSUtils::nsGenericEnumerate(cx, obj);
+}
+
+
+//
+// InstallVersion resolve
+//
+PR_STATIC_CALLBACK(JSBool)
+ResolveInstallVersion(JSContext *cx, JSObject *obj, jsval id)
+{
+  return nsJSUtils::nsGenericResolve(cx, obj, id);
+}
+
+
+//
+// Native method Init
+//
+PR_STATIC_CALLBACK(JSBool)
+InstallVersionInit(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsIDOMInstallVersion *nativeThis = (nsIDOMInstallVersion*)JS_GetPrivate(cx, obj);
+  nsAutoString b0;
+
+  *rval = JSVAL_NULL;
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == nativeThis) {
+    return JS_TRUE;
+  }
+
+  if (argc == 1) 
+  {
+      nsJSUtils::nsConvertJSValToString(b0, cx, argv[0]);
+  }
+  else 
+  {
+      b0 = "0.0.0.0";
+  }
+    
+  if (NS_OK != nativeThis->Init(b0)) 
+        return JS_FALSE;
+  
+  *rval = JSVAL_VOID;
+
+  return JS_TRUE;
+}
+
+
+//
+// Native method ToString
+//
+PR_STATIC_CALLBACK(JSBool)
+InstallVersionToString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsIDOMInstallVersion *nativeThis = (nsIDOMInstallVersion*)JS_GetPrivate(cx, obj);
+  nsAutoString nativeRet;
+
+  *rval = JSVAL_NULL;
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == nativeThis) {
+    return JS_TRUE;
+  }
+
+  if (argc >= 0) {
+
+    if (NS_OK != nativeThis->ToString(nativeRet)) {
+      return JS_FALSE;
+    }
+
+    nsJSUtils::nsConvertStringToJSVal(nativeRet, cx, rval);
+  }
+  else {
+    JS_ReportError(cx, "Function toString requires 0 parameters");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+
+//
+// Native method CompareTo
+//
+PR_STATIC_CALLBACK(JSBool)
+InstallVersionCompareTo(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsIDOMInstallVersion *nativeThis = (nsIDOMInstallVersion*)JS_GetPrivate(cx, obj);
+  PRInt32                 nativeRet;
+  nsString                b0str;
+  PRInt32                 b0int;
+  PRInt32                 b1int;
+  PRInt32                 b2int;
+  PRInt32                 b3int;
+
+  *rval = JSVAL_NULL;
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == nativeThis) {
+    return JS_TRUE;
+  }
+
+  if(argc >= 4)
+  {
+    //  public int CompareTo(int    major,
+    //                       int    minor,
+    //                       int    release,
+    //                       int    build);
+
+    if(!JSVAL_IS_INT(argv[0]))
+    {
+        JS_ReportError(cx, "1st parameter must be a number");
+        return JS_FALSE;
+    }
+    else if(!JSVAL_IS_INT(argv[1]))
+    {
+        JS_ReportError(cx, "2nd parameter must be a number");
+        return JS_FALSE;
+    }
+    else if(!JSVAL_IS_INT(argv[2]))
+    {
+        JS_ReportError(cx, "3rd parameter must be a number");
+        return JS_FALSE;
+    }
+    else if(!JSVAL_IS_INT(argv[3]))
+    {
+        JS_ReportError(cx, "4th parameter must be a number");
+        return JS_FALSE;
+    }
+
+    b0int = JSVAL_TO_INT(argv[0]);
+    b1int = JSVAL_TO_INT(argv[1]);
+    b2int = JSVAL_TO_INT(argv[2]);
+    b3int = JSVAL_TO_INT(argv[3]);
+
+    if(NS_OK != nativeThis->CompareTo(b0int, b1int, b2int, b3int, &nativeRet))
+    {
+      return JS_FALSE;
+    }
+
+    *rval = INT_TO_JSVAL(nativeRet);
+  }
+  else if(argc >= 1)
+  {
+     //   public int AddDirectory(String version);  --OR--  VersionInfo version
+
+    if(JSVAL_IS_OBJECT(argv[0]))
+    {
+        nsCOMPtr<nsIDOMInstallVersion> versionObj;
+
+        if(JS_FALSE == ConvertJSValToObj(getter_AddRefs(versionObj),
+                                         kIInstallVersionIID,
+                                         "InstallVersion",
+                                         cx,
+                                         argv[0]))
+        {
+          return JS_FALSE;
+        }
+
+        if(NS_OK != nativeThis->CompareTo(versionObj, &nativeRet))
+        {
+          return JS_FALSE;
+        }
+    }
+    else
+    {
+        ConvertJSValToStr(b0str, cx, argv[0]);
+
+        if(NS_OK != nativeThis->CompareTo(b0str, &nativeRet))
+        {
+          return JS_FALSE;
+        }
+    }
+
+    *rval = INT_TO_JSVAL(nativeRet);
+  }
+  else
+  {
+    JS_ReportError(cx, "Function compareTo requires 4 parameters");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+
+/***********************************************************************/
+//
+// class for InstallVersion
+//
+JSClass InstallVersionClass = {
+  "InstallVersion", 
+  JSCLASS_HAS_PRIVATE,
+  JS_PropertyStub,
+  JS_PropertyStub,
+  GetInstallVersionProperty,
+  SetInstallVersionProperty,
+  EnumerateInstallVersion,
+  ResolveInstallVersion,
+  JS_ConvertStub,
+  FinalizeInstallVersion
+};
+
+
+//
+// InstallVersion class properties
+//
+static JSPropertySpec InstallVersionProperties[] =
+{
+  {"major",    INSTALLVERSION_MAJOR,    JSPROP_ENUMERATE},
+  {"minor",    INSTALLVERSION_MINOR,    JSPROP_ENUMERATE},
+  {"release",  INSTALLVERSION_RELEASE,  JSPROP_ENUMERATE},
+  {"build",    INSTALLVERSION_BUILD,    JSPROP_ENUMERATE},
+  {0}
+};
+
+
+//
+// InstallVersion class methods
+//
+static JSFunctionSpec InstallVersionMethods[] = 
+{
+  {"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
+//
+PR_STATIC_CALLBACK(JSBool)
+InstallVersion(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsresult result;
+  
+  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,
+                                        nsnull,
+                                        kIDOMInstallVersionIID,
+                                        (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);
+
+  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
+//
+nsresult NS_InitInstallVersionClass(nsIScriptContext *aContext, void **aPrototype)
+{
+  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
+  JSObject *proto = nsnull;
+  JSObject *constructor = nsnull;
+  JSObject *global = JS_GetGlobalObject(jscontext);
+  jsval vp;
+
+  if ((PR_TRUE != JS_LookupProperty(jscontext, global, "InstallVersion", &vp)) ||
+      !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;
+  }
+  else if ((nsnull != constructor) && JSVAL_IS_OBJECT(vp)) 
+  {
+    proto = JSVAL_TO_OBJECT(vp);
+  }
+  else 
+  {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (aPrototype) 
+    *aPrototype = proto;
+  
+  return NS_OK;
+}
+
+
+//
+// Method for creating a new InstallVersion JavaScript object
+//
+extern "C" NS_DOM nsresult NS_NewScriptInstallVersion(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn)
+{
+  NS_PRECONDITION(nsnull != aContext && nsnull != aSupports && nsnull != aReturn, "null argument to NS_NewScriptInstallVersion");
+  JSObject *proto;
+  JSObject *parent;
+  nsIScriptObjectOwner *owner;
+  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
+  nsresult result = NS_OK;
+  nsIDOMInstallVersion *aInstallVersion;
+
+  if (nsnull == aParent) {
+    parent = nsnull;
+  }
+  else if (NS_OK == aParent->QueryInterface(kIScriptObjectOwnerIID, (void**)&owner)) {
+    if (NS_OK != owner->GetScriptObject(aContext, (void **)&parent)) {
+      NS_RELEASE(owner);
+      return NS_ERROR_FAILURE;
+    }
+    NS_RELEASE(owner);
+  }
+  else {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (NS_OK != NS_InitInstallVersionClass(aContext, (void **)&proto)) {
+    return NS_ERROR_FAILURE;
+  }
+
+  result = aSupports->QueryInterface(kIInstallVersionIID, (void **)&aInstallVersion);
+  if (NS_OK != result) {
+    return result;
+  }
+
+  // create a js object for this class
+  *aReturn = JS_NewObject(jscontext, &InstallVersionClass, proto, parent);
+  if (nsnull != *aReturn) {
+    // connect the native object to the js object
+    JS_SetPrivate(jscontext, (JSObject *)*aReturn, aInstallVersion);
+  }
+  else {
+    NS_RELEASE(aInstallVersion);
+    return NS_ERROR_FAILURE; 
+  }
+
+  return NS_OK;
+}

mozilla/xpinstall/src/nsJSWinProfile.cpp

@@ -0,0 +1,211 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#include "jsapi.h"
+#include "nscore.h"
+#include "nsIScriptContext.h"
+
+#include "nsString.h"
+#include "nsInstall.h"
+#include "nsWinProfile.h"
+#include "nsJSWinProfile.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);
+
+
+static void PR_CALLBACK WinProfileCleanup(JSContext *cx, JSObject *obj)
+{
+    nsWinProfile *nativeThis = (nsWinProfile*)JS_GetPrivate(cx, obj);
+    delete nativeThis;
+}
+
+/***********************************************************************************/
+// Native mothods for WinProfile functions
+
+//
+// Native method GetString
+//
+PR_STATIC_CALLBACK(JSBool)
+WinProfileGetString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsWinProfile *nativeThis = (nsWinProfile*)JS_GetPrivate(cx, obj);
+  nsString     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 getString ( String section,
+    //                         String key);
+
+    ConvertJSValToStr(b0, cx, argv[0]);
+    ConvertJSValToStr(b1, cx, argv[1]);
+
+    nativeThis->GetString(b0, b1, &nativeRet);
+
+    ConvertStrToJSVal(nativeRet, cx, rval);
+  }
+  else
+  {
+    JS_ReportError(cx, "WinProfile.getString() parameters error");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+//
+// Native method WriteString
+//
+PR_STATIC_CALLBACK(JSBool)
+WinProfileWriteString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsWinProfile *nativeThis = (nsWinProfile*)JS_GetPrivate(cx, obj);
+  PRInt32 nativeRet;
+  nsAutoString b0;
+  nsAutoString b1;
+  nsAutoString b2;
+
+  *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 writeString ( String section,
+    //                           String key,
+    //                           String value);
+
+    ConvertJSValToStr(b0, cx, argv[0]);
+    ConvertJSValToStr(b1, cx, argv[1]);
+    ConvertJSValToStr(b2, cx, argv[2]);
+
+    if(NS_OK != nativeThis->WriteString(b0, b1, b2, &nativeRet))
+    {
+      return JS_FALSE;
+    }
+
+    *rval = INT_TO_JSVAL(nativeRet);
+  }
+  else
+  {
+    JS_ReportError(cx, "WinProfile.writeString() parameters error");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+//
+// WinProfile constructor
+//
+PR_STATIC_CALLBACK(JSBool)
+WinProfile(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  return JS_FALSE;
+}
+
+/***********************************************************************/
+//
+// class for WinProfile
+//
+JSClass WinProfileClass = {
+  "WinProfile",
+  JSCLASS_HAS_PRIVATE,
+  JS_PropertyStub,
+  JS_PropertyStub,
+  JS_PropertyStub,
+  JS_PropertyStub,
+  JS_EnumerateStub,
+  JS_ResolveStub,
+  JS_ConvertStub,
+  WinProfileCleanup
+};
+
+
+static JSConstDoubleSpec winprofile_constants[] = 
+{
+    {0}
+};
+
+//
+// WinProfile class methods
+//
+static JSFunctionSpec WinProfileMethods[] = 
+{
+  {"getString",                  WinProfileGetString,                 2},
+  {"writeString",                WinProfileWriteString,               3},
+  {0}
+};
+
+PRInt32
+InitWinProfilePrototype(JSContext *jscontext, JSObject *global, JSObject **winProfilePrototype)
+{
+  *winProfilePrototype = JS_InitClass( jscontext,          // context
+                                       global,             // global object
+                                       nsnull,             // parent proto 
+                                       &WinProfileClass,   // JSClass
+                                       nsnull,             // JSNative ctor
+                                       0,                  // ctor args
+                                       nsnull,             // proto props
+                                       nsnull,             // proto funcs
+                                       nsnull,             // ctor props (static)
+                                       WinProfileMethods); // ctor funcs (static)
+
+  if(nsnull == *winProfilePrototype) 
+  {
+    return NS_ERROR_FAILURE;
+  }
+
+  if(PR_FALSE == JS_DefineConstDoubles(jscontext, *winProfilePrototype, winprofile_constants))
+    return NS_ERROR_FAILURE;
+
+  return NS_OK;
+}

mozilla/xpinstall/src/nsJSWinProfile.h

@@ -0,0 +1,29 @@
+/* -*- 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_JSWINPROTOTYPE_H__
+#define __NS_JSWINPROTOTYPE_H__
+
+PRInt32
+InitWinProfilePrototype(JSContext *jscontext, JSObject *global, JSObject **winRegPrototype);
+
+#endif

mozilla/xpinstall/src/nsJSWinReg.cpp

@@ -0,0 +1,593 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ */
+
+#include "jsapi.h"
+#include "nscore.h"
+#include "nsIScriptContext.h"
+
+#include "nsString.h"
+#include "nsInstall.h"
+#include "nsWinReg.h"
+#include "nsJSWinReg.h"
+
+static void PR_CALLBACK WinRegCleanup(JSContext *cx, JSObject *obj);
+
+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);
+
+
+static void PR_CALLBACK WinRegCleanup(JSContext *cx, JSObject *obj)
+{
+    nsWinReg *nativeThis = (nsWinReg*)JS_GetPrivate(cx, obj);
+    delete nativeThis;
+}
+
+/***********************************************************************************/
+// Native mothods for WinReg functions
+
+//
+// Native method SetRootKey
+//
+PR_STATIC_CALLBACK(JSBool)
+WinRegSetRootKey(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsWinReg *nativeThis  = (nsWinReg*)JS_GetPrivate(cx, obj);
+  JSBool   rBool        = JS_FALSE;
+  PRInt32  b0;
+
+  *rval = JSVAL_NULL;
+
+  // If there's no private data, this must be the prototype, so ignore
+  if(nsnull == nativeThis)
+  {
+    return JS_TRUE;
+  }
+
+  if(argc >= 1)
+  {
+    //  public int setRootKey(PRInt32 key);
+
+    if(!JS_ValueToInt32(cx, argv[0], (int32 *)&b0))
+    {
+      JS_ReportError(cx, "Parameter must be a number");
+      return JS_FALSE;
+    }
+
+    if(NS_OK != nativeThis->SetRootKey(b0))
+    {
+      return JS_FALSE;
+    }
+
+    *rval = JSVAL_VOID;
+  }
+  else
+  {
+    JS_ReportError(cx, "Function SetRootKey requires 1 parameters");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+
+//
+// Native method CreateKey
+//
+PR_STATIC_CALLBACK(JSBool)
+WinRegCreateKey(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 createKey ( String subKey,
+    //                         String className);
+
+    ConvertJSValToStr(b0, cx, argv[0]);
+    ConvertJSValToStr(b1, cx, argv[1]);
+
+    if(NS_OK != nativeThis->CreateKey(b0, b1, &nativeRet))
+    {
+      return JS_FALSE;
+    }
+
+    *rval = INT_TO_JSVAL(nativeRet);
+  }
+  else
+  {
+    JS_ReportError(cx, "WinReg.CreateKey() parameters error");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+//
+// Native method DeleteKey
+//
+PR_STATIC_CALLBACK(JSBool)
+WinRegDeleteKey(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsWinReg *nativeThis = (nsWinReg*)JS_GetPrivate(cx, obj);
+  PRInt32 nativeRet;
+  nsAutoString b0;
+
+  *rval = JSVAL_NULL;
+
+  // If there's no private data, this must be the prototype, so ignore
+  if(nsnull == nativeThis)
+  {
+    return JS_TRUE;
+  }
+
+  if(argc >= 1)                             
+  {
+    //  public int deleteKey ( String subKey);
+
+    ConvertJSValToStr(b0, cx, argv[0]);
+
+    if(NS_OK != nativeThis->DeleteKey(b0, &nativeRet))
+    {
+      return JS_FALSE;
+    }
+
+    *rval = INT_TO_JSVAL(nativeRet);
+  }
+  else
+  {
+    JS_ReportError(cx, "WinReg.DeleteKey() parameters error");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+
+//
+// Native method DeleteValue
+//
+PR_STATIC_CALLBACK(JSBool)
+WinRegDeleteValue(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsWinReg *nativeThis = (nsWinReg*)JS_GetPrivate(cx, obj);
+  PRInt32 nativeRet;
+  nsString b0;
+  nsString 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 deleteValue ( String subKey,
+    //                           String valueName);
+
+    ConvertJSValToStr(b0, cx, argv[0]);
+    ConvertJSValToStr(b1, cx, argv[1]);
+
+    if(NS_OK != nativeThis->DeleteValue(b0, b1, &nativeRet))
+    {
+      return JS_FALSE;
+    }
+
+    *rval = INT_TO_JSVAL(nativeRet);
+  }
+  else
+  {
+    JS_ReportError(cx, "WinReg.DeleteValue() parameters error");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+//
+// Native method SetValueString
+//
+PR_STATIC_CALLBACK(JSBool)
+WinRegSetValueString(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;
+
+  *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 setValueString ( String subKey,
+    //                              String valueName,
+    //                              String value);
+
+    ConvertJSValToStr(b0, cx, argv[0]);
+    ConvertJSValToStr(b1, cx, argv[1]);
+    ConvertJSValToStr(b2, cx, argv[2]);
+
+    if(NS_OK != nativeThis->SetValueString(b0, b1, b2, &nativeRet))
+    {
+      return JS_FALSE;
+    }
+
+    *rval = INT_TO_JSVAL(nativeRet);
+  }
+  else
+  {
+    JS_ReportError(cx, "WinReg.SetValueString() parameters error");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+//
+// Native method GetValueString
+//
+PR_STATIC_CALLBACK(JSBool)
+WinRegGetValueString(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsWinReg*    nativeThis = (nsWinReg*)JS_GetPrivate(cx, obj);
+  nsString     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 getValueString ( String subKey,
+    //                              String valueName);
+
+    ConvertJSValToStr(b0, cx, argv[0]);
+    ConvertJSValToStr(b1, cx, argv[1]);
+
+    if(NS_OK != nativeThis->GetValueString(b0, b1, &nativeRet))
+    {
+      return JS_FALSE;
+    }
+
+    ConvertStrToJSVal(nativeRet, cx, rval);
+  }
+  else
+  {
+    JS_ReportError(cx, "WinReg.GetValueString() parameters error");
+    return JS_FALSE;
+  }
+
+  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
+//
+PR_STATIC_CALLBACK(JSBool)
+WinRegSetValue(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsWinReg *nativeThis = (nsWinReg*)JS_GetPrivate(cx, obj);
+//  PRInt32 nativeRet;
+  nsAutoString b0;
+  nsAutoString b1;
+//  nsWinRegItem *b2;
+
+  *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 setValue ( String        subKey,
+    //                        String        valueName,
+    //                        nsWinRegItem  *value);
+
+    ConvertJSValToStr(b0, cx, argv[0]);
+    ConvertJSValToStr(b1, cx, argv[1]);
+
+    // fix: this parameter is an object, not a string.
+    // 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))
+//    {
+//      return JS_FALSE;
+//    }
+
+//    *rval = INT_TO_JSVAL(nativeRet);
+  }
+  else
+  {
+    JS_ReportError(cx, "WinReg.SetValue() parameters error");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+//
+// Native method GetValue
+//
+PR_STATIC_CALLBACK(JSBool)
+WinRegGetValue(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  nsWinReg      *nativeThis = (nsWinReg*)JS_GetPrivate(cx, obj);
+  nsWinRegValue *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 getValue ( String subKey,
+    //                        String valueName);
+
+    ConvertJSValToStr(b0, cx, argv[0]);
+    ConvertJSValToStr(b1, cx, argv[1]);
+
+    if(NS_OK != nativeThis->GetValue(b0, b1, &nativeRet))
+    {
+      return JS_FALSE;
+    }
+
+    *rval = INT_TO_JSVAL(nativeRet);
+  }
+  else
+  {
+    JS_ReportError(cx, "WinReg.GetValue() parameters error");
+    return JS_FALSE;
+  }
+
+  return JS_TRUE;
+}
+
+
+//
+// WinReg constructor
+//
+PR_STATIC_CALLBACK(JSBool)
+WinReg(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  return JS_FALSE;
+}
+
+
+/***********************************************************************/
+//
+// class for WinReg
+//
+JSClass WinRegClass = {
+  "WinReg",
+  JSCLASS_HAS_PRIVATE,
+  JS_PropertyStub,
+  JS_PropertyStub,
+  JS_PropertyStub,
+  JS_PropertyStub,
+  JS_EnumerateStub,
+  JS_ResolveStub,
+  JS_ConvertStub,
+  WinRegCleanup
+};
+
+static JSConstDoubleSpec winreg_constants[] = 
+{
+    { nsWinReg::HKEY_CLASSES_ROOT,           "HKEY_CLASSES_ROOT"            },
+    { nsWinReg::HKEY_CURRENT_USER,           "HKEY_CURRENT_USER"            },
+    { nsWinReg::HKEY_LOCAL_MACHINE,          "HKEY_LOCAL_MACHINE"           },
+    { nsWinReg::HKEY_USERS,                  "HKEY_USERS"                   },
+    {0}
+};
+
+//
+// WinReg class methods
+//
+static JSFunctionSpec WinRegMethods[] = 
+{
+  {"setRootKey",                WinRegSetRootKey,               1},
+  {"createKey",                 WinRegCreateKey,                2},
+  {"deleteKey",                 WinRegDeleteKey,                1},
+  {"deleteValue",               WinRegDeleteValue,              2},
+  {"setValueString",            WinRegSetValueString,           3},
+  {"getValueString",            WinRegGetValueString,           2},
+  {"setValueNumber",            WinRegSetValueNumber,           3},
+  {"getValueNumber",            WinRegGetValueNumber,           2},
+  {"setValue",                  WinRegSetValue,                 3},
+  {"getValue",                  WinRegGetValue,                 2},
+  {0}
+};
+
+PRInt32
+InitWinRegPrototype(JSContext *jscontext, JSObject *global, JSObject **winRegPrototype)
+{
+  *winRegPrototype = JS_InitClass( jscontext,         // context
+                                  global,            // global object
+                                  nsnull,            // parent proto 
+                                  &WinRegClass,      // JSClass
+                                  nsnull,            // JSNative ctor
+                                  0,                 // ctor args
+                                  nsnull,            // proto props
+                                  nsnull,            // proto funcs
+                                  nsnull,            // ctor props (static)
+                                  WinRegMethods);    // ctor funcs (static)
+
+  if(nsnull == *winRegPrototype) 
+  {
+    return NS_ERROR_FAILURE;
+  }
+
+  if(PR_FALSE == JS_DefineConstDoubles(jscontext, *winRegPrototype, winreg_constants))
+    return NS_ERROR_FAILURE;
+
+  return NS_OK;
+}

mozilla/xpinstall/src/nsJSWinReg.h

@@ -0,0 +1,29 @@
+/* -*- 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_JSWINREG_H__
+#define __NS_JSWINREG_H__
+
+PRInt32
+InitWinRegPrototype(JSContext *jscontext, JSObject *global, JSObject **winRegPrototype);
+
+#endif

mozilla/xpinstall/src/nsLoggingProgressNotifier.cpp

@@ -0,0 +1,198 @@
+/* -*- 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) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ *     Douglas Turner <dougt@netscape.com>
+ *     Pierre Phaneuf <pp@ludusdesign.com>
+ */
+
+#include "nsIXPINotifier.h"
+#include "nsLoggingProgressNotifier.h"
+
+#include "nsInstall.h"
+
+#include "nsFileSpec.h"
+#include "nsFileStream.h"
+#include "nsSpecialSystemDirectory.h"
+
+#include "nspr.h"
+
+
+
+nsLoggingProgressNotifier::nsLoggingProgressNotifier()
+    : mLogStream(0)
+{
+    NS_INIT_ISUPPORTS();
+}
+
+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_IMETHODIMP
+nsLoggingProgressNotifier::BeforeJavascriptEvaluation(const PRUnichar *URL)
+{
+    nsSpecialSystemDirectory logFile(nsSpecialSystemDirectory::OS_CurrentProcessDirectory);
+#ifdef XP_MAC
+    logFile += "Install Log";
+#else
+    logFile += "install.log";
+#endif
+
+    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)
+{
+    if (mLogStream == nsnull) return NS_ERROR_NULL_POINTER;
+    
+    char* time;
+    GetTime(&time);
+
+//    *mLogStream << nsEndl;
+    *mLogStream << "     Finished Installation  " << time << nsEndl << nsEndl;
+
+    PL_strfree(time);
+
+    mLogStream->close();
+    delete mLogStream;
+    mLogStream = nsnull;
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsLoggingProgressNotifier::InstallStarted(const PRUnichar *URL, const PRUnichar* 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;
+
+    *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 << nsEndl;
+
+    switch (status)
+    {
+    case nsInstall::SUCCESS:
+        *mLogStream << "     Install completed successfully" << nsEndl;
+        break;
+
+    case nsInstall::REBOOT_NEEDED:
+        *mLogStream << "     Install completed successfully, restart required" << nsEndl;
+        break;
+
+    case nsInstall::ABORT_INSTALL:
+        *mLogStream << "     Install script aborted" << nsEndl;
+        break;
+
+    case nsInstall::USER_CANCELLED:
+        *mLogStream << "     Install cancelled by user" << nsEndl;
+        break;
+
+    default:
+        *mLogStream << "     Install **FAILED** with error " << status << nsEndl;
+        break;
+    }
+
+    return NS_OK;
+}
+
+void 
+nsLoggingProgressNotifier::GetTime(char** aString)
+{
+    PRExplodedTime et;
+    char line[256];
+    PR_ExplodeTime(PR_Now(), PR_LocalTimeParameters, &et);
+    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

@@ -0,0 +1,51 @@
+/* -*- 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) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): 
+ *     Daniel Veditz <dveditz@netscape.com>
+ *     Douglas Turner <dougt@netscape.com>
+ */
+
+
+#ifndef nsLoggingProgressNotifier_H__
+#define nsLoggingProgressNotifier_H__
+
+#include "nsIXPINotifier.h"
+#include "nsFileStream.h"
+
+
+class nsLoggingProgressNotifier : public nsIXPINotifier
+{
+    public:
+        
+        nsLoggingProgressNotifier();
+        virtual ~nsLoggingProgressNotifier();
+        
+        NS_DECL_ISUPPORTS
+
+        // nsIXPINotifier interfaces
+        NS_DECL_NSIXPINOTIFIER
+   
+     private:
+        void GetTime(char** aString);
+        nsOutputFileStream  *mLogStream;
+};
+
+#endif

mozilla/xpinstall/src/nsSoftwareUpdate.cpp

@@ -0,0 +1,655 @@
+
+/* -*- 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.
+ *
+ * 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>
+ */
+
+
+#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 "VerReg.h"
+#include "nsSpecialSystemDirectory.h"
+
+#include "nsInstall.h"
+#include "nsSoftwareUpdateIIDs.h"
+#include "nsSoftwareUpdate.h"
+#include "nsSoftwareUpdateRun.h"
+#include "nsInstallTrigger.h"
+#include "nsInstallVersion.h"
+#include "ScheduledTasks.h"
+
+#include "nsTopProgressNotifier.h"
+#include "nsLoggingProgressNotifier.h"
+
+#include "nsIAppShellComponent.h"
+#include "nsIRegistry.h"
+#include "nsBuildID.h"
+
+/* For Javascript Namespace Access */
+#include "nsDOMCID.h"
+#include "nsIServiceManager.h"
+#include "nsINameSpaceManager.h"
+#include "nsIScriptObjectOwner.h"
+#include "nsIScriptGlobalObject.h"
+#include "nsIScriptNameSetRegistry.h"
+#include "nsIScriptNameSpaceManager.h"
+#include "nsIScriptExternalNameSet.h"
+
+#include "nsIEventQueueService.h"
+#include "nsProxyObjectManager.h"
+
+
+////////////////////////////////////////////////////////////////////////////////
+// Globals
+////////////////////////////////////////////////////////////////////////////////
+static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
+static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID);
+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(kIScriptExternalNameSetIID, NS_ISCRIPTEXTERNALNAMESET_IID);
+
+static NS_DEFINE_IID(kISoftwareUpdate_IID, NS_ISOFTWAREUPDATE_IID);
+
+static NS_DEFINE_IID(kIInstallTrigger_IID, NS_IDOMINSTALLTRIGGERGLOBAL_IID);
+static NS_DEFINE_CID(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;
+}
+
+
+
+nsSoftwareUpdate::nsSoftwareUpdate()
+: mInstalling(PR_FALSE),
+  mStubLockout(PR_FALSE),
+  mReg(0)
+{
+    NS_INIT_ISUPPORTS();
+
+    mLock = PR_NewLock();
+
+    /***************************************/
+    /* 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() );
+}
+
+
+
+
+
+nsSoftwareUpdate::~nsSoftwareUpdate()
+{
+    PR_Lock(mLock);
+
+    nsInstallInfo* element;
+    for (PRInt32 i=0; i < mJarInstallQueue.Count(); i++)
+    {
+        element = (nsInstallInfo*)mJarInstallQueue.ElementAt(i);
+        //FIX:  need to add to registry....
+        delete element;
+    }
+
+    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_IMETHODIMP
+nsSoftwareUpdate::QueryInterface( REFNSIID anIID, void **anInstancePtr )
+{
+    nsresult rv = NS_OK;
+    /* Check for place to return result. */
+    
+    if ( !anInstancePtr )
+    {
+        rv = NS_ERROR_NULL_POINTER;
+    }
+    else
+    {
+        /* 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
+        {
+            /* Not an interface we support. */
+            *anInstancePtr = 0;
+            rv = NS_NOINTERFACE;
+        }
+    }
+
+    if (NS_SUCCEEDED(rv))
+        NS_ADDREF_THIS();
+
+    return rv;
+}
+
+
+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);
+    
+#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;
+}
+
+NS_IMETHODIMP
+nsSoftwareUpdate::Shutdown()
+{
+#if NOTIFICATION_ENABLED
+    if (mUpdateNotifier)
+    {
+        mUpdateNotifier->DisplayUpdateDialog();
+        NS_RELEASE(mUpdateNotifier);
+    }
+#endif
+
+    // nothing to do here. Should we UnregisterService?
+    return NS_OK;
+}
+
+
+NS_IMETHODIMP 
+nsSoftwareUpdate::RegisterNotifier(nsIXPINotifier *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);
+    
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsSoftwareUpdate::GetMasterNotifier(nsIXPINotifier **notifier)
+{
+    NS_ASSERTION(notifier, "getter has invalid return pointer");
+    if (!notifier)
+        return NS_ERROR_NULL_POINTER;
+
+    *notifier = &mMasterNotifier;
+    return NS_OK;
+}
+
+
+NS_IMETHODIMP
+nsSoftwareUpdate::SetActiveNotifier(nsIXPINotifier *notifier)
+{
+    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 );
+    
+    if (!info)
+        return NS_ERROR_OUT_OF_MEMORY;
+
+    PR_Lock(mLock);
+    mJarInstallQueue.AppendElement( info );
+    PR_Unlock(mLock);
+    RunNextInstall();
+
+    return NS_OK;
+}
+
+
+NS_IMETHODIMP
+nsSoftwareUpdate::InstallJarCallBack()
+{
+    PR_Lock(mLock);
+
+    nsInstallInfo *nextInstall = (nsInstallInfo*)mJarInstallQueue.ElementAt(0);
+    if (nextInstall != nsnull)
+        delete nextInstall;
+
+    mJarInstallQueue.RemoveElementAt(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;
+
+    PR_Lock(mLock);
+    if (!mInstalling) 
+    {
+        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();
+        }
+    }
+    PR_Unlock(mLock);
+
+    // make sure to RunInstall() outside of locked section due to callbacks
+    if (info)
+        RunInstall( info );
+
+    return rv;
+}
+
+
+nsresult
+nsSoftwareUpdate::RegisterNameset()
+{
+    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_IMETHODIMP
+nsSoftwareUpdate::StubInitialize(nsIFileSpec *aDir)
+{
+    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))
+    {
+        VR_SetRegDirectory( path );
+        nsCRT::free( path );
+    }
+
+    return rv;
+}
+
+
+////////////////////////////////////////////////////////////////////////////////
+// nsSoftwareUpdateNameSet
+////////////////////////////////////////////////////////////////////////////////
+
+nsSoftwareUpdateNameSet::nsSoftwareUpdateNameSet()
+{
+    NS_INIT_ISUPPORTS();
+}
+
+nsSoftwareUpdateNameSet::~nsSoftwareUpdateNameSet()
+{
+}
+
+NS_IMPL_ISUPPORTS(nsSoftwareUpdateNameSet, kIScriptExternalNameSetIID);
+
+
+NS_IMETHODIMP
+nsSoftwareUpdateNameSet::InitializeClasses(nsIScriptContext* aScriptContext)
+{
+    nsresult result = NS_OK;
+
+    result = NS_InitInstallVersionClass(aScriptContext, nsnull);
+    if (NS_FAILED(result)) return result;
+
+    result = NS_InitInstallTriggerGlobalClass(aScriptContext, nsnull);
+
+    return result;
+}
+
+
+NS_IMETHODIMP
+nsSoftwareUpdateNameSet::AddNameSet(nsIScriptContext* aScriptContext)
+{
+    nsresult result = NS_OK;
+    nsIScriptNameSpaceManager* manager;
+
+    result = aScriptContext->GetNameSpaceManager(&manager);
+    if (NS_SUCCEEDED(result)) 
+    {
+        result = manager->RegisterGlobalName("InstallVersion", 
+                                             kInstallVersion_CID, 
+                                             PR_TRUE);
+        
+        if (NS_FAILED(result))  return result;
+        
+        result = manager->RegisterGlobalName("InstallTrigger", 
+                                             kInstallTrigger_CID, 
+                                             PR_FALSE);
+
+    }
+    
+    if (manager != nsnull)
+        NS_RELEASE(manager);
+
+    return result;
+}
+            
+//----------------------------------------------------------------------
+
+// Functions used to create new instances of a given object by the
+// generic factory.
+
+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)
+{
+    // get the registry
+    nsIRegistry* registry;
+    nsresult rv = nsServiceManager::GetService(NS_REGISTRY_PROGID,
+                                               NS_GET_IID(nsIRegistry),
+                                               (nsISupports**)&registry);
+    if ( NS_SUCCEEDED( rv ) ) 
+    {
+        registry->OpenWellKnownRegistry(nsIRegistry::ApplicationComponentRegistry);
+        char buffer[256];
+        char *cid = nsSoftwareUpdate::GetCID().ToString();
+        PR_snprintf( buffer,
+                     sizeof buffer,
+                     "%s/%s",
+                     NS_IAPPSHELLCOMPONENT_KEY,
+                     cid ? cid : "unknown" );
+        nsCRT::free(cid);
+
+        nsRegistryKey key;
+        rv = registry->AddSubtree( nsIRegistry::Common,
+                                   buffer,
+                                   &key );
+        nsServiceManager::ReleaseService(NS_REGISTRY_PROGID, registry);
+    }
+    return rv;
+
+}
+
+
+// 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)
+