Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make bitness available in DebugInfo

Browse Source
This commit is contained in:
Don HO 2016-06-17 20:18:06 +02:00
parent c059cc03dc
commit c15a0deb35
2 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,29 +92,6 @@ int PluginsManager::loadPlugin(const TCHAR *pluginFilePath, vector<generic_strin
PluginInfo *pi = new PluginInfo; PluginInfo *pi = new PluginInfo;
try try
{ {
DWORD detectionResult;
if (GetBinaryType(pluginFilePath, &detectionResult))
{
switch (detectionResult)
{
case SCS_32BIT_BINARY:
{
if (nppParams->isx64())
throw generic_string(TEXT("This plugin is in 32-bit, whereas your Notepad++ is in 64-bit."));
}
break;
case SCS_64BIT_BINARY:
{
if (not nppParams->isx64())
throw generic_string(TEXT("This plugin is in 64-bit, whereas your Notepad++ is in 32-bit."));
}
break;
default:
throw generic_string(TEXT("It's not a windows standard dll."));
}
}
pi->_moduleName = PathFindFileName(pluginFilePath); pi->_moduleName = PathFindFileName(pluginFilePath);
pi->_hLib = ::LoadLibrary(pluginFilePath); pi->_hLib = ::LoadLibrary(pluginFilePath);

3
PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp
View File

@ -123,8 +123,11 @@ INT_PTR CALLBACK DebugInfoDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM /
{ {
case WM_INITDIALOG: case WM_INITDIALOG:
{ {
NppParameters *pNppParam = NppParameters::getInstance();
// Notepad++ version // Notepad++ version
_debugInfoStr = NOTEPAD_PLUS_VERSION; _debugInfoStr = NOTEPAD_PLUS_VERSION;
_debugInfoStr += pNppParam->isx64() ? TEXT(" (64-bit)") : TEXT(" (32-bit)");
_debugInfoStr += TEXT("\r\n"); _debugInfoStr += TEXT("\r\n");
// Build time // Build time