Bug 883855 - Remove "URL Protocol" from some non-protocol keys in NSIS installer files, r=mcsmurf, a=Callek for CLOSED TREE
authorMasatoshi Kimura <VYV03354@nifty.ne.jp>
Mon, 01 Jul 2013 12:53:25 +0200
changeset 12666 9f7a9576623d57d2ef2f5e1d249f5b93e8f7d8e3
parent 12665 223efdc91d322cbe03c83f1af3e5ae028eb74e2b
child 12667 089f43fe715b9534f6602738b2d40c216efacd8b
push id9299
push usermcsmurf@mcsmurf.de
push dateMon, 01 Jul 2013 10:55:38 +0000
treeherdercomm-central@9f7a9576623d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmcsmurf, Callek
bugs883855
Bug 883855 - Remove "URL Protocol" from some non-protocol keys in NSIS installer files, r=mcsmurf, a=Callek for CLOSED TREE
suite/installer/windows/nsis/shared.nsh
--- a/suite/installer/windows/nsis/shared.nsh
+++ b/suite/installer/windows/nsis/shared.nsh
@@ -300,17 +300,17 @@
   StrCpy $2 "$\"$8$\" -url $\"%1$\""
   StrCpy $3 "$\"%1$\",,0,0,,,,"
 
   ; An empty string is used for the 5th param because SeaMonkeyHTML is not a
   ; protocol handler
   ${AddHandlerValues} "$0\SeaMonkeyHTML" "$2" \
                       "$INSTDIR\chrome\icons\default\html-file.ico,0" \
                       "${AppRegName} Document" "" ""
-  ${AddDDEHandlerValues} "SeaMonkeyURL" "$1" "$8,0" "${AppRegName} URL" "true" \
+  ${AddDDEHandlerValues} "SeaMonkeyURL" "$1" "$8,0" "${AppRegName} URL" "delete" \
                          "${DDEApplication}" "$3" "WWW_OpenURL"
 
   ; An empty string is used for the 4th & 5th params because the following
   ; protocol handlers already have a display name and additional keys required
   ; for a protocol handler.
   ${AddDDEHandlerValues} "ftp" "$1" "$8,0" "" "" "${DDEApplication}" "$3" "WWW_OpenURL"
   ${AddDDEHandlerValues} "http" "$1" "$8,0" "" "" "${DDEApplication}" "$3" "WWW_OpenURL"
   ${AddDDEHandlerValues} "https" "$1" "$8,0" "" "" "${DDEApplication}" "$3" "WWW_OpenURL"
@@ -348,17 +348,17 @@
   StrCpy $0 "SOFTWARE\Classes"
   StrCpy $1 "$\"$8$\" $\"%1$\""
   StrCpy $2 "$\"$8$\" -osint -compose $\"%1$\""
 
   ; An empty string is used for the 5th param because SeaMonkeyEML is not a
   ; protocol handler
   ${AddHandlerValues} "$0\SeaMonkeyEML"  "$1" "$INSTDIR\chrome\icons\default\misc-file.ico,0" "${AppRegNameMail} Document" "" ""
 
-  ${AddHandlerValues} "$0\SeaMonkeyCOMPOSE" "$2" "$8,0" "${AppRegNameMail} URL" "true" ""
+  ${AddHandlerValues} "$0\SeaMonkeyCOMPOSE" "$2" "$8,0" "${AppRegNameMail} URL" "delete" ""
 
   ; An empty string is used for the 4th & 5th params because the following
   ; protocol handler already has a display name and additional keys required
   ; for a protocol handler.
   ${AddHandlerValues} "$0\mailto" "$2" "$8,0" "${AppRegNameMail} URL" "true" ""
 
   ; Associate the file handlers with SeaMonkeyEML
   ReadRegStr $6 HKCR ".eml" ""
@@ -368,17 +368,17 @@
 !macroend
 !define SetHandlersMail "!insertmacro SetHandlersMail"
 
 !macro SetHandlersNews
   ${GetLongPath} "$INSTDIR\${FileMainEXE}" $8
   StrCpy $0 "SOFTWARE\Classes"
   StrCpy $1 "$\"$8$\" -osint -mail $\"%1$\""
 
-  ${AddHandlerValues} "$0\SeaMonkeyNEWS" "$1" "$8,0" "${AppRegNameNews} URL" "true" ""
+  ${AddHandlerValues} "$0\SeaMonkeyNEWS" "$1" "$8,0" "${AppRegNameNews} URL" "delete" ""
   ; An empty string is used for the 4th & 5th params because the following
   ; protocol handlers already have a display name and additional keys required
   ; for a protocol handler.
   ${AddHandlerValues} "$0\news"   "$1" "$8,0" "${AppRegNameNews} URL" "true" ""
   ${AddHandlerValues} "$0\nntp"   "$1" "$8,0" "${AppRegNameNews} URL" "true" ""
   ${AddHandlerValues} "$0\snews"  "$1" "$8,0" "${AppRegNameNews} URL" "true" ""
 !macroend
 !define SetHandlersNews "!insertmacro SetHandlersNews"
@@ -691,17 +691,17 @@
     ${AddHandlerValues} "$0\SeaMonkeyHTML" "$5" \
                         "$INSTDIR\chrome\icons\default\html-file.ico,0" \
                         "${AppRegName} Document" "" ""
   ${EndIf}
 
   ${IsHandlerForInstallDir} "SeaMonkeyURL" $R9
   ${If} "$R9" == "true"
     ${AddDDEHandlerValues} "SeaMonkeyURL" "$3" "$8,0" "${AppRegName} URL" \
-                           "true" "${DDEApplication}" "$4" "WWW_OpenURL"
+                           "delete" "${DDEApplication}" "$4" "WWW_OpenURL"
   ${EndIf}
 
   ${IsHandlerForInstallDir} "ftp" $R9
   ${If} "$R9" == "true"
     ${AddDDEHandlerValues} "ftp" "$3" "$8,0" "" "" "${DDEApplication}" \
                            "$4" "WWW_OpenURL"
   ${EndIf}
 
@@ -722,28 +722,28 @@
     ${AddHandlerValues} "SOFTWARE\Classes\SeaMonkeyEML" "$2" \
                         "$INSTDIR\chrome\icons\default\misc-file.ico,0" \
                         "${AppRegNameMail} Document" "" ""
   ${EndIf}
 
   ${IsHandlerForInstallDir} "SeaMonkeyMAIL" $R9
   ${If} "$R9" == "true"
     ${AddHandlerValues} "SOFTWARE\Classes\SeaMonkeyMAIL" "$2" "$8,0" \
-                        "${AppRegNameMail} URL" "true" ""
+                        "${AppRegNameMail} URL" "delete" ""
   ${EndIf}
 
   ${IsHandlerForInstallDir} "mailto" $R9
   ${If} "$R9" == "true"
     ${AddHandlerValues} "SOFTWARE\Classes\mailto" "$1" "$8,0" "" "" ""
   ${EndIf}
 
   ${IsHandlerForInstallDir} "SeaMonkeyNEWS" $R9
   ${If} "$R9" == "true"
     ${AddHandlerValues} "SOFTWARE\Classes\SeaMonkeyNEWS" "$2" "$8,0" \
-                        "${AppRegNameMail} URL" "true" ""
+                        "${AppRegNameMail} URL" "delete" ""
   ${EndIf}
 
   ${IsHandlerForInstallDir} "news" $R9
   ${If} "$R9" == "true"
     ${AddHandlerValues} "SOFTWARE\Classes\news" "$2" "$8,0" "" "" ""
   ${EndIf}
 
   ${IsHandlerForInstallDir} "snews" $R9
@@ -819,17 +819,17 @@
 
   ; Store the command to open the app with an url in a register for easy access.
   GetFullPathName $8 "$INSTDIR\${FileMainEXE}"
   StrCpy $1 "$\"$8$\" -requestPending -osint -url $\"%1$\""
   StrCpy $2 "$\"$8$\" -url $\"%1$\""
 
   ; Always set the file and protocol handlers since they may specify a
   ; different path and the path is used by Vista when setting associations.
-  ${AddHandlerValues} "$0\SeaMonkeyURL" "$1" "$8,0" "${AppRegName} URL" "true" "true"
+  ${AddHandlerValues} "$0\SeaMonkeyURL" "$1" "$8,0" "${AppRegName} URL" "delete" "true"
 
   ; An empty string is used for the 5th param because SeaMonkeyHTML is not a
   ; protocol handler
   ${AddHandlerValues} "$0\SeaMonkeyHTML" "$2" \
                       "$INSTDIR\chrome\icons\default\html-file.ico,0" \
                       "${AppRegName} Document" "" ""
 
   ReadRegStr $2 SHCTX "$0\http\shell\open\command" ""
@@ -852,32 +852,32 @@
   ${Unless} ${Errors}
     ${AddHandlerValues} "$0\ftp" "$1" "$8,0" "" "" "true"
   ${EndUnless}
 
   ; MAIL/NEWS part
   GetFullPathName $8 "$INSTDIR\${FileMainEXE}"
 
   StrCpy $1 "$\"$8$\" -compose $\"%1$\""
-  ${AddHandlerValues} "$0\SeaMonkeyCOMPOSE" "$1" "$8,0" "${AppRegNameMail} URL" "true" ""
+  ${AddHandlerValues} "$0\SeaMonkeyCOMPOSE" "$1" "$8,0" "${AppRegNameMail} URL" "delete" ""
 
   ReadRegStr $2 SHCTX "$0\mailto\shell\open\command" ""
   ${GetPathFromString} "$2" $3
   GetFullPathName $2 "$3"
   ClearErrors
   ${WordFind} "$2" "${FileMainEXE}" "E+1{" $R1
   ${Unless} ${Errors}
    ${AddHandlerValues} "$0\mailto" "$1" "$8,0" "" "" ""
   ${EndUnless}
 
   StrCpy $1 "$\"$8$\" $\"%1$\""
   ${AddHandlerValues} "$0\SeaMonkeyEML" "$1" "$INSTDIR\chrome\icons\default\misc-file.ico,0" "${AppRegNameMail} Document" "" ""
 
   StrCpy $1 "$\"$8$\" -osint -mail $\"%1$\""
-  ${AddHandlerValues} "$0\SeaMonkeyNEWS" "$1" "$8,0" "${AppRegNameNews} URL" "true" ""
+  ${AddHandlerValues} "$0\SeaMonkeyNEWS" "$1" "$8,0" "${AppRegNameNews} URL" "delete" ""
 
   ReadRegStr $2 SHCTX "$0\news\shell\open\command" ""
   ${GetPathFromString} "$2" $3
   GetFullPathName $2 "$3"
   ClearErrors
   ${WordFind} "$2" "${FileMainEXE}" "E+1{" $R1
   ${Unless} ${Errors}
     ${AddHandlerValues} "$0\news" "$1" "$8,0" "" "" ""