From 6b34f9ce085b796eab134e7d3eda6a2dfe9db8b3 Mon Sep 17 00:00:00 2001 From: xomx Date: Thu, 24 Nov 2022 16:12:07 +0100 Subject: [PATCH] Fix incorrect plugin architecture reports partially Fix partially #12565 Close #12566 --- .../src/MISC/PluginsManager/PluginsManager.cpp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp b/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp index 0f2356bde..11563c648 100644 --- a/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp +++ b/PowerEditor/src/MISC/PluginsManager/PluginsManager.cpp @@ -116,11 +116,19 @@ int PluginsManager::loadPluginFromPath(const TCHAR *pluginFilePath) int archType = nppParams.archType(); if (getBinaryArchitectureType(pluginFilePath) != archType) { - const TCHAR *archErrMsg = TEXT("Cannot load 64-bit plugin."); // IMAGE_FILE_MACHINE_I386 by default - if (archType == IMAGE_FILE_MACHINE_ARM64) - archErrMsg = TEXT("Cannot load 32-bit or non-ARM64 plugin."); - else if(archType == IMAGE_FILE_MACHINE_AMD64) - archErrMsg = TEXT("Cannot load 32-bit plugin."); + const TCHAR* archErrMsg = TEXT("Cannot load plugin."); + switch (archType) + { + case IMAGE_FILE_MACHINE_ARM64: + archErrMsg = TEXT("Cannot load ARM64 plugin."); + break; + case IMAGE_FILE_MACHINE_I386: + archErrMsg = TEXT("Cannot load 32-bit plugin."); + break; + case IMAGE_FILE_MACHINE_AMD64: + archErrMsg = TEXT("Cannot load 64-bit plugin."); + break; + } throw generic_string(archErrMsg); }