From 8575d7b1f7229ef88ca3620a9710430055178d36 Mon Sep 17 00:00:00 2001
From: "rob_strong%exchangecode.com"
 <rob_strong%exchangecode.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 5 Jan 2009 20:25:57 +0000
Subject: [PATCH] Bug 460669 - Installing Firefox writes incorrect file paths
 to DefaultIcon and open command. r=jmathies, approval1.9.0.6=dveditz

git-svn-id: svn://10.0.0.236/trunk@255712 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../installer/windows/nsis/installer.nsi      | 25 ++++++++-----------
 .../installer/windows/nsis/uninstaller.nsi    |  4 +--
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/mozilla/browser/installer/windows/nsis/installer.nsi b/mozilla/browser/installer/windows/nsis/installer.nsi
index b18f4ce88ad..309a516d565 100755
--- a/mozilla/browser/installer/windows/nsis/installer.nsi
+++ b/mozilla/browser/installer/windows/nsis/installer.nsi
@@ -58,7 +58,8 @@ RequestExecutionLevel user
 !system 'echo ; > shortcuts.ini'
 !system 'echo ; > summary.ini'
 
-; USE_UAC_PLUGIN is temporary until Thunderbird has been updated to use the UAC plugin
+; USE_UAC_PLUGIN is temporary until all applications have been updated to use
+; the UAC plugin
 !define USE_UAC_PLUGIN
 
 Var TmpVal
@@ -73,7 +74,6 @@ Var AddDesktopSC
 !include FileFunc.nsh
 !include LogicLib.nsh
 !include MUI.nsh
-!include TextFunc.nsh
 !include WinMessages.nsh
 !include WinVer.nsh
 !include WordFunc.nsh
@@ -84,11 +84,6 @@ Var AddDesktopSC
 !insertmacro StrFilter
 !insertmacro WordReplace
 
-; NSIS provided macros that we have overridden
-!include overrides.nsh
-!insertmacro LocateNoDetails
-!insertmacro TextCompareNoDetails
-
 ; The following includes are custom.
 !include branding.nsi
 !include defines.nsi
@@ -106,7 +101,6 @@ VIAddVersionKey "OriginalFilename" "setup.exe"
 !insertmacro ChangeMUIHeaderImage
 !insertmacro CheckForFilesInUse
 !insertmacro CleanUpdatesDir
-!insertmacro CloseApp
 !insertmacro CopyFilesFromDir
 !insertmacro CreateRegKey
 !insertmacro GetPathFromString
@@ -305,10 +299,9 @@ Section "-Application" APP_IDX
   ClearErrors
   ReadRegStr $R0 HKLM "Software\Apple Computer, Inc.\QuickTime" "InstallDir"
   ${Unless} ${Errors}
-    Push $R0
-    ${GetPathFromRegStr}
-    Pop $R0
-    ${Unless} ${Errors}
+    ${GetLongPath} $R0 "$R0"
+    ${Unless} $R0 == ""
+      ClearErrors
       GetFullPathName $R0 "$R0\Plugins\nsIQTScriptablePlugin.xpt"
       ${Unless} ${Errors}
         ${LogHeader} "Copying QuickTime Scriptable Component"
@@ -384,8 +377,12 @@ Section "-Application" APP_IDX
   ${FixClassKeys}
 
   ; On install always add the FirefoxHTML and FirefoxURL keys.
-  ; An empty string is used for the 5th param because FirefoxHTML is not a
-  ; protocol handler.
+  ; An empty string is used for the 5th param because FirefoxHTML and FirefoxURL
+  ; are not protocol handlers.
+  ${GetLongPath} "$INSTDIR\${FileMainEXE}" $8
+  StrCpy $2 "$\"$8$\" -requestPending -osint -url $\"%1$\""
+  StrCpy $3 "$\"%1$\",,0,0,,,,"
+
   ${AddDDEHandlerValues} "FirefoxHTML" "$2" "$8,1" "${AppRegName} Document" "" \
                          "${DDEApplication}" "$3" "WWW_OpenURL"
 
diff --git a/mozilla/browser/installer/windows/nsis/uninstaller.nsi b/mozilla/browser/installer/windows/nsis/uninstaller.nsi
index 4f854a6f5a5..183c98a1b81 100755
--- a/mozilla/browser/installer/windows/nsis/uninstaller.nsi
+++ b/mozilla/browser/installer/windows/nsis/uninstaller.nsi
@@ -52,7 +52,8 @@ RequestExecutionLevel user
 
 !addplugindir ./
 
-; USE_UAC_PLUGIN is temporary until Thunderbird has been updated to use the UAC plugin
+; USE_UAC_PLUGIN is temporary until all applications have been updated to use
+; the UAC plugin
 !define USE_UAC_PLUGIN
 
 ; prevents compiling of the reg write logging.
@@ -65,7 +66,6 @@ Var TmpVal
 !include FileFunc.nsh
 !include LogicLib.nsh
 !include MUI.nsh
-!include TextFunc.nsh
 !include WinMessages.nsh
 !include WinVer.nsh
 !include WordFunc.nsh