tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Plugin name should match to plugin folder name 

Load plugin only when plugin name match to plugin folder name.
For example: "NppPluginDemo.dll" can be loaded only when it in the
folder named "NppPluginDemo".
This commit is contained in:
Don HO 2017-07-10 19:26:22 +02:00
parent 2c9f096d6d
commit 4c2e41b649
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp
View File

@ -359,38 +359,42 @@ bool PluginsManager::loadPluginsV2(const TCHAR* dir)
WIN32_FIND_DATA foundData; WIN32_FIND_DATA foundData;
HANDLE hFindFolder = ::FindFirstFile(pluginsFolderFilter.c_str(), &foundData); HANDLE hFindFolder = ::FindFirstFile(pluginsFolderFilter.c_str(), &foundData);
HANDLE hFindDll = INVALID_HANDLE_VALUE; HANDLE hFindDll = INVALID_HANDLE_VALUE;
// get plugin folder
if (hFindFolder != INVALID_HANDLE_VALUE && (foundData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) if (hFindFolder != INVALID_HANDLE_VALUE && (foundData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
{ {
generic_string pluginsFullPathFilter = dir; generic_string pluginsFullPathFilter = dir;
PathAppend(pluginsFullPathFilter, foundData.cFileName); PathAppend(pluginsFullPathFilter, foundData.cFileName);
generic_string pluginsFolderPath = pluginsFullPathFilter; generic_string pluginsFolderPath = pluginsFullPathFilter;
PathAppend(pluginsFullPathFilter, TEXT("*.dll")); generic_string dllName = foundData.cFileName;
dllName += TEXT(".dll");
PathAppend(pluginsFullPathFilter, dllName);
// get plugin
hFindDll = ::FindFirstFile(pluginsFullPathFilter.c_str(), &foundData); hFindDll = ::FindFirstFile(pluginsFullPathFilter.c_str(), &foundData);
if (hFindDll != INVALID_HANDLE_VALUE && !(foundData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) if (hFindDll != INVALID_HANDLE_VALUE && !(foundData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
{ {
generic_string pluginsFullPath = pluginsFolderPath; dllNames.push_back(pluginsFullPathFilter);
PathAppend(pluginsFullPath, foundData.cFileName);
dllNames.push_back(pluginsFullPath);
PluginList & pl = nppParams->getPluginList(); PluginList & pl = nppParams->getPluginList();
pl.add(foundData.cFileName, false); pl.add(foundData.cFileName, false);
} }
// get plugin folder
while (::FindNextFile(hFindFolder, &foundData)) while (::FindNextFile(hFindFolder, &foundData))
{ {
generic_string pluginsFullPathFilter2 = dir; generic_string pluginsFullPathFilter2 = dir;
PathAppend(pluginsFullPathFilter2, foundData.cFileName); PathAppend(pluginsFullPathFilter2, foundData.cFileName);
generic_string pluginsFolderPath2 = pluginsFullPathFilter2; generic_string pluginsFolderPath2 = pluginsFullPathFilter2;
PathAppend(pluginsFullPathFilter2, TEXT("*.dll")); generic_string dllName2 = foundData.cFileName;
dllName2 += TEXT(".dll");
PathAppend(pluginsFullPathFilter2, dllName2);
// get plugin
hFindDll = ::FindFirstFile(pluginsFullPathFilter2.c_str(), &foundData); hFindDll = ::FindFirstFile(pluginsFullPathFilter2.c_str(), &foundData);
if (hFindDll != INVALID_HANDLE_VALUE && !(foundData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) if (hFindDll != INVALID_HANDLE_VALUE && !(foundData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
{ {
generic_string pluginsFullPath2 = pluginsFolderPath2; dllNames.push_back(pluginsFullPathFilter2);
PathAppend(pluginsFullPath2, foundData.cFileName);
dllNames.push_back(pluginsFullPath2);
PluginList & pl = nppParams->getPluginList(); PluginList & pl = nppParams->getPluginList();
pl.add(foundData.cFileName, false); pl.add(foundData.cFileName, false);