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

- Plug-in command can now come in any order in the script

Browse source 
- Second plug-in DLL doesn't produce errors anymore
- Infinite loop bug fixed (again)


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@678 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2002-08-09 22:12:10 +00:00
parent bc6494155b
commit 0b31694486
8 changed files with 153 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Source/Plugins.cpp
View file

@ -113,9 +113,9 @@ void Plugins::GetExports(char* pathToDll,bool displayInfo)
char *name = (char*)exports + names[j] - ExportDirVA;
wsprintf(signature, "%s::%s", dllName, name);
m_commands.add(signature, pathToDll);
DLL newDll = {new char[lstrlen(dllName)], false};
lstrcpy(newDll.name, dllName);
m_storedDLLs.push_back(newDll);
char *dll = new char[lstrlen(dllName)];
lstrcpy(dll, dllName);
m_storedDLLs.push_back(dll);
if (displayInfo)
fprintf(g_output, " - %s\n", signature);
}
@ -156,22 +156,32 @@ char* Plugins::GetPluginDll(char* command)
return 0;
}
void Plugins::DLLStored(char* dllName)
void Plugins::StoreInstDLL(char* dllName)
{
for (int i = 0; i < m_storedDLLs.size(); i++) {
if (!strcmp(m_storedDLLs[i].name, dllName)) {
m_storedDLLs[i].stored = true;
for (int i = 0; i < m_installDLLs.size(); i++)
if (!strcmp(m_installDLLs[i], dllName))
return;
}
}
m_installDLLs.push_back(strdup(dllName));
}
bool Plugins::IsDLLStored(char* dllName)
void Plugins::StoreUninstDLL(char* dllName)
{
for (int i = 0; i < m_storedDLLs.size(); i++)
if (!strcmp(m_storedDLLs[i].name, dllName))
return m_storedDLLs[i].stored;
return false;
for (int i = 0; i < m_uninstallDLLs.size(); i++)
if (!strcmp(m_uninstallDLLs[i], dllName))
return;
m_uninstallDLLs.push_back(strdup(dllName));
}
char* Plugins::GetInstDLL(int i)
{
if (i >= 0 && i < m_installDLLs.size()) return m_installDLLs[i];
else return 0;
}
char* Plugins::GetUninstDLL(int i)
{
if (i >= 0 && i < m_uninstallDLLs.size()) return m_uninstallDLLs[i];
else return 0;
}
#endif