mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 460669 - Installing Firefox writes incorrect file paths to DefaultIcon and open command. r=jmathies
This commit is contained in:
parent
a2e9cf8763
commit
2770c712bb
@ -57,7 +57,8 @@ RequestExecutionLevel user
|
|||||||
!system 'echo ; > shortcuts.ini'
|
!system 'echo ; > shortcuts.ini'
|
||||||
!system 'echo ; > summary.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
|
!define USE_UAC_PLUGIN
|
||||||
|
|
||||||
Var TmpVal
|
Var TmpVal
|
||||||
@ -72,7 +73,6 @@ Var AddDesktopSC
|
|||||||
!include FileFunc.nsh
|
!include FileFunc.nsh
|
||||||
!include LogicLib.nsh
|
!include LogicLib.nsh
|
||||||
!include MUI.nsh
|
!include MUI.nsh
|
||||||
!include TextFunc.nsh
|
|
||||||
!include WinMessages.nsh
|
!include WinMessages.nsh
|
||||||
!include WinVer.nsh
|
!include WinVer.nsh
|
||||||
!include WordFunc.nsh
|
!include WordFunc.nsh
|
||||||
@ -83,11 +83,6 @@ Var AddDesktopSC
|
|||||||
!insertmacro StrFilter
|
!insertmacro StrFilter
|
||||||
!insertmacro WordReplace
|
!insertmacro WordReplace
|
||||||
|
|
||||||
; NSIS provided macros that we have overridden
|
|
||||||
!include overrides.nsh
|
|
||||||
!insertmacro LocateNoDetails
|
|
||||||
!insertmacro TextCompareNoDetails
|
|
||||||
|
|
||||||
; The following includes are custom.
|
; The following includes are custom.
|
||||||
!include branding.nsi
|
!include branding.nsi
|
||||||
!include defines.nsi
|
!include defines.nsi
|
||||||
@ -105,7 +100,6 @@ VIAddVersionKey "OriginalFilename" "setup.exe"
|
|||||||
!insertmacro ChangeMUIHeaderImage
|
!insertmacro ChangeMUIHeaderImage
|
||||||
!insertmacro CheckForFilesInUse
|
!insertmacro CheckForFilesInUse
|
||||||
!insertmacro CleanUpdatesDir
|
!insertmacro CleanUpdatesDir
|
||||||
!insertmacro CloseApp
|
|
||||||
!insertmacro CopyFilesFromDir
|
!insertmacro CopyFilesFromDir
|
||||||
!insertmacro CreateRegKey
|
!insertmacro CreateRegKey
|
||||||
!insertmacro GetPathFromString
|
!insertmacro GetPathFromString
|
||||||
@ -289,10 +283,9 @@ Section "-Application" APP_IDX
|
|||||||
ClearErrors
|
ClearErrors
|
||||||
ReadRegStr $R0 HKLM "Software\Apple Computer, Inc.\QuickTime" "InstallDir"
|
ReadRegStr $R0 HKLM "Software\Apple Computer, Inc.\QuickTime" "InstallDir"
|
||||||
${Unless} ${Errors}
|
${Unless} ${Errors}
|
||||||
Push $R0
|
${GetLongPath} $R0 "$R0"
|
||||||
${GetPathFromRegStr}
|
${Unless} $R0 == ""
|
||||||
Pop $R0
|
ClearErrors
|
||||||
${Unless} ${Errors}
|
|
||||||
GetFullPathName $R0 "$R0\Plugins\nsIQTScriptablePlugin.xpt"
|
GetFullPathName $R0 "$R0\Plugins\nsIQTScriptablePlugin.xpt"
|
||||||
${Unless} ${Errors}
|
${Unless} ${Errors}
|
||||||
${LogHeader} "Copying QuickTime Scriptable Component"
|
${LogHeader} "Copying QuickTime Scriptable Component"
|
||||||
@ -368,8 +361,12 @@ Section "-Application" APP_IDX
|
|||||||
${FixClassKeys}
|
${FixClassKeys}
|
||||||
|
|
||||||
; On install always add the FirefoxHTML and FirefoxURL keys.
|
; On install always add the FirefoxHTML and FirefoxURL keys.
|
||||||
; An empty string is used for the 5th param because FirefoxHTML is not a
|
; An empty string is used for the 5th param because FirefoxHTML and FirefoxURL
|
||||||
; protocol handler.
|
; 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" "" \
|
${AddDDEHandlerValues} "FirefoxHTML" "$2" "$8,1" "${AppRegName} Document" "" \
|
||||||
"${DDEApplication}" "$3" "WWW_OpenURL"
|
"${DDEApplication}" "$3" "WWW_OpenURL"
|
||||||
|
|
||||||
|
@ -52,7 +52,8 @@ RequestExecutionLevel user
|
|||||||
|
|
||||||
!addplugindir ./
|
!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
|
!define USE_UAC_PLUGIN
|
||||||
|
|
||||||
; prevents compiling of the reg write logging.
|
; prevents compiling of the reg write logging.
|
||||||
@ -65,7 +66,6 @@ Var TmpVal
|
|||||||
!include FileFunc.nsh
|
!include FileFunc.nsh
|
||||||
!include LogicLib.nsh
|
!include LogicLib.nsh
|
||||||
!include MUI.nsh
|
!include MUI.nsh
|
||||||
!include TextFunc.nsh
|
|
||||||
!include WinMessages.nsh
|
!include WinMessages.nsh
|
||||||
!include WinVer.nsh
|
!include WinVer.nsh
|
||||||
!include WordFunc.nsh
|
!include WordFunc.nsh
|
||||||
|
Loading…
Reference in New Issue
Block a user