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

Fixed some problems with the new background callback function

Browse source 
Silent is working again


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@727 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2002-08-24 14:44:23 +00:00
parent ed112b999b
commit 8a3a64c5b4
1 changed files with 65 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

116
Source/exehead/Ui.c
View file

@ -103,7 +103,6 @@ static int m_page=-1,m_abort;
HWND m_curwnd; HWND m_curwnd;
static int m_whichcfg; static int m_whichcfg;
#ifdef NSIS_CONFIG_VISIBLE_SUPPORT
static BOOL NSISCALL SetDlgItemTextFromLang(HWND dlg, WORD id, langid_t lid) { static BOOL NSISCALL SetDlgItemTextFromLang(HWND dlg, WORD id, langid_t lid) {
return SetDlgItemText(dlg,id,STR(GetLangString(lid))); return SetDlgItemText(dlg,id,STR(GetLangString(lid)));
} }
@ -130,7 +129,8 @@ static BOOL NSISCALL _HandleStaticBkColor(UINT uMsg, WPARAM wParam, LPARAM lPara
BOOL ret=0; BOOL ret=0;
if (uMsg == WM_CTLCOLORSTATIC) { if (uMsg == WM_CTLCOLORSTATIC) {
if (g_inst_cmnheader->code_onStaticCtlBkColor >= 0) { if (g_inst_cmnheader->code_onStaticCtlBkColor >= 0) {
mystrcpy(g_tmp,g_usrvars[0]); char tmp[NSIS_MAX_STRLEN];
mystrcpy(tmp,g_usrvars[0]);
myitoa(g_usrvars[0],lParam); myitoa(g_usrvars[0],lParam);
ExecuteCodeSegment(g_inst_entry,g_inst_cmnheader->code_onStaticCtlBkColor,NULL); ExecuteCodeSegment(g_inst_entry,g_inst_cmnheader->code_onStaticCtlBkColor,NULL);
if (myatoi(g_usrvars[0]) != -1) { if (myatoi(g_usrvars[0]) != -1) {
@ -138,12 +138,11 @@ static BOOL NSISCALL _HandleStaticBkColor(UINT uMsg, WPARAM wParam, LPARAM lPara
SetBkColor((HDC)wParam, b.lbColor); SetBkColor((HDC)wParam, b.lbColor);
ret=(BOOL)CreateBrushIndirect(&b); ret=(BOOL)CreateBrushIndirect(&b);
} }
mystrcpy(g_usrvars[0],g_tmp); mystrcpy(g_usrvars[0],tmp);
} }
} }
return ret; return ret;
} }
#endif
#ifdef NSIS_CONFIG_LOG #ifdef NSIS_CONFIG_LOG
void NSISCALL build_g_logfile() void NSISCALL build_g_logfile()
@ -246,6 +245,37 @@ static void NSISCALL CheckTreeItem(HWND hWnd, TV_ITEM *pItem, int checked) {
#endif//NSIS_CONFIG_COMPONENTPAGE #endif//NSIS_CONFIG_COMPONENTPAGE
int lang_num;
void NSISCALL select_lang()
{
int i;
LANGID user_lang, lang_mask=~(LANGID)0;
user_lang=myatoi(state_language);
lang_again:
for (i = 0; i < lang_num; i++) {
if (!((user_lang ^ common_strings_tables[i].lang_id) & lang_mask)) {
cur_common_strings_table+=i;
#ifdef NSIS_CONFIG_UNINSTALL_SUPPORT
if (g_is_uninstaller)
(uninstall_strings *)cur_install_strings_table+=i;
else
#endif
(installer_strings *)cur_install_strings_table+=i;
break;
}
}
if ((i == lang_num) && (lang_mask == ~(LANGID)0)) {
lang_mask=0x3ff; // primary lang
goto lang_again;
}
wsprintf(state_language, "%u", cur_common_strings_table->lang_id);
process_string_from_lang(g_caption,LANGID_CAPTION);
}
int NSISCALL ui_doinstall(void) int NSISCALL ui_doinstall(void)
{ {
g_autoclose=g_inst_cmnheader->misc_flags&1; g_autoclose=g_inst_cmnheader->misc_flags&1;
@ -311,6 +341,26 @@ int NSISCALL ui_doinstall(void)
#endif #endif
} }
// Added by Amir Szekely 3rd August 2002
// Multilingual support
{
int size;
lang_num=g_inst_header->common.str_tables_num;
size=lang_num*sizeof(common_strings);
cur_common_strings_table=common_strings_tables=(common_strings*)GlobalAlloc(GPTR,size);
GetCompressedDataFromDataBlockToMemory(g_inst_header->common.str_tables,(char*)common_strings_tables,size);
#ifdef NSIS_CONFIG_UNINSTALL_SUPPORT
if (g_is_uninstaller)
size=lang_num*sizeof(uninstall_strings);
else
#endif
size=lang_num*sizeof(installer_strings);
cur_install_strings_table=install_strings_tables=(char *)GlobalAlloc(GPTR,size);
GetCompressedDataFromDataBlockToMemory(g_inst_header->common.inst_str_tables,install_strings_tables,size);
process_string_from_lang(g_caption,LANGID_CAPTION);
}
#ifdef NSIS_CONFIG_VISIBLE_SUPPORT #ifdef NSIS_CONFIG_VISIBLE_SUPPORT
#ifdef NSIS_CONFIG_SILENT_SUPPORT #ifdef NSIS_CONFIG_SILENT_SUPPORT
if (!g_inst_cmnheader->silent_install) if (!g_inst_cmnheader->silent_install)
@ -325,51 +375,13 @@ int NSISCALL ui_doinstall(void)
#endif//NSIS_SUPPORT_BGBG #endif//NSIS_SUPPORT_BGBG
#ifdef NSIS_SUPPORT_CODECALLBACKS #ifdef NSIS_SUPPORT_CODECALLBACKS
g_hwnd=h; g_hwnd=h;
{ // Select language
// Added by Amir Szekely 3rd August 2002 wsprintf(state_language, "%u", GetUserDefaultLangID());
// Multilingual support // in onInit
int num=g_inst_header->common.str_tables_num; if (ExecuteCodeSegment(g_inst_entry,g_inst_cmnheader->code_onInit,NULL)) return 1;
LANGID user_lang, lang_mask=~(LANGID)0; g_hwnd=NULL;
int size=num*sizeof(common_strings); // Make the selection from the tables
cur_common_strings_table=common_strings_tables=(common_strings*)GlobalAlloc(GPTR,size); select_lang();
GetCompressedDataFromDataBlockToMemory(g_inst_header->common.str_tables,(char*)common_strings_tables,size);
#ifdef NSIS_CONFIG_UNINSTALL_SUPPORT
if (g_is_uninstaller)
size=num*sizeof(uninstall_strings);
else
#endif
size=num*sizeof(installer_strings);
cur_install_strings_table=install_strings_tables=(char *)GlobalAlloc(GPTR,size);
GetCompressedDataFromDataBlockToMemory(g_inst_header->common.inst_str_tables,install_strings_tables,size);
process_string_from_lang(g_caption,LANGID_CAPTION);
wsprintf(state_language, "%u", GetUserDefaultLangID());
if (ExecuteCodeSegment(g_inst_entry,g_inst_cmnheader->code_onInit,NULL)) return 1;
g_hwnd=NULL;
user_lang=myatoi(state_language);
lang_again:
for (size = 0; size < num; size++) {
if (!((user_lang ^ common_strings_tables[size].lang_id) & lang_mask)) {
cur_common_strings_table+=size;
#ifdef NSIS_CONFIG_UNINSTALL_SUPPORT
if (g_is_uninstaller)
(uninstall_strings *)cur_install_strings_table+=size;
else
#endif
(installer_strings *)cur_install_strings_table+=size;
break;
}
}
if ((size == num) && (lang_mask == ~(LANGID)0)) {
lang_mask=0x3ff; // primary lang
goto lang_again;
}
}
wsprintf(state_language, "%u", cur_common_strings_table->lang_id);
process_string_from_lang(g_caption,LANGID_CAPTION);
if (h != GetDesktopWindow()) { if (h != GetDesktopWindow()) {
SendMessage(h, WM_SETTEXT, 0, (LPARAM)g_caption); SendMessage(h, WM_SETTEXT, 0, (LPARAM)g_caption);
ShowWindow(h, SW_SHOW); ShowWindow(h, SW_SHOW);
@ -384,7 +396,9 @@ lang_again:
#endif #endif
{ {
#ifdef NSIS_SUPPORT_CODECALLBACKS #ifdef NSIS_SUPPORT_CODECALLBACKS
wsprintf(state_language, "%u", GetUserDefaultLangID());
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;
select_lang();
#endif//NSIS_SUPPORT_CODECALLBACKS #endif//NSIS_SUPPORT_CODECALLBACKS
if (install_thread(NULL)) if (install_thread(NULL))
{ {
@ -1039,12 +1053,12 @@ static BOOL CALLBACK SelProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
if (image == 2) // already checked if (image == 2) // already checked
{ {
g_inst_section[wh].default_state&=~DFS_SET; g_inst_section[wh].default_state&=~DFS_SET;
CheckTreeItem(hwndTree1, &hItem,0); CheckTreeItem(hwndTree1,&hItem,0);
} }
else else
{ {
g_inst_section[wh].default_state|=DFS_SET; g_inst_section[wh].default_state|=DFS_SET;
CheckTreeItem(hwndTree1, &hItem,1); CheckTreeItem(hwndTree1,&hItem,1);
} }
#if defined(NSIS_SUPPORT_CODECALLBACKS) && defined(NSIS_CONFIG_COMPONENTPAGE) #if defined(NSIS_SUPPORT_CODECALLBACKS) && defined(NSIS_CONFIG_COMPONENTPAGE)
{ {