From 919ac35209cd4d8afc235faceab1dc6d5b3694fc Mon Sep 17 00:00:00 2001
From: "rob_strong%exchangecode.com" <rob_strong%exchangecode.com>
Date: Sun, 3 Aug 2008 21:43:08 +0000
Subject: [PATCH] Bug 445276 - uninstall\helper.EXE does not contain a value
 for 'Original file name'. r=jmathies, approval1.9.0.2=samuel.sidler

---
 browser/installer/windows/nsis/installer.nsi    | 17 +++++------------
 browser/installer/windows/nsis/uninstaller.nsi  | 17 ++++-------------
 .../mozapps/installer/windows/nsis/version.nsh  |  1 +
 3 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/browser/installer/windows/nsis/installer.nsi b/browser/installer/windows/nsis/installer.nsi
index b368799a145..11d0b592e26 100755
--- a/browser/installer/windows/nsis/installer.nsi
+++ b/browser/installer/windows/nsis/installer.nsi
@@ -48,6 +48,8 @@ SetDatablockOptimize on
 SetCompress off
 CRCCheck on
 
+RequestExecutionLevel user
+
 !addplugindir ./
 
 ; empty files - except for the comment line - for generating custom pages.
@@ -70,21 +72,11 @@ Var AddDesktopSC
 ; The following includes are provided by NSIS.
 !include FileFunc.nsh
 !include LogicLib.nsh
+!include MUI.nsh
 !include TextFunc.nsh
 !include WinMessages.nsh
+!include WinVer.nsh
 !include WordFunc.nsh
-!include MUI.nsh
-
-; WinVer.nsh was added in the same release that RequestExecutionLevel so check
-; if ___WINVER__NSH___ is defined to determine if RequestExecutionLevel is
-; available.
-!include /NONFATAL WinVer.nsh
-!ifdef ___WINVER__NSH___
-  RequestExecutionLevel user
-!else
-  !warning "Installer will be created without Vista compatibility.$\n            \
-            Upgrade your NSIS installation to at least version 2.22 to resolve."
-!endif
 
 !insertmacro GetOptions
 !insertmacro GetParameters
@@ -105,6 +97,7 @@ Var AddDesktopSC
 !include version.nsh
 
 VIAddVersionKey "FileDescription" "${BrandShortName} Installer"
+VIAddVersionKey "OriginalFilename" "setup.exe"
 
 ; Must be inserted before other macros that use logging
 !insertmacro _LoggingCommon
diff --git a/browser/installer/windows/nsis/uninstaller.nsi b/browser/installer/windows/nsis/uninstaller.nsi
index 61f0928a552..4f854a6f5a5 100755
--- a/browser/installer/windows/nsis/uninstaller.nsi
+++ b/browser/installer/windows/nsis/uninstaller.nsi
@@ -48,6 +48,8 @@ SetDatablockOptimize on
 SetCompress off
 CRCCheck on
 
+RequestExecutionLevel user
+
 !addplugindir ./
 
 ; USE_UAC_PLUGIN is temporary until Thunderbird has been updated to use the UAC plugin
@@ -65,25 +67,13 @@ Var TmpVal
 !include MUI.nsh
 !include TextFunc.nsh
 !include WinMessages.nsh
+!include WinVer.nsh
 !include WordFunc.nsh
 
-; WinVer.nsh was added in the same release that RequestExecutionLevel so check
-; if ___WINVER__NSH___ is defined to determine if RequestExecutionLevel is
-; available.
-!include /NONFATAL WinVer.nsh
-!ifdef ___WINVER__NSH___
-  RequestExecutionLevel user
-!else
-  !warning "Installer will be created without Vista compatibility.$\n            \
-            Upgrade your NSIS installation to at least version 2.22 to resolve."
-!endif
-
 !insertmacro StrFilter
 !insertmacro WordReplace
 
 !insertmacro un.GetParent
-!insertmacro un.LineFind
-!insertmacro un.TrimNewLines
 
 ; The following includes are custom.
 !include branding.nsi
@@ -95,6 +85,7 @@ 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
diff --git a/toolkit/mozapps/installer/windows/nsis/version.nsh b/toolkit/mozapps/installer/windows/nsis/version.nsh
index 454ba826f00..85e630d7b02 100755
--- a/toolkit/mozapps/installer/windows/nsis/version.nsh
+++ b/toolkit/mozapps/installer/windows/nsis/version.nsh
@@ -13,4 +13,5 @@ VIAddVersionKey "CompanyName"     "${CompanyName}"
 VIAddVersionKey "LegalTrademarks" "${BrandShortName} is a Trademark of The Mozilla Foundation."
 VIAddVersionKey "LegalCopyright"  "${CompanyName}"
 VIAddVersionKey "FileVersion"     "${AppVersion}"
+VIAddVersionKey "ProductVersion"  "${AppVersion}"
 ;VIAddVersionKey "Comments"        "Comments"