From 75cf6b20ef17aa6d359f92faca714af0124e0a43 Mon Sep 17 00:00:00 2001
From: anders_k <anders_k@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Mon, 26 Dec 2016 23:01:41 +0000
Subject: [PATCH] MultiUser now supports $ProgramFiles64 (Bug #843)

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6824 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/MultiUser/MultiUser.nsh |  6 +++++-
 Contrib/MultiUser/Readme.html   |  8 ++++++++
 Docs/src/basic.but              |  2 +-
 Docs/src/history.but            | 10 ++++++++++
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/Contrib/MultiUser/MultiUser.nsh b/Contrib/MultiUser/MultiUser.nsh
index 13b43441..540afbd8 100644
--- a/Contrib/MultiUser/MultiUser.nsh
+++ b/Contrib/MultiUser/MultiUser.nsh
@@ -91,7 +91,11 @@ Install modes
     !if "${UNINSTALLER_PREFIX}" != UN
       ;Set default installation location for installer
       !ifdef MULTIUSER_INSTALLMODE_INSTDIR
-        StrCpy $INSTDIR "$PROGRAMFILES\${MULTIUSER_INSTALLMODE_INSTDIR}"
+        !ifdef MULTIUSER_USE_PROGRAMFILES64
+          StrCpy $INSTDIR "$PROGRAMFILES64\${MULTIUSER_INSTALLMODE_INSTDIR}"
+        !else
+          StrCpy $INSTDIR "$PROGRAMFILES\${MULTIUSER_INSTALLMODE_INSTDIR}"
+        !endif
       !endif
     !endif
   
diff --git a/Contrib/MultiUser/Readme.html b/Contrib/MultiUser/Readme.html
index 7d2a729b..8ce6de48 100644
--- a/Contrib/MultiUser/Readme.html
+++ b/Contrib/MultiUser/Readme.html
@@ -179,6 +179,14 @@ FunctionEnd</pre>
                 not available.
             </td>
         </tr>
+        <tr>
+            <td>
+                MULTIUSER_USE_PROGRAMFILES64
+            </td>
+            <td>
+                Use $PROGRAMFILES64 instead of $PROGRAMFILES as the default all users directory.
+            </td>
+        </tr>
         <tr>
             <td>
                 MULTIUSER_INIT_FUNCTIONQUIT<br />
diff --git a/Docs/src/basic.but b/Docs/src/basic.but
index e2281fb5..0ad19076 100644
--- a/Docs/src/basic.but
+++ b/Docs/src/basic.but
@@ -146,7 +146,7 @@ The next example will succeed in deleting the directory.
 
 \c outpath
 
-Sets the output path ($OUTDIR) and creates it (recursively if necessary), if it does not exist. Must be a full pathname, usually is just $INSTDIR (you can specify $INSTDIR if you are lazy with a single "-").
+Sets the output path ($OUTDIR) and creates it (recursively if necessary), if it does not exist. Must be a full pathname, usually is just $INSTDIR (you can specify $INSTDIR with a single "-" if you are lazy).
 
 \c SetOutPath $INSTDIR
 \c File program.exe
diff --git a/Docs/src/history.but b/Docs/src/history.but
index 27ee00f0..ad164128 100644
--- a/Docs/src/history.but
+++ b/Docs/src/history.but
@@ -1,5 +1,15 @@
 \A{history} Changelog and Release Notes
 
+\H{v3.01} 3.02
+
+Released on ? ?th, 2017
+
+\S1{v3.02-cl} Changelog
+
+\S2{} Minor Changes
+
+\b MultiUser now supports $ProgramFiles64 (\W{http://sf.net/p/nsis/bugs/843}{bug #843})
+
 \H{v3.01} 3.01
 
 Released on December 11th, 2016