Bug 470799 - Remove deprecated macros that are no longer in use. r=jmathies
authorRobert Strong <robert.bugzilla@gmail.com>
Wed, 14 Jan 2009 14:21:12 -0800
changeset 23687 068efdff925f1e31000258c35705824c9049862f
parent 23686 e943eef4d58a87080af2655aa7580a00bf7facaa
child 23688 2326e07bb2a72471bb7c8790cbf9bf9882a0b747
push id4680
push userrstrong@mozilla.com
push dateWed, 14 Jan 2009 22:21:50 +0000
treeherdermozilla-central@068efdff925f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmathies
bugs470799
milestone1.9.2a1pre
Bug 470799 - Remove deprecated macros that are no longer in use. r=jmathies
toolkit/mozapps/installer/windows/nsis/common.nsh
--- a/toolkit/mozapps/installer/windows/nsis/common.nsh
+++ b/toolkit/mozapps/installer/windows/nsis/common.nsh
@@ -413,429 +413,16 @@
   FileClose $R9
   WriteIniStr "$PLUGINSDIR\${_FILE}" "Settings" "RTL" "$(^RTL)"
 
   Pop $R9
 !macroend
 
 
 ################################################################################
-# Macros for creating Install Options ini files
-#
-# DEPRECATED - all ini creation code should be added to the application's
-# installer and uninstaller files.
-
-!macro createComponentsINI
-  WriteINIStr "$PLUGINSDIR\components.ini" "Settings" NumFields "5"
-
-  WriteINIStr "$PLUGINSDIR\components.ini" "Field 1" Type   "label"
-  WriteINIStr "$PLUGINSDIR\components.ini" "Field 1" Text   "$(OPTIONAL_COMPONENTS_LABEL)"
-  WriteINIStr "$PLUGINSDIR\components.ini" "Field 1" Left   "0"
-  WriteINIStr "$PLUGINSDIR\components.ini" "Field 1" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\components.ini" "Field 1" Top    "5"
-  WriteINIStr "$PLUGINSDIR\components.ini" "Field 1" Bottom "15"
-
-  ${If} ${FileExists} "$EXEDIR\optional\extensions\inspector@mozilla.org"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field 2" Type   "checkbox"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field 2" Text   "$(DOMI_TITLE)"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field 2" Left   "15"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field 2" Right  "-1"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field 2" Top    "20"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field 2" Bottom "30"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field 2" State  "1"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field 2" Flags  "GROUP"
-  ${EndIf}
-
-  ${If} ${FileExists} "$EXEDIR\optional\extensions\inspector@mozilla.org"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field 3" Type   "label"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field 3" Text   "$(DOMI_TEXT)"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field 3" Left   "30"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field 3" Right  "-1"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field 3" Top    "32"
-    WriteINIStr "$PLUGINSDIR\components.ini" "Field 3" Bottom "52"
-  ${EndIf}
-!macroend
-
-!macro createShortcutsINI
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Settings" NumFields "4"
-
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Type   "label"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Text   "$(CREATE_ICONS_DESC)"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Left   "0"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Top    "5"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Bottom "15"
-
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" Type   "checkbox"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" Text   "$(ICONS_DESKTOP)"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" Left   "15"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" Top    "20"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" Bottom "30"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" State  "1"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" Flags  "GROUP"
-
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Type   "checkbox"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Text   "$(ICONS_STARTMENU)"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Left   "15"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Top    "40"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Bottom "50"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" State  "1"
-
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" Type   "checkbox"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" Text   "$(ICONS_QUICKLAUNCH)"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" Left   "15"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" Top    "60"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" Bottom "70"
-  WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" State  "1"
-!macroend
-
-!macro createBasicCustomOptionsINI
-  WriteINIStr "$PLUGINSDIR\options.ini" "Settings" NumFields "5"
-
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Type   "label"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Text   "$(OPTIONS_SUMMARY)"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Left   "0"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Top    "0"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Bottom "10"
-
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Type   "RadioButton"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Text   "$(OPTION_STANDARD_RADIO)"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Left   "15"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Top    "25"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Bottom "35"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" State  "1"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Flags  "GROUP"
-
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Type   "RadioButton"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Text   "$(OPTION_CUSTOM_RADIO)"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Left   "15"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Top    "55"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Bottom "65"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" State  "0"
-
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Type   "label"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Text   "$(OPTION_STANDARD_DESC)"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Left   "30"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Top    "37"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Bottom "57"
-
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Type   "label"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Text   "$(OPTION_CUSTOM_DESC)"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Left   "30"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Top    "67"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Bottom "87"
-!macroend
-
-!macro createBasicCompleteCustomOptionsINI
-  WriteINIStr "$PLUGINSDIR\options.ini" "Settings" NumFields "7"
-
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Type   "label"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Text   "$(OPTIONS_DESC)"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Left   "0"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Top    "0"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Bottom "10"
-
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Type   "RadioButton"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Text   "$(OPTION_STANDARD_RADIO)"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Left   "15"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Top    "25"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Bottom "35"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" State  "1"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Flags  "GROUP"
-
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Type   "RadioButton"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Text   "$(OPTION_COMPLETE_RADIO)"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Left   "15"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Top    "55"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Bottom "65"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" State  "0"
-
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Type   "RadioButton"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Text   "$(OPTION_CUSTOM_RADIO)"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Left   "15"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Top    "85"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Bottom "95"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" State  "0"
-
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Type   "label"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Text   "$(OPTION_STANDARD_DESC)"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Left   "30"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Top    "37"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Bottom "57"
-
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 6" Type   "label"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 6" Text   "$(OPTION_COMPLETE_DESC)"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 6" Left   "30"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 6" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 6" Top    "67"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 6" Bottom "87"
-
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 7" Type   "label"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 7" Text   "$(OPTION_CUSTOM_DESC)"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 7" Left   "30"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 7" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 7" Top    "97"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 7" Bottom "117"
-!macroend
-
-!macro createBasicCustomSetAsDefaultOptionsINI
-  WriteINIStr "$PLUGINSDIR\options.ini" "Settings" NumFields "6"
-
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Type   "label"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Text   "$(OPTIONS_SUMMARY)"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Left   "0"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Top    "0"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Bottom "10"
-
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Type   "RadioButton"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Text   "$(OPTION_STANDARD_RADIO)"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Left   "15"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Top    "25"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Bottom "35"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" State  "1"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Flags  "GROUP"
-
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Type   "RadioButton"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Text   "$(OPTION_CUSTOM_RADIO)"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Left   "15"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Top    "55"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Bottom "65"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" State  "0"
-
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Type   "label"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Text   "$(OPTION_STANDARD_DESC)"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Left   "30"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Top    "37"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Bottom "57"
-
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Type   "label"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Text   "$(OPTION_CUSTOM_DESC)"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Left   "30"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Top    "67"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Bottom "87"
-
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 6" Type   "checkbox"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 6" Text   "$(OPTIONS_MAKE_DEFAULT)"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 6" Left   "0"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 6" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 6" Top    "124"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 6" Bottom "145"
-  WriteINIStr "$PLUGINSDIR\options.ini" "Field 6" State  "1"
-!macroend
-
-!macro createSummaryINI
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Settings" NumFields "3"
-
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 1" Type   "label"
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 1" Text   "$(SUMMARY_INSTALLED_TO)"
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 1" Left   "0"
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 1" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 1" Top    "5"
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 1" Bottom "15"
-
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 2" Type   "text"
-  ; The contents of this control must be set as follows in the pre function
-  ; ${MUI_INSTALLOPTIONS_READ} $1 "summary.ini" "Field 2" "HWND"
-  ; SendMessage $1 ${WM_SETTEXT} 0 "STR:$INSTDIR"
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 2" state  ""
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 2" Left   "0"
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 2" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 2" Top    "17"
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 2" Bottom "30"
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 2" flags  "READONLY"
-
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 3" Type   "label"
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 3" Text   "$(SUMMARY_CLICK)"
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 3" Left   "0"
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 3" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 3" Top    "130"
-  WriteINIStr "$PLUGINSDIR\summary.ini" "Field 3" Bottom "150"
-
-  ${If} "$TmpVal" == "true"
-    WriteINIStr "$PLUGINSDIR\summary.ini" "Field 4" Type   "label"
-    WriteINIStr "$PLUGINSDIR\summary.ini" "Field 4" Text   "$(SUMMARY_REBOOT_REQUIRED_INSTALL)"
-    WriteINIStr "$PLUGINSDIR\summary.ini" "Field 4" Left   "0"
-    WriteINIStr "$PLUGINSDIR\summary.ini" "Field 4" Right  "-1"
-    WriteINIStr "$PLUGINSDIR\summary.ini" "Field 4" Top    "35"
-    WriteINIStr "$PLUGINSDIR\summary.ini" "Field 4" Bottom "45"
-
-    WriteINIStr "$PLUGINSDIR\summary.ini" "Settings" NumFields "4"
-  ${EndIf}
-
-  ReadINIStr $0 "$PLUGINSDIR\options.ini" "Field 6" "State"
-  ${If} "$0" == "1"
-    ${If} "$TmpVal" == "true"
-      ; To insert this control reset Top / Bottom for controls below this one
-      WriteINIStr "$PLUGINSDIR\summary.ini" "Field 4" Top    "50"
-      WriteINIStr "$PLUGINSDIR\summary.ini" "Field 4" Bottom "60"
-      StrCpy $0 "5"
-    ${Else}
-      StrCpy $0 "4"
-    ${EndIf}
-
-    WriteINIStr "$PLUGINSDIR\summary.ini" "Field $0" Type   "label"
-    WriteINIStr "$PLUGINSDIR\summary.ini" "Field $0" Text   "$(SUMMARY_MAKE_DEFAULT)"
-    WriteINIStr "$PLUGINSDIR\summary.ini" "Field $0" Left   "0"
-    WriteINIStr "$PLUGINSDIR\summary.ini" "Field $0" Right  "-1"
-    WriteINIStr "$PLUGINSDIR\summary.ini" "Field $0" Top    "35"
-    WriteINIStr "$PLUGINSDIR\summary.ini" "Field $0" Bottom "45"
-
-    WriteINIStr "$PLUGINSDIR\summary.ini" "Settings" NumFields "$0"
-  ${EndIf}
-!macroend
-
-!macro un.createUnConfirmINI
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Settings" NumFields "5"
-
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 1" Type   "label"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 1" Text   "$(UN_CONFIRM_UNINSTALLED_FROM)"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 1" Left   "0"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 1" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 1" Top    "5"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 1" Bottom "15"
-
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 2" Type   "text"
-  ; The contents of this control must be set as follows in the pre function
-  ; ${MUI_INSTALLOPTIONS_READ} $1 "unconfirm.ini" "Field 2" "HWND"
-  ; SendMessage $1 ${WM_SETTEXT} 0 "STR:$INSTDIR"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 2" State  ""
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 2" Left   "0"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 2" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 2" Top    "17"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 2" Bottom "30"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 2" flags  "READONLY"
-
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 3" Type   "checkbox"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 3" Text   "$(UN_REMOVE_PROFILES)"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 3" Left   "0"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 3" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 3" Top    "40"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 3" Bottom "50"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 3" State  "0"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 3" flags  "NOTIFY"
-
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 4" Type   "text"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 4" State   "$(UN_REMOVE_PROFILES_DESC)"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 4" Left   "0"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 4" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 4" Top    "52"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 4" Bottom "120"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 4" flags  "MULTILINE|READONLY"
-
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 5" Type   "label"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 5" Text   "$(UN_CONFIRM_CLICK)"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 5" Left   "0"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 5" Right  "-1"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 5" Top    "130"
-  WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 5" Bottom "150"
-
-  ${If} "$TmpVal" == "true"
-    WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 6" Type   "label"
-    WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 6" Text   "$(SUMMARY_REBOOT_REQUIRED_UNINSTALL)"
-    WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 6" Left   "0"
-    WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 6" Right  "-1"
-    WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 6" Top    "35"
-    WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 6" Bottom "45"
-
-    WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Settings" NumFields "6"
-
-    ; To insert this control reset Top / Bottom for controls below this one
-    WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 3" Top    "55"
-    WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 3" Bottom "65"
-    WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 4" Top    "67"
-  ${EndIf}
-!macroend
-
-/**
- * DEPRECATED - use GetParent instead.
- */
-!macro GetParentDir
-  Exch $R0
-  Push $R1
-  Push $R2
-  Push $R3
-  StrLen $R3 $R0
-  ${DoWhile} 1 > 0
-    IntOp $R1 $R1 - 1
-    ${If} $R1 <= -$R3
-      ${Break}
-    ${EndIf}
-    StrCpy $R2 $R0 1 $R1
-    ${If} $R2 == "\"
-      ${Break}
-    ${EndIf}
-  ${Loop}
-
-  StrCpy $R0 $R0 $R1
-  Pop $R3
-  Pop $R2
-  Pop $R1
-  Exch $R0
-!macroend
-!define GetParentDir "!insertmacro GetParentDir"
-
-/**
- * DEPRECATED - use GetPathFromString and RemoveQuotesFromPath
- *
- * Removes quotes and trailing path separator from registry string paths.
- * @param   $R0
- *          Contains the registry string
- * @return  Modified string at the top of the stack.
- */
-!macro GetPathFromRegStr
-  Exch $R0
-  Push $R8
-  Push $R9
-
-  StrCpy $R9 "$R0" "" -1
-  StrCmp $R9 '"' +2 0
-  StrCmp $R9 "'" 0 +2
-  StrCpy $R0 "$R0" -1
-
-  StrCpy $R9 "$R0" 1
-  StrCmp $R9 '"' +2 0
-  StrCmp $R9 "'" 0 +2
-  StrCpy $R0 "$R0" "" 1
-
-  StrCpy $R9 "$R0" "" -1
-  StrCmp $R9 "\" 0 +2
-  StrCpy $R0 "$R0" -1
-
-  ClearErrors
-  GetFullPathName $R8 $R0
-  IfErrors +2 0
-  StrCpy $R0 $R8
-
-  ClearErrors
-  Pop $R9
-  Pop $R8
-  Exch $R0
-!macroend
-!define GetPathFromRegStr "!insertmacro GetPathFromRegStr"
-
-
-################################################################################
 # Macros for handling files in use
 
 /**
  * Checks for files in use in the $INSTDIR directory. To check files in
  * sub-directories this macro would need to be rewritten to create
  * sub-directories in the temporary directory used to backup the files that are
  * checked.
  *