Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 357922 - Bookmarks missing, tabs broken, etc. (Firefox 2 install over Firefox 1.5.0.7 failed to replace some files.). r=sspitzer

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@215885 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rob_strong%exchangecode.com
2006-11-27 19:17:14 +00:00
parent f1cdc03bd4
commit 1ccee43519
5 changed files with 137 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
mozilla/browser/installer/windows/nsis/installer.nsi
View File

@@ -85,6 +85,11 @@ Var fhUninstallLog
!insertmacro DriveSpace
!insertmacro GetParent
; NSIS provided macros that we have overridden
!include overrides.nsh
!insertmacro LocateNoDetails
!insertmacro TextCompareNoDetails
; The following includes are custom.
!include branding.nsi
!include defines.nsi
@@ -100,13 +105,10 @@ Var fhUninstallLog
!insertmacro CreateRegKey
!insertmacro CanWriteToInstallDir
!insertmacro CheckDiskSpace
!insertmacro DisplayCopyErrMsg
!insertmacro GetExistingInstallPath
!insertmacro IsVista
!include overrides.nsh
!insertmacro LocateNoDetails
!insertmacro TextCompareNoDetails
Name "${BrandFullName}"
OutFile "setup.exe"
InstallDirRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${BrandFullNameInternal} (${AppVersion})" "InstallLocation"
@@ -191,8 +193,9 @@ Section "-Application" Section1
SetDetailsPrint none
SetOutPath $INSTDIR
; Try to delete the app executable and if we can't delete it try to close the
; app. This allows running an instance that is located in another directory.
; Try to delete the app's main executable and if we can't delete it try to
; close the app. This allows running an instance that is located in another
; directory and prevents the launching of the app during the installation.
ClearErrors
${If} ${FileExists} "$INSTDIR\${FileMainEXE}"
${DeleteFile} "$INSTDIR\${FileMainEXE}"
@@ -202,8 +205,21 @@ Section "-Application" Section1
${CloseApp} "true" $(WARN_APP_RUNNING_INSTALL)
; Try to delete it again to prevent launching the app while we are
; installing.
${DeleteFile} "$INSTDIR\${FileMainEXE}"
ClearErrors
${DeleteFile} "$INSTDIR\${FileMainEXE}"
${If} ${Errors}
ClearErrors
; Try closing the app a second time
${CloseApp} "true" $(WARN_APP_RUNNING_INSTALL)
retry:
ClearErrors
${DeleteFile} "$INSTDIR\${FileMainEXE}"
${If} ${Errors}
; Fallback to the FileError_NoIgnore error with retry/cancel options
${DisplayCopyErrMsg} "${FileMainEXE}"
GoTo retry
${EndIf}
${EndIf}
${EndIf}
; During an install Vista checks if a new entry is added under the uninstall
@@ -844,12 +860,16 @@ FunctionEnd
Function CopyFile
StrCpy $R3 $R8 "" $R2
retry:
ClearErrors
${If} $R6 == ""
${Unless} ${FileExists} "$R1$R3\$R7"
ClearErrors
CreateDirectory "$R1$R3\$R7"
${If} ${Errors}
${LogMsg} "** ERROR Creating Directory: $R1$R3\$R7 **"
${DisplayCopyErrMsg} "$R7"
GoTo retry
${Else}
${LogMsg} "Created Directory: $R1$R3\$R7"
${EndIf}
@@ -860,18 +880,25 @@ Function CopyFile
CreateDirectory "$R1$R3"
${If} ${Errors}
${LogMsg} "** ERROR Creating Directory: $R1$R3 **"
${DisplayCopyErrMsg} "$R3"
GoTo retry
${Else}
${LogMsg} "Created Directory: $R1$R3"
${EndIf}
${EndUnless}
${If} ${FileExists} "$R1$R3\$R7"
Delete "$R1$R3\$R7"
${If} ${Errors}
${DisplayCopyErrMsg} "$R7"
GoTo retry
${EndIf}
${EndIf}
ClearErrors
CopyFiles /SILENT $R9 "$R1$R3"
${If} ${Errors}
; XXXrstrong - what should we do if there is an error installing a file?
${LogMsg} "** ERROR Installing File: $R1$R3\$R7 **"
${DisplayCopyErrMsg} "$R7"
GoTo retry
${Else}
${LogMsg} "Installed File: $R1$R3\$R7"
${EndIf}
@@ -1200,6 +1227,7 @@ Function .onInit
ReadINIStr $0 $R1 "Install" "CloseAppNoPrompt"
${If} $0 == "true"
; Try to close the app if the exe is in use.
ClearErrors
${If} ${FileExists} "$INSTDIR\${FileMainEXE}"
${DeleteFile} "$INSTDIR\${FileMainEXE}"
@@ -1207,7 +1235,18 @@ Function .onInit
${If} ${Errors}
ClearErrors
${CloseApp} "false" ""
ClearErrors
${DeleteFile} "$INSTDIR\${FileMainEXE}"
; If unsuccessful try one more time and if it still fails Quit
${If} ${Errors}
ClearErrors
${CloseApp} "false" ""
ClearErrors
${DeleteFile} "$INSTDIR\${FileMainEXE}"
${If} ${Errors}
Quit
${EndIf}
${EndIf}
${EndIf}
${EndIf}

9
mozilla/browser/installer/windows/nsis/uninstaller.nsi
View File

@@ -374,8 +374,15 @@ Function un.preInstFiles
ClearErrors
${un.CloseApp} "true" $(WARN_APP_RUNNING_UNINSTALL)
; Delete the app exe to prevent launching the app while we are uninstalling.
${DeleteFile} "$INSTDIR\${FileMainEXE}"
ClearErrors
${DeleteFile} "$INSTDIR\${FileMainEXE}"
${If} ${Errors}
ClearErrors
${un.CloseApp} "true" $(WARN_APP_RUNNING_UNINSTALL)
ClearErrors
; Try one more time and if that fails uninstall what ever we are able to.
${DeleteFile} "$INSTDIR\${FileMainEXE}"
${EndIf}
${EndIf}
FunctionEnd

85
mozilla/toolkit/mozapps/installer/windows/nsis/common.nsh
View File

@@ -1044,13 +1044,16 @@ Exch $R9 ; exchange the new $R9 value with the top of the stack
/**
* Posts WM_QUIT to the application's message window which is found using the
* message window's class.
* message window's class. This macro uses the nsProcess plugin available
* from http://nsis.sourceforge.net/NsProcess_plugin
*
* @param _MSG
* The message text to display in the message box.
* @param _PROMPT
* If false don't prompt the user and automatically exit the
* application if it is running.
*
* $R6 = return value for nsProcess::_FindProcess and nsProcess::_KillProcess
* $R7 = value returned from FindWindow
* $R8 = _PROMPT
* $R9 = _MSG
@@ -1067,23 +1070,42 @@ Exch $R9 ; exchange the new $R9 value with the top of the stack
Exch 1
Exch $R8
Push $R7
Push $R6
loop:
FindWindow $R7 "${WindowClass}"
IntCmp $R7 0 end
Push $R6
nsProcess::_FindProcess /NOUNLOAD "${FileMainEXE}"
Pop $R6
StrCmp $R6 0 0 end
StrCmp $R8 "false" +2 0
MessageBox MB_OKCANCEL|MB_ICONQUESTION "$R9" IDCANCEL exit 0
FindWindow $R7 "${WindowClass}"
IntCmp $R7 0 +4
System::Call 'user32::PostMessage(i r17, i ${WM_QUIT}, i 0, i 0)'
# The amount of time to wait for the app to shutdown before prompting again
Sleep 4000
Sleep 5000
Push $R6
nsProcess::_FindProcess /NOUNLOAD "${FileMainEXE}"
Pop $R6
StrCmp $R6 0 0 end
Push $R6
nsProcess::_KillProcess /NOUNLOAD "${FileMainEXE}"
Pop $R6
Sleep 2000
Goto loop
exit:
nsProcess::_Unload
Quit
end:
nsProcess::_Unload
Pop $R6
Pop $R7
Exch $R8
Exch 1
@@ -1769,3 +1791,58 @@ Exch $R9 ; exchange the new $R9 value with the top of the stack
!endif
!macroend
/**
* Displays a error message when a file can't be copied.
*
* $0 = file name inserted into the error message
*/
!macro DisplayCopyErrMsg
!ifndef ${_MOZFUNC_UN}DisplayCopyErrMsg
!verbose push
!verbose ${_MOZFUNC_VERBOSE}
!define ${_MOZFUNC_UN}DisplayCopyErrMsg "!insertmacro ${_MOZFUNC_UN}DisplayCopyErrMsgCall"
Function ${_MOZFUNC_UN}DisplayCopyErrMsg
Exch $0
MessageBox MB_RETRYCANCEL|MB_ICONQUESTION "$(^FileError_NoIgnore)" IDRETRY +2
Quit
Exch $0
FunctionEnd
!verbose pop
!endif
!macroend
!macro DisplayCopyErrMsgCall _FILE
!verbose push
!verbose ${_MOZFUNC_VERBOSE}
Push "${_FILE}"
Call DisplayCopyErrMsg
!verbose pop
!macroend
!macro un.DisplayCopyErrMsgCall _FILE
!verbose push
!verbose ${_MOZFUNC_VERBOSE}
Push "${_FILE}"
Call un.DisplayCopyErrMsg
!verbose pop
!macroend
!macro un.DisplayCopyErrMsg
!ifndef un.DisplayCopyErrMsg
!verbose push
!verbose ${_MOZFUNC_VERBOSE}
!undef _MOZFUNC_UN
!define _MOZFUNC_UN "un."
!insertmacro DisplayCopyErrMsg
!undef _MOZFUNC_UN
!define _MOZFUNC_UN
!verbose pop
!endif
!macroend

1
mozilla/toolkit/mozapps/installer/windows/nsis/makensis.mk
View File

@@ -48,6 +48,7 @@ SFX_MODULE ?= $(error SFX_MODULE is not defined)
TOOLKIT_NSIS_FILES = \
common.nsh \
locales.nsi \
nsProcess.dll \
overrides.nsh \
ShellLink.dll \
version.nsh \

BIN
mozilla/toolkit/mozapps/installer/windows/nsis/nsProcess.dll Executable file
View File

Binary file not shown.