Sleep back to normal

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2555 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2003-05-18 15:56:09 +00:00
parent 82cebbf365
commit 9a092cb98f

View file

@ -201,7 +201,7 @@ static int NSISCALL ExecuteEntry(entry *entry_)
{ {
int x=process_string_fromparm_toint(0); int x=process_string_fromparm_toint(0);
log_printf2("Sleep(%d)",x); log_printf2("Sleep(%d)",x);
Sleep(min(x,1)); Sleep(max(x,1));
} }
break; break;
case EW_BRINGTOFRONT: case EW_BRINGTOFRONT:
@ -238,7 +238,7 @@ static int NSISCALL ExecuteEntry(entry *entry_)
{ {
update_status_text_from_lang(LANG_OUTPUTDIR,buf1); update_status_text_from_lang(LANG_OUTPUTDIR,buf1);
mystrcpy(state_output_directory,buf1); mystrcpy(state_output_directory,buf1);
SetCurrentDirectory(state_output_directory); SetCurrentDirectory(buf1);
} }
else update_status_text_from_lang(LANG_CREATEDIR,buf1); else update_status_text_from_lang(LANG_CREATEDIR,buf1);
{ {
@ -1503,48 +1503,48 @@ static int NSISCALL ExecuteEntry(entry *entry_)
#endif // NSIS_CONFIG_PLUGIN_SUPPORT #endif // NSIS_CONFIG_PLUGIN_SUPPORT
#ifdef NSIS_CONFIG_COMPONENTPAGE #ifdef NSIS_CONFIG_COMPONENTPAGE
case EW_SECTIONSET: case EW_SECTIONSET:
{
int x=process_string_fromparm_toint(0);
if ((unsigned int)x < (unsigned int)num_sections)
{ {
int x=process_string_fromparm_toint(0); section *sec=g_inst_section+x;
if ((unsigned int)x < (unsigned int)num_sections) if (parm1>=0) // get something
{ {
section *sec=g_inst_section+x; int res=((int*)sec)[parm1];
if (parm1>=0) // get something if (!parm1)
{ {
int res=((int*)sec)[parm1]; // getting text
if (!parm1) process_string_fromtab(var2,res);
{
// getting text
process_string_fromtab(var2,res);
}
else
{
// getting number
myitoa(var2,res);
}
} }
else // set something else
{ {
parm1=-parm1-1; // getting number
if (parm1) myitoa(var2,res);
{ }
// not setting text, get int }
parm2=process_string_fromparm_toint(2); else // set something
} {
else parm1=-parm1-1;
{ if (parm1)
// setting text, send the message to do it {
SendMessage(g_SectionHack,WM_USER+0x17,x,parm2); // not setting text, get int
} parm2=process_string_fromparm_toint(2);
((int*)sec)[parm1]=parm2; }
if (parm1) else
{ {
// update tree view // setting text, send the message to do it
SendMessage(g_SectionHack,WM_USER+0x18,x,0); SendMessage(g_SectionHack,WM_USER+0x17,x,parm2);
} }
((int*)sec)[parm1]=parm2;
if (parm1)
{
// update tree view
SendMessage(g_SectionHack,WM_USER+0x18,x,0);
} }
} }
else g_flags.exec_error++;
} }
else g_flags.exec_error++;
}
break; break;
#endif//NSIS_CONFIG_COMPONENTPAGE #endif//NSIS_CONFIG_COMPONENTPAGE
} }