DRTVWR-447: Allow Standard Windows user to install for current user.

This should eliminate any confusion due to a Standard user needing to elevate
to Admin privileges, since from that point on Windows tells the running
program the current user is that Admin. Bypass all that.

14 files changed, 81 insertions, 88 deletions

diff --git a/indra/newview/installers/windows/installer_template.nsi b/indra/newview/installers/windows/installer_template.nsi
index f8e9bc4781..500b35255e 100644
--- a/indra/newview/installers/windows/installer_template.nsi
+++ b/indra/newview/installers/windows/installer_template.nsi
@@ -32,7 +32,7 @@ SetCompress auto			# Compress if saves space
 SetCompressor /solid lzma	# Compress whole installer as one block

 SetDatablockOptimize off	# Only saves us 0.1%, not worth it

 XPStyle on                  # Add an XP manifest to the installer

-RequestExecutionLevel admin	# For when we write to Program Files

+RequestExecutionLevel highest           # match MULTIUSER_EXECUTIONLEVEL

 

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ;; Project flags

@@ -90,20 +90,43 @@ InstProgressFlags smooth colored		# New colored smooth look
 SetOverwrite on							# Overwrite files by default

 AutoCloseWindow true					# After all files install, close window

 

-# initial location of install (default when not already installed)

-#   note: Now we defer looking for existing install until onInit when we

-#   are able to engage the 32/64 registry function

-InstallDir "%%PROGRAMFILES%%\${INSTNAME}"

+# Registry key paths, ours and Microsoft's

+!define LINDEN_KEY      "SOFTWARE\Linden Research, Inc."

+!define INSTNAME_KEY    "${LINDEN_KEY}\${INSTNAME}"

+!define MSCURRVER_KEY   "SOFTWARE\Microsoft\Windows\CurrentVersion"

+!define MSNTCURRVER_KEY "SOFTWARE\Microsoft\Windows NT\CurrentVersion"

+!define MSUNINSTALL_KEY "${MSCURRVER_KEY}\Uninstall\${INSTNAME}"

+

+# from http://nsis.sourceforge.net/Docs/MultiUser/Readme.html

+# Highest level permitted for user: Admin for Admin, Standard for Standard

+!define MULTIUSER_EXECUTIONLEVEL Highest

+!define MULTIUSER_MUI

+# Look for /AllUsers or /CurrentUser switches

+!define MULTIUSER_INSTALLMODE_COMMANDLINE

+# appended to $PROGRAMFILES, as affected by MULTIUSER_USE_PROGRAMFILES64

+!define MULTIUSER_INSTALLMODE_INSTDIR "${INSTNAME}"

+# expands to !define MULTIUSER_USE_PROGRAMFILES64 or nothing

+%%PROGRAMFILES%%

+# should make MultiUser.nsh initialization read existing INSTDIR from registry

+!define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY "${INSTNAME_KEY}"

+!define MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME ""

+# should make MultiUser.nsh initialization write $MultiUser.InstallMode to registry

+!define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_KEY "${INSTNAME_KEY}"

+!define MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_VALUENAME "InstallMode"

+!include MultiUser.nsh

+!include MUI2.nsh

 

 UninstallText $(UninstallTextMsg)

 DirText $(DirectoryChooseTitle) $(DirectoryChooseSetup)

-Page directory dirPre

-Page instfiles

+!insertmacro MULTIUSER_PAGE_INSTALLMODE

+!define MUI_PAGE_CUSTOMFUNCTION_PRE dirPre

+!insertmacro MUI_PAGE_DIRECTORY

+!insertmacro MUI_PAGE_INSTFILES

 

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ;; Variables

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Var INSTPROG

+Var INSTNAME

 Var INSTEXE

 Var VIEWER_EXE

 Var INSTSHORTCUT

@@ -142,20 +165,13 @@ FunctionEnd
 ;; entry to the language ID selector below

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 Function .onInit

+!insertmacro MULTIUSER_INIT

 

 %%ENGAGEREGISTRY%%

 

-# read the current location of the install for this version

-# if $0 is empty, this is the first time for this viewer name

-ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\\Linden Research, Inc.\\${INSTNAME}" ""

-

-# viewer with this name not installed before

-${If} $0 == ""

-    # nothing to do here

-${Else}

-	# use the value we got from registry as install location

-    StrCpy $INSTDIR $0

-${EndIf}

+# Setting MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_KEY and

+# MULTIUSER_INSTALLMODE_INSTDIR_REGISTRY_VALUENAME should

+# read the current location of the install for this version into INSTDIR.

 

 Call CheckCPUFlags							# Make sure we have SSE2 support

 Call CheckWindowsVersion					# Don't install On unsupported systems

@@ -181,7 +197,7 @@ Call CheckWindowsVersion					# Don't install On unsupported systems
 lbl_configure_default_lang:

 # If we currently have a version of SL installed, default to the language of that install

 # Otherwise don't change $LANGUAGE and it will default to the OS UI language.

-    ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage"

+    ReadRegStr $0 SHELL_CONTEXT "${INSTNAME_KEY}" "InstallerLanguage"

     IfErrors +2 0	# If error skip the copy instruction 

 	StrCpy $LANGUAGE $0

 

@@ -204,7 +220,7 @@ lbl_build_menu:
     StrCpy $LANGUAGE $0

 

 # Save language in registry		

-	WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage" $LANGUAGE

+	WriteRegStr SHELL_CONTEXT "${INSTNAME_KEY}" "InstallerLanguage" $LANGUAGE

 lbl_return:

     Pop $0

     Return

@@ -215,16 +231,20 @@ FunctionEnd
 ;; Prep Uninstaller Section

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 Function un.onInit

+!insertmacro MULTIUSER_UNINIT

 

 %%ENGAGEREGISTRY%%

 

 # Read language from registry and set for uninstaller. Key will be removed on successful uninstall

-	ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\${INSTNAME}" "InstallerLanguage"

+	ReadRegStr $0 SHELL_CONTEXT "${INSTNAME_KEY}" "InstallerLanguage"

     IfErrors lbl_end

 	StrCpy $LANGUAGE $0

 lbl_end:

     Return

 

+    # Does MultiUser.nsh init read back

+    # MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_KEY into $MultiUser.InstallMode?

+

 FunctionEnd

 

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

@@ -272,15 +292,14 @@ FunctionEnd
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 Section ""

 

-SetShellVarContext all			# Install for all users (if you change this, change it in the uninstall as well)

+# SetShellVarContext is set by MultiUser.nsh initialization.

 

 # Start with some default values.

-StrCpy $INSTPROG "${INSTNAME}"

+StrCpy $INSTNAME "${INSTNAME}"

 StrCpy $INSTEXE "${INSTEXE}"

 StrCpy $VIEWER_EXE "${VIEWER_EXE}"

 StrCpy $INSTSHORTCUT "${SHORTCUT}"

 

-Call CheckIfAdministrator		# Make sure the user can install/uninstall

 Call CloseSecondLife			# Make sure Second Life not currently running

 Call CheckWillUninstallV2		# Check if Second Life is already installed

 

@@ -324,24 +343,24 @@ CreateShortCut "$INSTDIR\Uninstall $INSTSHORTCUT.lnk" \
 				'"$INSTDIR\uninst.exe"' ''

 

 # Write registry

-WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "" "$INSTDIR"

-WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Version" "${VERSION_LONG}"

-WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Shortcut" "$INSTSHORTCUT"

-WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG" "Exe" "$VIEWER_EXE"

-WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "Publisher" "Linden Research, Inc."

-WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "URLInfoAbout" "http://secondlife.com/whatis/"

-WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "URLUpdateInfo" "http://secondlife.com/support/downloads/"

-WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "HelpLink" "https://support.secondlife.com/contact-support/"

-WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "DisplayName" "$INSTPROG"

-WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "UninstallString" '"$INSTDIR\uninst.exe"'

-WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "DisplayVersion" "${VERSION_LONG}"

-WriteRegDWORD HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "EstimatedSize" "0x0001D500"		# ~117 MB

+WriteRegStr SHELL_CONTEXT "${INSTNAME_KEY}" "" "$INSTDIR"

+WriteRegStr SHELL_CONTEXT "${INSTNAME_KEY}" "Version" "${VERSION_LONG}"

+WriteRegStr SHELL_CONTEXT "${INSTNAME_KEY}" "Shortcut" "$INSTSHORTCUT"

+WriteRegStr SHELL_CONTEXT "${INSTNAME_KEY}" "Exe" "$VIEWER_EXE"

+WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "Publisher" "Linden Research, Inc."

+WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "URLInfoAbout" "http://secondlife.com/whatis/"

+WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "URLUpdateInfo" "http://secondlife.com/support/downloads/"

+WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "HelpLink" "https://support.secondlife.com/contact-support/"

+WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "DisplayName" "$INSTNAME"

+WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "UninstallString" '"$INSTDIR\uninst.exe"'

+WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "DisplayVersion" "${VERSION_LONG}"

+WriteRegDWORD SHELL_CONTEXT "${MSUNINSTALL_KEY}" "EstimatedSize" "0x0001D500"		# ~117 MB

 

 # from FS:Ansariel

-WriteRegStr HKEY_LOCAL_MACHINE "Software\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG" "DisplayIcon" '"$INSTDIR\$VIEWER_EXE"'

+WriteRegStr SHELL_CONTEXT "${MSUNINSTALL_KEY}" "DisplayIcon" '"$INSTDIR\$VIEWER_EXE"'

 

 # BUG-2707 Disable SEHOP for installed viewer.

-WriteRegDWORD HKEY_LOCAL_MACHINE "Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\$VIEWER_EXE" "DisableExceptionChainValidation" 1

+WriteRegDWORD SHELL_CONTEXT "${MSNTCURRVER_KEY}\Image File Execution Options\$VIEWER_EXE" "DisableExceptionChainValidation" 1

 

 # Write URL registry info

 WriteRegStr HKEY_CLASSES_ROOT "${URLNAME}" "(default)" "URL:Second Life"

@@ -380,25 +399,29 @@ SectionEnd
 Section Uninstall

 

 # Start with some default values.

-StrCpy $INSTPROG "${INSTNAME}"

+StrCpy $INSTNAME "${INSTNAME}"

 StrCpy $INSTEXE "${INSTEXE}"

 StrCpy $VIEWER_EXE "${VIEWER_EXE}"

 StrCpy $INSTSHORTCUT "${SHORTCUT}"

 

-# Make sure the user can install/uninstall

-Call un.CheckIfAdministrator

-

-# Uninstall for all users (if you change this, change it in the install as well)

-SetShellVarContext all			

+# SetShellVarContext per the mode saved at install time in registry at

+# MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_KEY

+# MULTIUSER_INSTALLMODE_DEFAULT_REGISTRY_VALUENAME

+# Couln't get NSIS to expand $MultiUser.InstallMode into the function name at Call time

+${If} $MultiUser.InstallMode == 'AllUsers'

+  Call un.MultiUser.InstallMode.AllUsers

+${Else}

+  Call un.MultiUser.InstallMode.CurrentUser

+${EndIf}

 

 # Make sure we're not running

 Call un.CloseSecondLife

 

 # Clean up registry keys and subkeys (these should all be !defines somewhere)

-DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Linden Research, Inc.\$INSTPROG"

-DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$INSTPROG"

+DeleteRegKey SHELL_CONTEXT "${INSTNAME_KEY}"

+DeleteRegKey SHELL_CONTEXT "${MSCURRVER_KEY}\Uninstall\$INSTNAME"

 # BUG-2707 Remove entry that disabled SEHOP

-DeleteRegKey HKEY_LOCAL_MACHINE "Software\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\$VIEWER_EXE"

+DeleteRegKey SHELL_CONTEXT "${MSNTCURRVER_KEY}\Image File Execution Options\$VIEWER_EXE"

 ##DeleteRegKey HKEY_CLASSES_ROOT "Applications\$INSTEXE"

 DeleteRegKey HKEY_CLASSES_ROOT "Applications\${VIEWER_EXE}"

 

@@ -419,36 +442,6 @@ Call un.UserSettingsFiles
 SectionEnd

 

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;; Make sure the user can install

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function CheckIfAdministrator

-    DetailPrint $(CheckAdministratorInstDP)

-    UserInfo::GetAccountType

-    Pop $R0

-    StrCmp $R0 "Admin" lbl_is_admin

-        MessageBox MB_OK $(CheckAdministratorInstMB)

-        Quit

-lbl_is_admin:

-    Return

-

-FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-;; Make sure the user can uninstall

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

-Function un.CheckIfAdministrator

-    DetailPrint $(CheckAdministratorUnInstDP)

-    UserInfo::GetAccountType

-    Pop $R0

-    StrCmp $R0 "Admin" lbl_is_admin

-        MessageBox MB_OK $(CheckAdministratorUnInstMB)

-        Quit

-lbl_is_admin:

-    Return

-

-FunctionEnd

-

-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

 ;; Function CheckWillUninstallV2               

 ;;

 ;; If called through auto-update, need to uninstall any existing V2 installation.

@@ -571,10 +564,10 @@ Push $2
   StrCpy $0 0	# Index number used to iterate via EnumRegKey

 

   LOOP:

-    EnumRegKey $1 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList" $0

+    EnumRegKey $1 SHELL_CONTEXT "${MSNTCURRVER_KEY}\ProfileList" $0

     StrCmp $1 "" DONE               # No more users

 

-    ReadRegStr $2 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList\$1" "ProfileImagePath" 

+    ReadRegStr $2 SHELL_CONTEXT "${MSNTCURRVER_KEY}\ProfileList\$1" "ProfileImagePath" 

     StrCmp $2 "" CONTINUE 0         # "ProfileImagePath" value is missing

 

 # Required since ProfileImagePath is of type REG_EXPAND_SZ

@@ -604,7 +597,7 @@ Pop $0
 

 # Delete files in ProgramData\Secondlife

 Push $0

-  ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" "Common AppData"

+  ReadRegStr $0 SHELL_CONTEXT "${MSCURRVER_KEY}\Explorer\Shell Folders" "Common AppData"

   StrCmp $0 "" +2

   RMDir /r "$0\SecondLife"

 Pop $0

@@ -661,8 +654,8 @@ NOFOLDER:
 MessageBox MB_YESNO $(DeleteRegistryKeysMB) IDYES DeleteKeys IDNO NoDelete

 

 DeleteKeys:

-  DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Classes\x-grid-location-info"

-  DeleteRegKey HKEY_LOCAL_MACHINE "SOFTWARE\Classes\secondlife"

+  DeleteRegKey SHELL_CONTEXT "SOFTWARE\Classes\x-grid-location-info"

+  DeleteRegKey SHELL_CONTEXT "SOFTWARE\Classes\secondlife"

   DeleteRegKey HKEY_CLASSES_ROOT "x-grid-location-info"

   DeleteRegKey HKEY_CLASSES_ROOT "secondlife"

 

@@ -758,10 +751,10 @@ FunctionEnd
 ;    StrCpy $0 0	# Index number used to iterate via EnumRegKey

 ;

 ;  LOOP:

-;    EnumRegKey $1 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList" $0

+;    EnumRegKey $1 SHELL_CONTEXT "${MSNTCURRVER_KEY}\ProfileList" $0

 ;    StrCmp $1 "" DONE               # no more users

 ;

-;    ReadRegStr $2 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows NT\CurrentVersion\ProfileList\$1" "ProfileImagePath"

+;    ReadRegStr $2 SHELL_CONTEXT "${MSNTCURRVER_KEY}\ProfileList\$1" "ProfileImagePath"

 ;    StrCmp $2 "" CONTINUE 0         # "ProfileImagePath" value is missing

 ;

 ;# Required since ProfileImagePath is of type REG_EXPAND_SZ

@@ -780,7 +773,7 @@ FunctionEnd
 ;

 ;# Copy files in Documents and Settings\All Users\SecondLife

 ;Push $0

-;    ReadRegStr $0 HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders" "Common AppData"

+;    ReadRegStr $0 SHELL_CONTEXT "${MSCURRVER_KEY}\Explorer\Shell Folders" "Common AppData"

 ;    StrCmp $0 "" +2

 ;    RMDir /r "$2\Application Data\SecondLife\"

 ;Pop $0

diff --git a/indra/newview/installers/windows/lang_da.nsi b/indra/newview/installers/windows/lang_da.nsi
index 83e1a3ea94..b3b8cf34d5 100644
--- a/indra/newview/installers/windows/lang_da.nsi
+++ b/indra/newview/installers/windows/lang_da.nsi
diff --git a/indra/newview/installers/windows/lang_de.nsi b/indra/newview/installers/windows/lang_de.nsi
index 2a868acc89..7758a3bda6 100644
--- a/indra/newview/installers/windows/lang_de.nsi
+++ b/indra/newview/installers/windows/lang_de.nsi
diff --git a/indra/newview/installers/windows/lang_en-us.nsi b/indra/newview/installers/windows/lang_en-us.nsi
index 00aa47de69..1e81c5294a 100644
--- a/indra/newview/installers/windows/lang_en-us.nsi
+++ b/indra/newview/installers/windows/lang_en-us.nsi
diff --git a/indra/newview/installers/windows/lang_es.nsi b/indra/newview/installers/windows/lang_es.nsi
index 1ecf254ffb..6d4a7495a6 100644
--- a/indra/newview/installers/windows/lang_es.nsi
+++ b/indra/newview/installers/windows/lang_es.nsi
diff --git a/indra/newview/installers/windows/lang_fr.nsi b/indra/newview/installers/windows/lang_fr.nsi
index bec5835bed..421015fc6b 100644
--- a/indra/newview/installers/windows/lang_fr.nsi
+++ b/indra/newview/installers/windows/lang_fr.nsi
diff --git a/indra/newview/installers/windows/lang_it.nsi b/indra/newview/installers/windows/lang_it.nsi
index 1d2e150525..df735ba742 100644
--- a/indra/newview/installers/windows/lang_it.nsi
+++ b/indra/newview/installers/windows/lang_it.nsi
diff --git a/indra/newview/installers/windows/lang_ja.nsi b/indra/newview/installers/windows/lang_ja.nsi
index 1bd6526670..f2cc1f9fde 100644
--- a/indra/newview/installers/windows/lang_ja.nsi
+++ b/indra/newview/installers/windows/lang_ja.nsi
diff --git a/indra/newview/installers/windows/lang_pl.nsi b/indra/newview/installers/windows/lang_pl.nsi
index a172f0cdeb..61dc769126 100644
--- a/indra/newview/installers/windows/lang_pl.nsi
+++ b/indra/newview/installers/windows/lang_pl.nsi
diff --git a/indra/newview/installers/windows/lang_pt-br.nsi b/indra/newview/installers/windows/lang_pt-br.nsi
index 87032fec18..d481434ab2 100644
--- a/indra/newview/installers/windows/lang_pt-br.nsi
+++ b/indra/newview/installers/windows/lang_pt-br.nsi
diff --git a/indra/newview/installers/windows/lang_ru.nsi b/indra/newview/installers/windows/lang_ru.nsi
index 019c66123c..a42c719169 100644
--- a/indra/newview/installers/windows/lang_ru.nsi
+++ b/indra/newview/installers/windows/lang_ru.nsi
diff --git a/indra/newview/installers/windows/lang_tr.nsi b/indra/newview/installers/windows/lang_tr.nsi
index 1c4e2c2f48..c320764fac 100644
--- a/indra/newview/installers/windows/lang_tr.nsi
+++ b/indra/newview/installers/windows/lang_tr.nsi
diff --git a/indra/newview/installers/windows/lang_zh.nsi b/indra/newview/installers/windows/lang_zh.nsi
index 355e01a333..8da802df68 100644
--- a/indra/newview/installers/windows/lang_zh.nsi
+++ b/indra/newview/installers/windows/lang_zh.nsi
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 3556b82320..1e58cec808 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -806,10 +806,10 @@ class WindowsManifest(ViewerManifest):
 
         if(self.address_size == 64):
             engage_registry="SetRegView 64"
-            program_files="$PROGRAMFILES64"
+            program_files="!define MULTIUSER_USE_PROGRAMFILES64"
         else:
             engage_registry="SetRegView 32"
-            program_files="$PROGRAMFILES32"
+            program_files=""
 
         tempfile = "secondlife_setup_tmp.nsi"
         # the following replaces strings in the nsi template