Added SetLanguage ($LANGUAGE is no longer a variable)
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@738 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
df33a31178
commit
d6c4b8ac50
4 changed files with 16 additions and 5 deletions
|
@ -1419,6 +1419,9 @@ static int NSISCALL ExecuteEntry(entry *entries, int pos)
|
|||
)
|
||||
);
|
||||
return 0;
|
||||
case EW_SETLANG:
|
||||
set_language(process_string_fromtab_toint(parms[0]));
|
||||
return 0;
|
||||
}
|
||||
my_MessageBox(STR(LANG_INSTCORRUPTED),MB_OK|MB_ICONSTOP);
|
||||
return EXEC_ERROR;
|
||||
|
|
|
@ -1,9 +1,8 @@
|
|||
extern char g_usrvars[25][NSIS_MAX_STRLEN];
|
||||
extern char g_usrvars[24][NSIS_MAX_STRLEN];
|
||||
#define state_command_line (g_usrvars[20])
|
||||
#define state_install_directory (g_usrvars[21])
|
||||
#define state_output_directory (g_usrvars[22])
|
||||
#define state_exe_directory (g_usrvars[23])
|
||||
#define state_language (g_usrvars[24])
|
||||
|
||||
extern char g_caption[NSIS_MAX_STRLEN*2];
|
||||
extern HWND g_hwnd;
|
||||
|
|
|
@ -16,7 +16,7 @@ char g_log_file[1024];
|
|||
extern char plugins_temp_dir[NSIS_MAX_STRLEN];
|
||||
#endif
|
||||
|
||||
char g_usrvars[25][NSIS_MAX_STRLEN];
|
||||
char g_usrvars[24][NSIS_MAX_STRLEN];
|
||||
|
||||
HANDLE g_hInstance;
|
||||
|
||||
|
@ -486,10 +486,13 @@ void NSISCALL process_string(char *out, const char *in)
|
|||
case VAR_CODES_START + 22: // INSTDIR
|
||||
case VAR_CODES_START + 23: // OUTDIR
|
||||
case VAR_CODES_START + 24: // EXEDIR
|
||||
case VAR_CODES_START + 25: // LANGUAGE
|
||||
mystrcpy(out, g_usrvars[nVarIdx - (VAR_CODES_START + 1)]);
|
||||
break;
|
||||
|
||||
case VAR_CODES_START + 25: // LANGUAGE
|
||||
wsprintf(out, "%u", cur_common_strings_table->lang_id);
|
||||
break;
|
||||
|
||||
case VAR_CODES_START + 26: // PROGRAMFILES
|
||||
myRegGetStr(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows\\CurrentVersion", "ProgramFilesDir", out);
|
||||
if (!*out)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue