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

Fixed weird LangString behavior and made SectionSetFlags "understand" SF_BOLD

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1306 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2002-10-04 20:41:43 +00:00
parent de8ba097ef
commit 616518505b
2 changed files with 23 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Source/exehead/Ui.c
View file

@ -223,16 +223,19 @@ static void NSISCALL SetParentState(HWND hWnd, TV_ITEM *pItem) {
static void NSISCALL CheckTreeItem(HWND hWnd, TV_ITEM *pItem, int checked) {
HTREEITEM hItem = pItem->hItem;
int l=0;
int flags;
pItem->mask = TVIF_STATE|TVIF_PARAM;
TreeView_GetItem(hWnd, pItem);
if (pItem->state >> 12 == 0)
return;
if (g_inst_section[pItem->lParam].flags & SF_RO) l=3;
flags = g_inst_section[pItem->lParam].flags;
pItem->state = INDEXTOSTATEIMAGEMASK(checked?2:1+l);
pItem->stateMask = TVIS_STATEIMAGEMASK;
if (flags & SF_RO) l=3;
pItem->state = INDEXTOSTATEIMAGEMASK(checked?2:1+l) | (flags & SF_BOLD ? TVIS_BOLD : 0);
pItem->stateMask = TVIS_STATEIMAGEMASK | TVIS_BOLD;
TreeView_SetItem(hWnd, pItem);
@ -1133,15 +1136,13 @@ static BOOL CALLBACK SelProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
x=num_sections;
while (x--)
{
char c=GetStringFromStringTab(t->name_ptr)[0];
if (c && c!='-')
if (t->name_ptr && !(t->flags&(SF_SUBSEC|SF_SUBSECEND)))
{
TV_ITEM hItem;
hItem.hItem=*ht;
if (g_inst_header->no_custom_instmode_flag==1)
{
int c=(t->install_types>>m_whichcfg)&1;
CheckTreeItem(hwndTree1, &hItem,c);
CheckTreeItem(hwndTree1,&hItem,(t->install_types>>m_whichcfg)&1);
}
else if (!(t->flags&SF_RO))
{

33
Source/lang.cpp
View file

@ -207,22 +207,20 @@ int CEXEBuild::SetUserString(char *name, LANGID lang, char *string, int process/
user_strings_list->find(name, 0, &idx);
}
user_strings->resize((idx+1)*sizeof(int));
#define MAX(a, b) (a > b ? a : b)
user_strings->resize(MAX(user_strings->getlen(), (idx+1)*sizeof(int)));
((int*)user_strings->get())[idx] = uninst ? add_string_uninst(string,process) : add_string_main(string,process);
int zero = 0;
// make sure all of the user's strings tables are the same size
for (int j = 0; j < string_tables.size(); j++) {
if (j == idx) continue;
if (uninst) {
if (string_tables[j]->user_ustrings.getlen() < (idx+1)*sizeof(int)) {
string_tables[j]->user_ustrings.resize((idx+1)*sizeof(int));
((int*)string_tables[j]->user_ustrings.get())[idx] = 0;
}
}
else {
if (string_tables[j]->user_strings.getlen() < (idx+1)*sizeof(int)) {
string_tables[j]->user_strings.resize((idx+1)*sizeof(int));
((int*)string_tables[j]->user_strings.get())[idx] = 0;
}
int i = user_strings_list->getnum();
if (uninst) i -= string_tables[j]->user_ustrings.getlen() / sizeof(int);
else i -= string_tables[j]->user_strings.getlen() / sizeof(int);
while (i--) {
if (uninst) string_tables[j]->user_ustrings.add(&zero, sizeof(int));
else string_tables[j]->user_strings.add(&zero, sizeof(int));
}
}
@ -265,21 +263,20 @@ int CEXEBuild::WriteStringTables() {
build_langtables.add(&string_tables[i]->common, sizeof(common_strings));
build_langtables.add(&string_tables[i]->installer, sizeof(installer_strings));
if (build_userlangstrings.getnum())
build_langtables.add(string_tables[i]->user_strings.get(), string_tables[i]->user_strings.getlen());
build_langtables.add(string_tables[i]->user_strings.get(), build_userlangstrings.getnum()*sizeof(int));
}
build_header.common.language_tables_num = st_num;
build_header.common.language_table_size = sizeof(LANGID) + sizeof(common_strings) + sizeof(installer_strings) + (build_userlangstrings.getnum() * sizeof(int));
build_header.common.language_table_size = build_langtables.getlen() / st_num;
for (i = 0; i < st_num; i++) {
ubuild_langtables.add(&string_tables[i]->lang_id, sizeof(LANGID));
ubuild_langtables.add(&string_tables[i]->ucommon, sizeof(common_strings));
ubuild_langtables.add(&string_tables[i]->uninstall, sizeof(uninstall_strings));
if (ubuild_userlangstrings.getnum())
ubuild_langtables.add(string_tables[i]->user_ustrings.get(), string_tables[i]->user_ustrings.getlen());
ubuild_langtables.add(string_tables[i]->user_ustrings.get(), ubuild_userlangstrings.getnum()*sizeof(int));
}
build_uninst.common.language_tables_num = st_num;
build_uninst.common.language_table_size = sizeof(LANGID) + sizeof(common_strings) + sizeof(uninstall_strings) + (ubuild_userlangstrings.getnum() * sizeof(int));
build_uninst.common.language_table_size = ubuild_langtables.getlen() / st_num;
SCRIPT_MSG("Done!\n");
return PS_OK;