From 4ba745368c5c3764d32cff4726068e5556ef1870 Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Sun, 25 May 2003 13:12:07 +0000
Subject: [PATCH] $SMPROGRAMS, $SMSTARTUP, $DESKTOP, $STARTMENU and
 $QUICKLAUNCH working again

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2567 212acab6-be3b-0410-9dea-997c60f758d6
---
 Source/build.cpp      | 18 +++++++++---------
 Source/exehead/util.c |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Source/build.cpp b/Source/build.cpp
index 90b5dda5..c6d949e4 100644
--- a/Source/build.cpp
+++ b/Source/build.cpp
@@ -366,15 +366,15 @@ int CEXEBuild::preprocess_string(char *out, const char *in)
   "EXEDIR\0"        // 24
   "LANGUAGE\0"      // 25
   "PLUGINSDIR\0"    // 26
-  "PROGRAMFILES\0"  // 26
-  "SMPROGRAMS\0"    // 27
-  "SMSTARTUP\0"     // 28
-  "DESKTOP\0"       // 29
-  "STARTMENU\0"     // 30
-  "QUICKLAUNCH\0"   // 31
-  "TEMP\0"          // 32
-  "WINDIR\0"        // 33
-  "SYSDIR\0"        // 34
+  "PROGRAMFILES\0"  // 27
+  "SMPROGRAMS\0"    // 28
+  "SMSTARTUP\0"     // 29
+  "DESKTOP\0"       // 30
+  "STARTMENU\0"     // 31
+  "QUICKLAUNCH\0"   // 32
+  "TEMP\0"          // 33
+  "WINDIR\0"        // 34
+  "SYSDIR\0"        // 35
   ;
 
   const char *p=in;
diff --git a/Source/exehead/util.c b/Source/exehead/util.c
index 9ca2995c..d2f7efdb 100644
--- a/Source/exehead/util.c
+++ b/Source/exehead/util.c
@@ -461,9 +461,9 @@ char * NSISCALL process_string(const char *in)
               "AppData"
             };
             static char name[20]="Common ";
-            const char *name_=tab[nVarIdx-(VAR_CODES_START+27)];
+            const char *name_=tab[nVarIdx-(VAR_CODES_START+28)];
             mystrcpy(name+7,name_);
-            f=g_flags.all_user_var & (nVarIdx != VAR_CODES_START + 31);
+            f=g_flags.all_user_var & (nVarIdx != VAR_CODES_START + 32);
 
             again:
 
@@ -480,7 +480,7 @@ char * NSISCALL process_string(const char *in)
                 mystrcpy(out,temp_directory);
               }
 
-            if (nVarIdx == VAR_CODES_START + 31) {
+            if (nVarIdx == VAR_CODES_START + 32) {
               lstrcat(out, "\\Microsoft\\Internet Explorer\\Quick Launch");
               f = GetFileAttributes(out);
               if (f != (DWORD)-1 && (f & FILE_ATTRIBUTE_DIRECTORY))