tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-27 07:44:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Enhancement: better error messages when plugins fail to load

Browse Source 
Close #1284
This commit is contained in:
Sarang Baheti 2015-12-23 21:44:30 -08:00 committed by Don Ho
parent 70175ee8be
commit 0d35d607bd
1 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -51,7 +51,7 @@ bool PluginsManager::unloadPlugin(int index, HWND nppHandle)
//_pluginInfos[index]->_pluginMenu = NULL;
if (::FreeLibrary(_pluginInfos[index]->_hLib))
_pluginInfos[index]->_hLib = NULL;
_pluginInfos[index]->_hLib = nullptr;
else
printStr(TEXT("not ok"));
//delete _pluginInfos[index];
@ -62,6 +62,24 @@ bool PluginsManager::unloadPlugin(int index, HWND nppHandle)
return true;
}
static std::wstring GetLastErrorAsString()
{
//Get the error message, if any.
DWORD errorMessageID = ::GetLastError();
if (errorMessageID == 0)
return std::wstring(); //No error message has been recorded
LPWSTR messageBuffer = nullptr;
size_t size = FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
nullptr, errorMessageID, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPWSTR)&messageBuffer, 0, nullptr);
std::wstring message(messageBuffer, size);
//Free the buffer.
LocalFree(messageBuffer);
return message;
}
int PluginsManager::loadPlugin(const TCHAR *pluginFilePath, vector<generic_string> & dll2Remove)
{
@ -74,9 +92,15 @@ int PluginsManager::loadPlugin(const TCHAR *pluginFilePath, vector<generic_strin
{
pi->_moduleName = PathFindFileName(pluginFilePath);
pi->_hLib = ::LoadLibrary(pluginFilePath);
if (!pi->_hLib)
throw generic_string(TEXT("Load Library is failed.\nMake \"Runtime Library\" setting of this project as \"Multi-threaded(/MT)\" may cure this problem."));
pi->_hLib = ::LoadLibrary(pluginFilePath);
if (!pi->_hLib)
{
const std::wstring& lastErrorMsg = GetLastErrorAsString();
if (lastErrorMsg.empty())
throw generic_string(TEXT("Load Library is failed.\nMake \"Runtime Library\" setting of this project as \"Multi-threaded(/MT)\" may cure this problem."));
else
throw generic_string(lastErrorMsg.c_str());
}
pi->_pFuncIsUnicode = (PFUNCISUNICODE)GetProcAddress(pi->_hLib, "isUnicode");
if (!pi->_pFuncIsUnicode || !pi->_pFuncIsUnicode())