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

InitPluginsDir now causes to Init___PluginsDir to always get added

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1835 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2002-11-25 20:16:57 +00:00
parent 027f9448e5
commit f4f390fb01
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Source/script.cpp
View file

@ -3835,10 +3835,12 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
ERROR_MSG("Error: Plugin dll for command \"%s\" not found.\n",line.gettoken_str(0)); ERROR_MSG("Error: Plugin dll for command \"%s\" not found.\n",line.gettoken_str(0));
} }
return PS_ERROR; return PS_ERROR;
case TOK_INITPLUGINDIR: case TOK_INITPLUGINSDIR:
{ {
int ret; int ret;
SCRIPT_MSG("%s\n",line.gettoken_str(0)); SCRIPT_MSG("%s\n",line.gettoken_str(0));
if (uninstall_mode) uninst_plugin_used = true;
else plugin_used = true;
// Call [un.]Initialize_____Plugins // Call [un.]Initialize_____Plugins
ent.which=EW_CALL; ent.which=EW_CALL;
ent.offsets[0]=ns_func.add(uninstall_mode?"un.Initialize_____Plugins":"Initialize_____Plugins",0); ent.offsets[0]=ns_func.add(uninstall_mode?"un.Initialize_____Plugins":"Initialize_____Plugins",0);
@ -3855,7 +3857,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
#else #else
case TOK_PLUGINDIR: case TOK_PLUGINDIR:
case TOK__PLUGINCOMMAND: case TOK__PLUGINCOMMAND:
case TOK_INITPLUGINDIR: case TOK_INITPLUGINSDIR:
{ {
ERROR_MSG("Error: %s specified, NSIS_CONFIG_PLUGIN_SUPPORT not defined.\n",line.gettoken_str(0)); ERROR_MSG("Error: %s specified, NSIS_CONFIG_PLUGIN_SUPPORT not defined.\n",line.gettoken_str(0));
} }

2
Source/tokens.cpp
View file

@ -204,7 +204,7 @@ static tokenType tokenlist[TOK__LAST] =
{TOK_GETCURRENTADDR,"GetCurrentAddress",1,0,"output"}, {TOK_GETCURRENTADDR,"GetCurrentAddress",1,0,"output"},
{TOK_PLUGINDIR,"PluginDir",1,0,"new_plugin_directory"}, {TOK_PLUGINDIR,"PluginDir",1,0,"new_plugin_directory"},
{TOK_INITPLUGINDIR,"InitPluginsDir",0,0,""} {TOK_INITPLUGINSDIR,"InitPluginsDir",0,0,""}
}; };
void CEXEBuild::print_help(char *commandname) void CEXEBuild::print_help(char *commandname)

2
Source/tokens.h
View file

@ -197,7 +197,7 @@ enum
TOK_SECTIONGETFLAGS, TOK_SECTIONGETFLAGS,
TOK_SETSHELLVARCONTEXT, TOK_SETSHELLVARCONTEXT,
TOK_PLUGINDIR, TOK_PLUGINDIR,
TOK_INITPLUGINDIR, TOK_INITPLUGINSDIR,
TOK_CREATEFONT, TOK_CREATEFONT,
TOK_SHOWWINDOW, TOK_SHOWWINDOW,