wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 460669 - Installing Firefox writes incorrect file paths to DefaultIcon and open command. r=jmathies

Browse Source
This commit is contained in:
Robert Strong 2008-12-22 11:05:01 -08:00
parent a2e9cf8763
commit 2770c712bb
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
browser/installer/windows/nsis/installer.nsi
View File

@ -57,7 +57,8 @@ RequestExecutionLevel user
!system 'echo ; > shortcuts.ini'
!system 'echo ; > summary.ini'
; USE_UAC_PLUGIN is temporary until Thunderbird has been updated to use the UAC plugin
; USE_UAC_PLUGIN is temporary until all applications have been updated to use
; the UAC plugin
!define USE_UAC_PLUGIN
Var TmpVal
@ -72,7 +73,6 @@ Var AddDesktopSC
!include FileFunc.nsh
!include LogicLib.nsh
!include MUI.nsh
!include TextFunc.nsh
!include WinMessages.nsh
!include WinVer.nsh
!include WordFunc.nsh
@ -83,11 +83,6 @@ Var AddDesktopSC
!insertmacro StrFilter
!insertmacro WordReplace
; 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
@ -105,7 +100,6 @@ VIAddVersionKey "OriginalFilename" "setup.exe"
!insertmacro ChangeMUIHeaderImage
!insertmacro CheckForFilesInUse
!insertmacro CleanUpdatesDir
!insertmacro CloseApp
!insertmacro CopyFilesFromDir
!insertmacro CreateRegKey
!insertmacro GetPathFromString
@ -289,10 +283,9 @@ Section "-Application" APP_IDX
ClearErrors
ReadRegStr $R0 HKLM "Software\Apple Computer, Inc.\QuickTime" "InstallDir"
${Unless} ${Errors}
Push $R0
${GetPathFromRegStr}
Pop $R0
${Unless} ${Errors}
${GetLongPath} $R0 "$R0"
${Unless} $R0 == ""
ClearErrors
GetFullPathName $R0 "$R0\Plugins\nsIQTScriptablePlugin.xpt"
${Unless} ${Errors}
${LogHeader} "Copying QuickTime Scriptable Component"
@ -368,8 +361,12 @@ Section "-Application" APP_IDX
${FixClassKeys}
; On install always add the FirefoxHTML and FirefoxURL keys.
; An empty string is used for the 5th param because FirefoxHTML is not a
; protocol handler.
; An empty string is used for the 5th param because FirefoxHTML and FirefoxURL
; are not protocol handlers.
${GetLongPath} "$INSTDIR\${FileMainEXE}" $8
StrCpy $2 "$\"$8$\" -requestPending -osint -url $\"%1$\""
StrCpy $3 "$\"%1$\",,0,0,,,,"
${AddDDEHandlerValues} "FirefoxHTML" "$2" "$8,1" "${AppRegName} Document" "" \
"${DDEApplication}" "$3" "WWW_OpenURL"

4
browser/installer/windows/nsis/uninstaller.nsi
View File

@ -52,7 +52,8 @@ RequestExecutionLevel user
!addplugindir ./
; USE_UAC_PLUGIN is temporary until Thunderbird has been updated to use the UAC plugin
; USE_UAC_PLUGIN is temporary until all applications have been updated to use
; the UAC plugin
!define USE_UAC_PLUGIN
; prevents compiling of the reg write logging.
@ -65,7 +66,6 @@ Var TmpVal
!include FileFunc.nsh
!include LogicLib.nsh
!include MUI.nsh
!include TextFunc.nsh
!include WinMessages.nsh
!include WinVer.nsh
!include WordFunc.nsh