From: <sv...@op...> - 2025-03-10 10:58:20
|
Author: manx Date: Mon Mar 10 11:58:03 2025 New Revision: 23001 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=23001 Log: [Ref] Plugin Manager: Comparing paths case-insensitively is really only necessary for the tracker. Always use UTF8 fallback for libopenmpt. Avoids dependency on lstrcmpi(). Modified: trunk/OpenMPT/soundlib/plugins/PluginManager.cpp Modified: trunk/OpenMPT/soundlib/plugins/PluginManager.cpp ============================================================================== --- trunk/OpenMPT/soundlib/plugins/PluginManager.cpp Mon Mar 10 11:55:10 2025 (r23000) +++ trunk/OpenMPT/soundlib/plugins/PluginManager.cpp Mon Mar 10 11:58:03 2025 (r23001) @@ -615,7 +615,7 @@ }; PlugMatchQuality match = kNoMatch; // "Match quality" of found plugin. Higher value = better match. -#if MPT_OS_WINDOWS && !MPT_OS_WINDOWS_WINRT +#if defined(MODPLUG_TRACKER) && MPT_OS_WINDOWS && !MPT_OS_WINDOWS_WINRT const mpt::PathString libraryName = mpt::PathString::FromUnicode(mixPlugin.GetLibraryName()); #else const std::string libraryName = mpt::ToCharset(mpt::Charset::UTF8, mixPlugin.GetLibraryName()); @@ -625,7 +625,7 @@ const bool matchID = (plug->pluginId1 == mixPlugin.Info.dwPluginId1) && (plug->pluginId2 == mixPlugin.Info.dwPluginId2) && (plug->shellPluginID == mixPlugin.Info.shellPluginID); -#if MPT_OS_WINDOWS && !MPT_OS_WINDOWS_WINRT +#if defined(MODPLUG_TRACKER) && MPT_OS_WINDOWS && !MPT_OS_WINDOWS_WINRT const bool matchName = !mpt::PathCompareNoCase(plug->libraryName, libraryName); #else const bool matchName = !mpt::CompareNoCaseAscii(plug->libraryName.ToUTF8(), libraryName); |