From c15a0deb35bb0ea241182b81c4e48ee987dd9a87 Mon Sep 17 00:00:00 2001
From: Don HO <don.h@free.fr>
Date: Fri, 17 Jun 2016 20:18:06 +0200
Subject: [PATCH] Make bitness available in DebugInfo

---
 .../MISC/PluginsManager/PluginsManager.cpp    | 23 -------------------
 .../src/WinControls/AboutDlg/AboutDlg.cpp     |  3 +++
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp b/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp
index db8dbe2d..c08b5fa0 100644
--- a/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp
+++ b/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp
@@ -92,29 +92,6 @@ int PluginsManager::loadPlugin(const TCHAR *pluginFilePath, vector<generic_strin
 	PluginInfo *pi = new PluginInfo;
 	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->_hLib = ::LoadLibrary(pluginFilePath);
diff --git a/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp b/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp
index 387b45c8..f85ed019 100644
--- a/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp
+++ b/PowerEditor/src/WinControls/AboutDlg/AboutDlg.cpp
@@ -123,8 +123,11 @@ INT_PTR CALLBACK DebugInfoDlg::run_dlgProc(UINT message, WPARAM wParam, LPARAM /
 	{
 		case WM_INITDIALOG:
 		{
+			NppParameters *pNppParam = NppParameters::getInstance();
+
 			// Notepad++ version
 			_debugInfoStr = NOTEPAD_PLUS_VERSION;
+			_debugInfoStr += pNppParam->isx64() ? TEXT("   (64-bit)") : TEXT("   (32-bit)");
 			_debugInfoStr += TEXT("\r\n");
 
 			// Build time