used my opt instead of eccles, actually smaller (and made both bzip2 and zlib drop by 0.5k yay!)

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1040 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
justin1014 2002-09-18 23:28:54 +00:00
parent 88acdf2345
commit 6ec2b9ba6f

View file

@ -333,6 +333,7 @@ void NSISCALL myRegGetStr(HKEY root, const char *sub, const char *name, char *ou
} }
static char smwcvesf[]="Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders";
char g_all_user_var_flag; char g_all_user_var_flag;
static void NSISCALL queryShellFolders(const char *name_, char *out) static void NSISCALL queryShellFolders(const char *name_, char *out)
@ -341,13 +342,12 @@ static void NSISCALL queryShellFolders(const char *name_, char *out)
mystrcpy(name + 7, name_); mystrcpy(name + 7, name_);
{ {
char f=g_all_user_var_flag; char f=g_all_user_var_flag;
static char buf[65];
wsprintf(buf,"%s\\Explorer\\Shell Folders","Software\\Microsoft\\Windows\\CurrentVersion");
again: again:
smwcvesf[41]='\\';
myRegGetStr(f?HKEY_LOCAL_MACHINE:HKEY_CURRENT_USER, myRegGetStr(f?HKEY_LOCAL_MACHINE:HKEY_CURRENT_USER,
buf, smwcvesf,
f?name:name_,out); f?name:name_,out);
if (!out[0]) if (!out[0])
{ {
@ -501,7 +501,8 @@ void NSISCALL process_string(char *out, const char *in)
break; break;
case VAR_CODES_START + 26: // PROGRAMFILES case VAR_CODES_START + 26: // PROGRAMFILES
myRegGetStr(HKEY_LOCAL_MACHINE, "Software\\Microsoft\\Windows\\CurrentVersion", "ProgramFilesDir", out); smwcvesf[41]=0;
myRegGetStr(HKEY_LOCAL_MACHINE, smwcvesf, "ProgramFilesDir", out);
if (!*out) if (!*out)
mystrcpy(out, "C:\\Program Files"); mystrcpy(out, "C:\\Program Files");
break; break;