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

if the first section was a section group, following section groups didn't behave correctly

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3900 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2005-02-04 20:45:02 +00:00
parent 10330d6061
commit 282cd1ef72
4 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/exehead/Ui.c
View file

@ -1302,7 +1302,7 @@ static BOOL CALLBACK SelProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
if (uMsg == WM_IN_UPDATEMSG) if (uMsg == WM_IN_UPDATEMSG)
{ {
RefreshSectionGroups(0); RefreshSectionGroups();
#if defined(NSIS_SUPPORT_CODECALLBACKS) && defined(NSIS_CONFIG_COMPONENTPAGE) #if defined(NSIS_SUPPORT_CODECALLBACKS) && defined(NSIS_CONFIG_COMPONENTPAGE)
if (wParam) if (wParam)
@ -1347,7 +1347,7 @@ static BOOL CALLBACK SelProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
} // end of typecheckshit } // end of typecheckshit
} }
RefreshSectionGroups(0); RefreshSectionGroups();
RefreshComponents(hwndTree1, hTreeItems); RefreshComponents(hwndTree1, hTreeItems);
if (LANG_STR_TAB(LANG_SPACE_REQ)) { if (LANG_STR_TAB(LANG_SPACE_REQ)) {

14
Source/exehead/components.c
View file

@ -34,7 +34,7 @@ void NSISCALL SectionFlagsChanged(unsigned int index) {
} }
} }
unsigned int NSISCALL RefreshSectionGroups(unsigned int i) { static unsigned int NSISCALL _RefreshSectionGroups(unsigned int i, int first_call) {
unsigned int selected = 0; unsigned int selected = 0;
unsigned int not_selected = 0; unsigned int not_selected = 0;
@ -43,8 +43,10 @@ unsigned int NSISCALL RefreshSectionGroups(unsigned int i) {
unsigned int sec = i; unsigned int sec = i;
if (sections[sec].flags & SF_SECGRP) { if (sections[sec].flags & SF_SECGRP) {
sections[sec].flags &= ~(SF_SELECTED | SF_PSELECTED); if (!first_call) {
i++; sections[sec].flags &= ~(SF_SELECTED | SF_PSELECTED);
i++;
}
} }
while (i < (unsigned int) num_sections) { while (i < (unsigned int) num_sections) {
@ -52,7 +54,7 @@ unsigned int NSISCALL RefreshSectionGroups(unsigned int i) {
int ni = i + 1; int ni = i + 1;
if (flags & SF_SECGRP) { if (flags & SF_SECGRP) {
ni = RefreshSectionGroups(i); ni = _RefreshSectionGroups(i, 0);
} }
if (flags & SF_SECGRPEND) { if (flags & SF_SECGRPEND) {
@ -84,6 +86,10 @@ unsigned int NSISCALL RefreshSectionGroups(unsigned int i) {
return 0; return 0;
} }
void NSISCALL RefreshSectionGroups() {
_RefreshSectionGroups(0, 1);
}
void NSISCALL SetInstType(int inst_type) { void NSISCALL SetInstType(int inst_type) {
unsigned int i = 0; unsigned int i = 0;

2
Source/exehead/components.h
View file

@ -2,7 +2,7 @@
#define ___COMPONENTS_H___ #define ___COMPONENTS_H___
void NSISCALL SectionFlagsChanged(unsigned int index); void NSISCALL SectionFlagsChanged(unsigned int index);
unsigned int NSISCALL RefreshSectionGroups(unsigned int i); void NSISCALL RefreshSectionGroups();
void NSISCALL SetInstType(int inst_type); void NSISCALL SetInstType(int inst_type);
unsigned int NSISCALL GetInstType(HTREEITEM *items); unsigned int NSISCALL GetInstType(HTREEITEM *items);

2
Source/exehead/exec.c
View file

@ -1508,7 +1508,7 @@ static int NSISCALL ExecuteEntry(entry *entry_)
if (parm2) // set install type if (parm2) // set install type
{ {
SetInstType(x); SetInstType(x);
RefreshSectionGroups(0); RefreshSectionGroups();
} }
else // get install type else // get install type
{ {