Bug 1318138 - Remove AddDDEHandlerValues macro from the installer now that it has no consumers. r=mhowell
authorRobert Strong <robert.bugzilla@gmail.com>
Wed, 07 Dec 2016 10:35:33 -1000
changeset 325391 928bb2ef0ef68cef61aa2e15d4d0d1861bcd0c73
parent 325390 2a0223e35b0e3102fcf31edaff48a7319eeed142
child 325392 d01ac7a95ee4a3e90280ef94551d9b70f5fc511b
push id24
push usermaklebus@msu.edu
push dateTue, 20 Dec 2016 03:11:33 +0000
reviewersmhowell
bugs1318138
milestone53.0a1
Bug 1318138 - Remove AddDDEHandlerValues macro from the installer now that it has no consumers. r=mhowell
toolkit/mozapps/installer/windows/nsis/common.nsh
--- a/toolkit/mozapps/installer/windows/nsis/common.nsh
+++ b/toolkit/mozapps/installer/windows/nsis/common.nsh
@@ -1287,179 +1287,16 @@
 
     !undef _MOZFUNC_UN
     !define _MOZFUNC_UN
     !verbose pop
   !endif
 !macroend
 
 /**
- * Writes common registry values for a handler that uses DDE using SHCTX.
- *
- * @param   _KEY
- *          The key name in relation to the HKCR root. SOFTWARE\Classes is
- *          prefixed to this value when using SHCTX.
- * @param   _VALOPEN
- *          The path and args to launch the application.
- * @param   _VALICON
- *          The path to the binary that contains the icon group for the default icon
- *          followed by a comma and either the icon group's resource index or the icon
- *          group's resource id prefixed with a minus sign
- * @param   _DISPNAME
- *          The display name for the handler. If emtpy no value will be set.
- * @param   _ISPROTOCOL
- *          Sets protocol handler specific registry values when "true".
- *          Deletes protocol handler specific registry values when "delete".
- *          Otherwise doesn't touch handler specific registry values.
- * @param   _DDE_APPNAME
- *          Sets DDE specific registry values when not an empty string.
- *
- * $R0 = storage for SOFTWARE\Classes
- * $R1 = string value of the current registry key path.
- * $R2 = _KEY
- * $R3 = _VALOPEN
- * $R4 = _VALICON
- * $R5 = _DISPNAME
- * $R6 = _ISPROTOCOL
- * $R7 = _DDE_APPNAME
- * $R8 = _DDE_DEFAULT
- * $R9 = _DDE_TOPIC
- */
-!macro AddDDEHandlerValues
-
-  !ifndef ${_MOZFUNC_UN}AddDDEHandlerValues
-    !verbose push
-    !verbose ${_MOZFUNC_VERBOSE}
-    !define ${_MOZFUNC_UN}AddDDEHandlerValues "!insertmacro ${_MOZFUNC_UN}AddDDEHandlerValuesCall"
-
-    Function ${_MOZFUNC_UN}AddDDEHandlerValues
-      Exch $R9
-      Exch 1
-      Exch $R8
-      Exch 2
-      Exch $R7
-      Exch 3
-      Exch $R6
-      Exch 4
-      Exch $R5
-      Exch 5
-      Exch $R4
-      Exch 6
-      Exch $R3
-      Exch 7
-      Exch $R2
-      Push $R1
-      Push $R0
-
-      StrCpy $R0 "SOFTWARE\Classes"
-      StrCmp "$R5" "" +6 +1
-      ReadRegStr $R1 SHCTX "$R2" "FriendlyTypeName"
-
-      StrCmp "$R1" "" +1 +3
-      WriteRegStr SHCTX "$R0\$R2" "" "$R5"
-      WriteRegStr SHCTX "$R0\$R2" "FriendlyTypeName" "$R5"
-
-      StrCmp "$R6" "true" +1 +2
-      WriteRegStr SHCTX "$R0\$R2" "URL Protocol" ""
-      StrCmp "$R6" "delete" +1 +2
-      DeleteRegValue SHCTX "$R0\$R2" "URL Protocol"
-      StrCpy $R1 ""
-      ReadRegDWord $R1 SHCTX "$R0\$R2" "EditFlags"
-      StrCmp $R1 "" +1 +3  ; Only add EditFlags if a value doesn't exist
-      DeleteRegValue SHCTX "$R0\$R2" "EditFlags"
-      WriteRegDWord SHCTX "$R0\$R2" "EditFlags" 0x00000002
-
-      StrCmp "$R4" "" +2 +1
-      WriteRegStr SHCTX "$R0\$R2\DefaultIcon" "" "$R4"
-
-      WriteRegStr SHCTX "$R0\$R2\shell" "" "open"
-      WriteRegStr SHCTX "$R0\$R2\shell\open\command" "" "$R3"
-
-      WriteRegStr SHCTX "$R0\$R2\shell\open\ddeexec" "" "$R8"
-      WriteRegStr SHCTX "$R0\$R2\shell\open\ddeexec" "NoActivateHandler" ""
-      WriteRegStr SHCTX "$R0\$R2\shell\open\ddeexec\Application" "" "$R7"
-      WriteRegStr SHCTX "$R0\$R2\shell\open\ddeexec\Topic" "" "$R9"
-
-      ; The ifexec key may have been added by another application so try to
-      ; delete it to prevent it from breaking this app's shell integration.
-      ; Also, IE 6 and below doesn't remove this key when it sets itself as the
-      ; default handler and if this key exists IE's shell integration breaks.
-      DeleteRegKey HKLM "$R0\$R2\shell\open\ddeexec\ifexec"
-      DeleteRegKey HKCU "$R0\$R2\shell\open\ddeexec\ifexec"
-      ClearErrors
-
-      Pop $R0
-      Pop $R1
-      Exch $R2
-      Exch 7
-      Exch $R3
-      Exch 6
-      Exch $R4
-      Exch 5
-      Exch $R5
-      Exch 4
-      Exch $R6
-      Exch 3
-      Exch $R7
-      Exch 2
-      Exch $R8
-      Exch 1
-      Exch $R9
-    FunctionEnd
-
-    !verbose pop
-  !endif
-!macroend
-
-!macro AddDDEHandlerValuesCall _KEY _VALOPEN _VALICON _DISPNAME _ISPROTOCOL _DDE_APPNAME _DDE_DEFAULT _DDE_TOPIC
-  !verbose push
-  !verbose ${_MOZFUNC_VERBOSE}
-  Push "${_KEY}"
-  Push "${_VALOPEN}"
-  Push "${_VALICON}"
-  Push "${_DISPNAME}"
-  Push "${_ISPROTOCOL}"
-  Push "${_DDE_APPNAME}"
-  Push "${_DDE_DEFAULT}"
-  Push "${_DDE_TOPIC}"
-  Call AddDDEHandlerValues
-  !verbose pop
-!macroend
-
-!macro un.AddDDEHandlerValuesCall _KEY _VALOPEN _VALICON _DISPNAME _ISPROTOCOL _DDE_APPNAME _DDE_DEFAULT _DDE_TOPIC
-  !verbose push
-  !verbose ${_MOZFUNC_VERBOSE}
-  Push "${_KEY}"
-  Push "${_VALOPEN}"
-  Push "${_VALICON}"
-  Push "${_DISPNAME}"
-  Push "${_ISPROTOCOL}"
-  Push "${_DDE_APPNAME}"
-  Push "${_DDE_DEFAULT}"
-  Push "${_DDE_TOPIC}"
-  Call un.AddDDEHandlerValues
-  !verbose pop
-!macroend
-
-!macro un.AddDDEHandlerValues
-  !ifndef un.AddDDEHandlerValues
-    !verbose push
-    !verbose ${_MOZFUNC_VERBOSE}
-    !undef _MOZFUNC_UN
-    !define _MOZFUNC_UN "un."
-
-    !insertmacro AddDDEHandlerValues
-
-    !undef _MOZFUNC_UN
-    !define _MOZFUNC_UN
-    !verbose pop
-  !endif
-!macroend
-
-/**
  * Writes common registry values for a handler that DOES NOT use DDE using SHCTX.
  *
  * @param   _KEY
  *          The key name in relation to the HKCR root. SOFTWARE\Classes is
  *          prefixed to this value when using SHCTX.
  * @param   _VALOPEN
  *          The path and args to launch the application.
  * @param   _VALICON