Bug 627848 - Start menu shortcut isn't migrated as implemented in bug 598779. r=Mossop, a=blocking2.0-betaN
authorRobert Strong <robert.bugzilla@gmail.com>
Fri, 21 Jan 2011 15:22:34 -0600
changeset 61114 02d2bfb6af2d1824f54fdb1ce0406ca280de2689
parent 61113 84ed248b728db45455ebc54179dbb4d314a689cb
child 61115 16bd82195df8b677ee813a6dc02690a8883fdc5d
push idunknown
push userunknown
push dateunknown
reviewersMossop, blocking2
bugs627848, 598779
milestone2.0b10pre
Bug 627848 - Start menu shortcut isn't migrated as implemented in bug 598779. r=Mossop, a=blocking2.0-betaN
browser/installer/windows/nsis/installer.nsi
browser/installer/windows/nsis/shared.nsh
browser/installer/windows/nsis/uninstaller.nsi
--- a/browser/installer/windows/nsis/installer.nsi
+++ b/browser/installer/windows/nsis/installer.nsi
@@ -100,17 +100,16 @@ VIAddVersionKey "OriginalFilename" "setu
 !insertmacro _LoggingCommon
 
 !insertmacro AddDDEHandlerValues
 !insertmacro ChangeMUIHeaderImage
 !insertmacro CheckForFilesInUse
 !insertmacro CleanUpdatesDir
 !insertmacro CopyFilesFromDir
 !insertmacro CreateRegKey
-!insertmacro FindSMProgramsDir
 !insertmacro GetPathFromString
 !insertmacro GetParent
 !insertmacro IsHandlerForInstallDir
 !insertmacro LogDesktopShortcut
 !insertmacro LogQuickLaunchShortcut
 !insertmacro LogStartMenuShortcut
 !insertmacro ManualCloseAppPrompt
 !insertmacro RegCleanAppHandler
--- a/browser/installer/windows/nsis/shared.nsh
+++ b/browser/installer/windows/nsis/shared.nsh
@@ -621,25 +621,25 @@
 ; application's Start Menu Programs directory exists with a shortcut pointing to
 ; this installation directory. This will also remove the old shortcuts and the
 ; application's Start Menu Programs directory by calling the RemoveStartMenuDir
 ; macro.
 !macro MigrateStartMenuShortcut
   ${GetShortcutsLogPath} $0
   ${If} ${FileExists} "$0"
     ClearErrors
-    ReadINIStr $1 "$0" "SMPROGRAMS" "RelativePathToDir"
+    ReadINIStr $5 "$0" "SMPROGRAMS" "RelativePathToDir"
     ${Unless} ${Errors}
       ClearErrors
       ReadINIStr $1 "$0" "STARTMENU" "Shortcut0"
       ${If} ${Errors}
         ; The STARTMENU ini section doesn't exist.
         ${LogStartMenuShortcut} "${BrandFullName}.lnk"
         ${GetLongPath} "$SMPROGRAMS" $2
-        ${GetLongPath} "$2\$1" $1
+        ${GetLongPath} "$2\$5" $1
         ${If} "$1" != ""
           ClearErrors
           ReadINIStr $3 "$0" "SMPROGRAMS" "Shortcut0"
           ${Unless} ${Errors}
             ${If} ${FileExists} "$1\$3"
               ShellLink::GetShortCutTarget "$1\$3"
               Pop $4
               ${If} "$INSTDIR\${FileMainEXE}" == "$4"
--- a/browser/installer/windows/nsis/uninstaller.nsi
+++ b/browser/installer/windows/nsis/uninstaller.nsi
@@ -85,17 +85,16 @@ Var TmpVal
 ; This is named BrandShortName helper because we use this for software update
 ; post update cleanup.
 VIAddVersionKey "FileDescription" "${BrandShortName} Helper"
 VIAddVersionKey "OriginalFilename" "helper.exe"
 
 !insertmacro AddDDEHandlerValues
 !insertmacro CleanVirtualStore
 !insertmacro ElevateUAC
-!insertmacro FindSMProgramsDir
 !insertmacro GetLongPath
 !insertmacro GetPathFromString
 !insertmacro IsHandlerForInstallDir
 !insertmacro LogDesktopShortcut
 !insertmacro LogQuickLaunchShortcut
 !insertmacro LogStartMenuShortcut
 !insertmacro RegCleanAppHandler
 !insertmacro RegCleanMain