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

- Fixed more problems with !if[n]def/!else

Browse source 
- Saved another 10 bytes :)


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2237 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2003-03-04 20:33:07 +00:00
parent ef7dcf5e4f
commit d2e565e55e
2 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Source/exehead/exec.c
View file

@ -200,10 +200,6 @@ static int NSISCALL ExecuteEntry(entry *entry_)
Sleep(x); Sleep(x);
} }
return 0; return 0;
case EW_HIDEWINDOW:
log_printf("HideWindow");
ShowWindow(g_hwnd,SW_HIDE);
return 0;
case EW_BRINGTOFRONT: case EW_BRINGTOFRONT:
log_printf("BringToFront"); log_printf("BringToFront");
ShowWindow(g_hwnd,SW_SHOW); ShowWindow(g_hwnd,SW_SHOW);
@ -798,6 +794,7 @@ static int NSISCALL ExecuteEntry(entry *entry_)
} }
return 0; return 0;
case EW_SHOWWINDOW: case EW_SHOWWINDOW:
if (parm2) log_printf("HideWindow");
ShowWindow((HWND)process_string_fromparm_toint(0),process_string_fromparm_toint(1)); ShowWindow((HWND)process_string_fromparm_toint(0),process_string_fromparm_toint(1));
return 0; return 0;
#endif//NSIS_CONFIG_ENHANCEDUI_SUPPORT #endif//NSIS_CONFIG_ENHANCEDUI_SUPPORT

23
Source/script.cpp
View file

@ -138,8 +138,14 @@ parse_again:
} }
if (line.getnumtokens() == 1) { if (line.getnumtokens() == 1) {
ignore=!ignore; if (!wait_for_endif) {
return PS_OK; ignore=!ignore;
return PS_OK;
}
else {
ignore=1;
return PS_OK;
}
} }
line.eattoken(); line.eattoken();
@ -2739,11 +2745,19 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
ent.offsets[1]=add_string(line.gettoken_str(2)); ent.offsets[1]=add_string(line.gettoken_str(2));
SCRIPT_MSG("ShowWindow: handle=%s show state=%s\n",line.gettoken_str(1),line.gettoken_str(2)); SCRIPT_MSG("ShowWindow: handle=%s show state=%s\n",line.gettoken_str(1),line.gettoken_str(2));
return add_entry(&ent); return add_entry(&ent);
case TOK_HIDEWINDOW:
ent.which=EW_SHOWWINDOW;
ent.offsets[0]=add_string("$HWNDPARENT");
ent.offsets[1]=add_string("0"/*SW_HIDE*/);
ent.offsets[2]=1;
SCRIPT_MSG("HideWindow\n");
return add_entry(&ent);
#else//NSIS_CONFIG_ENHANCEDUI_SUPPORT #else//NSIS_CONFIG_ENHANCEDUI_SUPPORT
case TOK_GETDLGITEM: case TOK_GETDLGITEM:
case TOK_SETSTATICBKCOLOR: case TOK_SETSTATICBKCOLOR:
case TOK_SHOWWINDOW: case TOK_SHOWWINDOW:
case TOK_CREATEFONT: case TOK_CREATEFONT:
case TOK_HIDEWINDOW:
ERROR_MSG("Error: %s specified, NSIS_CONFIG_ENHANCEDUI_SUPPORT not defined.\n", line.gettoken_str(0)); ERROR_MSG("Error: %s specified, NSIS_CONFIG_ENHANCEDUI_SUPPORT not defined.\n", line.gettoken_str(0));
return PS_ERROR; return PS_ERROR;
#endif//NSIS_CONFIG_ENHANCEDUI_SUPPORT #endif//NSIS_CONFIG_ENHANCEDUI_SUPPORT
@ -2755,6 +2769,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
case TOK_SETSTATICBKCOLOR: case TOK_SETSTATICBKCOLOR:
case TOK_SHOWWINDOW: case TOK_SHOWWINDOW:
case TOK_CREATEFONT: case TOK_CREATEFONT:
case TOK_HIDEWINDOW:
ERROR_MSG("Error: %s specified, NSIS_SUPPORT_HWNDS not defined.\n", line.gettoken_str(0)); ERROR_MSG("Error: %s specified, NSIS_SUPPORT_HWNDS not defined.\n", line.gettoken_str(0));
return PS_ERROR; return PS_ERROR;
#endif//!NSIS_SUPPORT_HWNDS #endif//!NSIS_SUPPORT_HWNDS
@ -2969,10 +2984,6 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
ent.which=EW_BRINGTOFRONT; ent.which=EW_BRINGTOFRONT;
SCRIPT_MSG("BringToFront\n"); SCRIPT_MSG("BringToFront\n");
return add_entry(&ent); return add_entry(&ent);
case TOK_HIDEWINDOW:
ent.which=EW_HIDEWINDOW;
SCRIPT_MSG("HideWindow\n");
return add_entry(&ent);
case TOK_IFFILEEXISTS: case TOK_IFFILEEXISTS:
ent.which=EW_IFFILEEXISTS; ent.which=EW_IFFILEEXISTS;
ent.offsets[0] = add_string(line.gettoken_str(1)); ent.offsets[0] = add_string(line.gettoken_str(1));