size optimizations

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4458 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2005-12-24 16:28:54 +00:00
parent 57a50cd622
commit ad3d61c837

View file

@ -602,21 +602,21 @@ char * NSISCALL GetNSISString(char *outbuf, int strtab)
append = "\\Microsoft\\Internet Explorer\\Quick Launch"; append = "\\Microsoft\\Internet Explorer\\Quick Launch";
x = 2; x = 2;
} }
if (fldrs[0] == CSIDL_PROGRAM_FILES_COMMON) else if (fldrs[0] == CSIDL_PROGRAM_FILES_COMMON)
{ {
myRegGetStr(HKEY_LOCAL_MACHINE, SYSREGKEY, "CommonFilesDir", out); myRegGetStr(HKEY_LOCAL_MACHINE, SYSREGKEY, "CommonFilesDir", out);
} }
if (fldrs[0] == CSIDL_PROGRAM_FILES) else if (fldrs[0] == CSIDL_PROGRAM_FILES)
{ {
myRegGetStr(HKEY_LOCAL_MACHINE, SYSREGKEY, "ProgramFilesDir", out); myRegGetStr(HKEY_LOCAL_MACHINE, SYSREGKEY, "ProgramFilesDir", out);
if (!*out) if (!*out)
mystrcpy(out, "C:\\Program Files"); mystrcpy(out, "C:\\Program Files");
} }
if (fldrs[0] == CSIDL_SYSTEM) else if (fldrs[0] == CSIDL_SYSTEM)
{ {
GetSystemDirectory(out, NSIS_MAX_STRLEN); GetSystemDirectory(out, NSIS_MAX_STRLEN);
} }
if (fldrs[0] == CSIDL_WINDOWS) else if (fldrs[0] == CSIDL_WINDOWS)
{ {
GetWindowsDirectory(out, NSIS_MAX_STRLEN); GetWindowsDirectory(out, NSIS_MAX_STRLEN);
} }
@ -649,7 +649,6 @@ char * NSISCALL GetNSISString(char *outbuf, int strtab)
} }
validate_filename(out); validate_filename(out);
out += mystrlen(out);
} }
else if (nVarIdx == NS_VAR_CODE) else if (nVarIdx == NS_VAR_CODE)
{ {
@ -663,13 +662,12 @@ char * NSISCALL GetNSISString(char *outbuf, int strtab)
// $LANGUAGE is just a number anyway... // $LANGUAGE is just a number anyway...
validate_filename(out); validate_filename(out);
} }
out += mystrlen(out);
} // == VAR_CODES_START } // == VAR_CODES_START
else if (nVarIdx == NS_LANG_CODE) else if (nVarIdx == NS_LANG_CODE)
{ {
GetNSISString(out, -nData-1); GetNSISString(out, -nData-1);
out += mystrlen(out);
} }
out += mystrlen(out);
} }
else if (nVarIdx == NS_SKIP_CODE) else if (nVarIdx == NS_SKIP_CODE)
{ {