Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 882624 - Remove "URL Protocol" from FirefoxURL key. r=bbondy

Browse Source
This commit is contained in:
Masatoshi Kimura 2013-06-17 23:08:55 +09:00
parent 823b717452
commit 387c6c93dc
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -341,7 +341,7 @@ Section "-Application" APP_IDX
${AddDisabledDDEHandlerValues} "FirefoxHTML" "$2" "$8,1" \
"${AppRegName} Document" ""
${AddDisabledDDEHandlerValues} "FirefoxURL" "$2" "$8,1" "${AppRegName} URL" \
"true"
"delete"
; For pre win8, the following keys should only be set if we can write to HKLM.
; For post win8, the keys below get set in both HKLM and HKCU.

4
browser/installer/windows/nsis/shared.nsh
View File

@ -412,7 +412,7 @@ FunctionEnd
"${AppRegName} HTML Document" ""
${AddDisabledDDEHandlerValues} "FirefoxURL" "$2" "$8,1" "${AppRegName} URL" \
"true"
"delete"
Call RegisterCEH
; An empty string is used for the 4th & 5th params because the following
@ -650,7 +650,7 @@ FunctionEnd
${IsHandlerForInstallDir} "FirefoxURL" $R9
${If} "$R9" == "true"
${AddDisabledDDEHandlerValues} "FirefoxURL" "$2" "$8,1" \
"${AppRegName} URL" "true"
"${AppRegName} URL" "delete"
${EndIf}
; An empty string is used for the 4th & 5th params because the following

2
toolkit/mozapps/installer/windows/nsis/common.nsh
View File

@ -1495,6 +1495,8 @@
StrCmp "$R9" "true" +1 +2
WriteRegStr SHCTX "$R3\$R5" "URL Protocol" ""
StrCmp "$R9" "delete" +1 +2
DeleteRegValue SHCTX "$R3\$R5" "URL Protocol"
StrCpy $R4 ""
ReadRegDWord $R4 SHCTX "$R3\$R5" "EditFlags"
StrCmp $R4 "" +1 +3 ; Only add EditFlags if a value doesn't exist