dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Removed SetLanguage (back to $LANGUAGE)

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@777 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2002-08-28 16:57:46 +00:00
parent 16f90719f1
commit 806f0afb91
5 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Source/exehead/Ui.c
View file

@ -248,11 +248,13 @@ static void NSISCALL CheckTreeItem(HWND hWnd, TV_ITEM *pItem, int checked) {
static int lang_num; static int lang_num;
void NSISCALL set_language(LANGID lang) static void NSISCALL set_language(LANGID lang)
{ {
int i; int i;
LANGID lang_mask=~(LANGID)0; LANGID lang_mask=~(LANGID)0;
if (!lang) lang=myatoi(state_language);
lang_again: lang_again:
for (i = 0; i < lang_num; i++) { for (i = 0; i < lang_num; i++) {
if (!((lang ^ common_strings_tables[i].lang_id) & lang_mask)) { if (!((lang ^ common_strings_tables[i].lang_id) & lang_mask)) {
@ -377,6 +379,7 @@ int NSISCALL ui_doinstall(void)
g_hwnd=m_bgwnd; g_hwnd=m_bgwnd;
// Select language // Select language
if (ExecuteCodeSegment(g_inst_entry,g_inst_cmnheader->code_onInit,NULL)) return 1; if (ExecuteCodeSegment(g_inst_entry,g_inst_cmnheader->code_onInit,NULL)) return 1;
set_language(0);
g_hwnd=NULL; g_hwnd=NULL;
ShowWindow(m_bgwnd, SW_SHOW); ShowWindow(m_bgwnd, SW_SHOW);
#endif//NSIS_SUPPORT_CODECALLBACKS #endif//NSIS_SUPPORT_CODECALLBACKS
@ -390,6 +393,7 @@ int NSISCALL ui_doinstall(void)
{ {
#ifdef NSIS_SUPPORT_CODECALLBACKS #ifdef NSIS_SUPPORT_CODECALLBACKS
if (ExecuteCodeSegment(g_inst_entry,g_inst_cmnheader->code_onInit,NULL)) return 1; if (ExecuteCodeSegment(g_inst_entry,g_inst_cmnheader->code_onInit,NULL)) return 1;
set_language(0);
#endif//NSIS_SUPPORT_CODECALLBACKS #endif//NSIS_SUPPORT_CODECALLBACKS
if (install_thread(NULL)) if (install_thread(NULL))
{ {

3
Source/exehead/exec.c
View file

@ -1426,9 +1426,6 @@ static int NSISCALL ExecuteEntry(entry *entries, int pos)
) )
); );
return 0; return 0;
case EW_SETLANG:
set_language(process_string_fromtab_toint(parm0));
return 0;
} }
my_MessageBox(STR(LANG_INSTCORRUPTED),MB_OK|MB_ICONSTOP); my_MessageBox(STR(LANG_INSTCORRUPTED),MB_OK|MB_ICONSTOP);
return EXEC_ERROR; return EXEC_ERROR;

7
Source/exehead/state.h
View file

@ -1,14 +1,11 @@
extern char g_usrvars[24][NSIS_MAX_STRLEN]; extern char g_usrvars[25][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])*/
// changed by Amir Szekely 28th August 2002 // changed by Amir Szekely 28th August 2002
// smaller exehead // smaller exehead
extern char *state_command_line; extern char *state_command_line;
extern char *state_install_directory; extern char *state_install_directory;
extern char *state_output_directory; extern char *state_output_directory;
extern char *state_exe_directory; extern char *state_exe_directory;
extern char *state_language;
extern char g_caption[NSIS_MAX_STRLEN*2]; extern char g_caption[NSIS_MAX_STRLEN*2];
extern HWND g_hwnd; extern HWND g_hwnd;

8
Source/exehead/util.c
View file

@ -16,11 +16,12 @@ char g_log_file[1024];
extern char plugins_temp_dir[NSIS_MAX_STRLEN]; extern char plugins_temp_dir[NSIS_MAX_STRLEN];
#endif #endif
char g_usrvars[24][NSIS_MAX_STRLEN]; char g_usrvars[25][NSIS_MAX_STRLEN];
char *state_command_line=g_usrvars[20]; char *state_command_line=g_usrvars[20];
char *state_install_directory=g_usrvars[21]; char *state_install_directory=g_usrvars[21];
char *state_output_directory=g_usrvars[22]; char *state_output_directory=g_usrvars[22];
char *state_exe_directory=g_usrvars[23]; char *state_exe_directory=g_usrvars[23];
char *state_language=g_usrvars[24];
HANDLE g_hInstance; HANDLE g_hInstance;
@ -490,11 +491,8 @@ void NSISCALL process_string(char *out, const char *in)
case VAR_CODES_START + 22: // INSTDIR case VAR_CODES_START + 22: // INSTDIR
case VAR_CODES_START + 23: // OUTDIR case VAR_CODES_START + 23: // OUTDIR
case VAR_CODES_START + 24: // EXEDIR case VAR_CODES_START + 24: // EXEDIR
mystrcpy(out, g_usrvars[nVarIdx - (VAR_CODES_START + 1)]);
break;
case VAR_CODES_START + 25: // LANGUAGE case VAR_CODES_START + 25: // LANGUAGE
myitoa(out, cur_common_strings_table->lang_id); mystrcpy(out, g_usrvars[nVarIdx - (VAR_CODES_START + 1)]);
break; break;
case VAR_CODES_START + 26: // PROGRAMFILES case VAR_CODES_START + 26: // PROGRAMFILES

2
Source/script.cpp
View file

@ -21,7 +21,7 @@
static const char *usrvars="$0\0$1\0$2\0$3\0$4\0$5\0$6\0$7\0$8\0$9\0" static const char *usrvars="$0\0$1\0$2\0$3\0$4\0$5\0$6\0$7\0$8\0$9\0"
"$R0\0$R1\0$R2\0$R3\0$R4\0$R5\0$R6\0$R7\0$R8\0$R9\0" "$R0\0$R1\0$R2\0$R3\0$R4\0$R5\0$R6\0$R7\0$R8\0$R9\0"
"$CMDLINE\0$INSTDIR\0$OUTDIR\0$EXEDIR\0"; "$CMDLINE\0$INSTDIR\0$OUTDIR\0$EXEDIR\0$LANGUAGE\0";
int CEXEBuild::process_script(FILE *fp, char *curfilename, int *lineptr) int CEXEBuild::process_script(FILE *fp, char *curfilename, int *lineptr)