$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
This commit is contained in:
parent
519bb0f50a
commit
4ba745368c
2 changed files with 12 additions and 12 deletions
|
@ -366,15 +366,15 @@ int CEXEBuild::preprocess_string(char *out, const char *in)
|
||||||
"EXEDIR\0" // 24
|
"EXEDIR\0" // 24
|
||||||
"LANGUAGE\0" // 25
|
"LANGUAGE\0" // 25
|
||||||
"PLUGINSDIR\0" // 26
|
"PLUGINSDIR\0" // 26
|
||||||
"PROGRAMFILES\0" // 26
|
"PROGRAMFILES\0" // 27
|
||||||
"SMPROGRAMS\0" // 27
|
"SMPROGRAMS\0" // 28
|
||||||
"SMSTARTUP\0" // 28
|
"SMSTARTUP\0" // 29
|
||||||
"DESKTOP\0" // 29
|
"DESKTOP\0" // 30
|
||||||
"STARTMENU\0" // 30
|
"STARTMENU\0" // 31
|
||||||
"QUICKLAUNCH\0" // 31
|
"QUICKLAUNCH\0" // 32
|
||||||
"TEMP\0" // 32
|
"TEMP\0" // 33
|
||||||
"WINDIR\0" // 33
|
"WINDIR\0" // 34
|
||||||
"SYSDIR\0" // 34
|
"SYSDIR\0" // 35
|
||||||
;
|
;
|
||||||
|
|
||||||
const char *p=in;
|
const char *p=in;
|
||||||
|
|
|
@ -461,9 +461,9 @@ char * NSISCALL process_string(const char *in)
|
||||||
"AppData"
|
"AppData"
|
||||||
};
|
};
|
||||||
static char name[20]="Common ";
|
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_);
|
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:
|
again:
|
||||||
|
|
||||||
|
@ -480,7 +480,7 @@ char * NSISCALL process_string(const char *in)
|
||||||
mystrcpy(out,temp_directory);
|
mystrcpy(out,temp_directory);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (nVarIdx == VAR_CODES_START + 31) {
|
if (nVarIdx == VAR_CODES_START + 32) {
|
||||||
lstrcat(out, "\\Microsoft\\Internet Explorer\\Quick Launch");
|
lstrcat(out, "\\Microsoft\\Internet Explorer\\Quick Launch");
|
||||||
f = GetFileAttributes(out);
|
f = GetFileAttributes(out);
|
||||||
if (f != (DWORD)-1 && (f & FILE_ATTRIBUTE_DIRECTORY))
|
if (f != (DWORD)-1 && (f & FILE_ATTRIBUTE_DIRECTORY))
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue