tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix Windows 11 OS version not detected in getWindowsVersion 

Fix #12100
This commit is contained in:
Don Ho 2022-09-09 11:14:32 +02:00
parent ce85323a9e
commit a5c201f79c
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h
View File

@ -39,7 +39,7 @@ enum LangType {L_TEXT, L_PHP , L_C, L_CPP, L_CS, L_OBJC, L_JAVA, L_RC,\
enum class ExternalLexerAutoIndentMode { Standard, C_Like, Custom }; enum class ExternalLexerAutoIndentMode { Standard, C_Like, Custom };
enum class MacroStatus { Idle, RecordInProgress, RecordingStopped, PlayingBack }; enum class MacroStatus { Idle, RecordInProgress, RecordingStopped, PlayingBack };
enum winVer { WV_UNKNOWN, WV_WIN32S, WV_95, WV_98, WV_ME, WV_NT, WV_W2K, WV_XP, WV_S2003, WV_XPX64, WV_VISTA, WV_WIN7, WV_WIN8, WV_WIN81, WV_WIN10 }; enum winVer { WV_UNKNOWN, WV_WIN32S, WV_95, WV_98, WV_ME, WV_NT, WV_W2K, WV_XP, WV_S2003, WV_XPX64, WV_VISTA, WV_WIN7, WV_WIN8, WV_WIN81, WV_WIN10, WV_WIN11 };
enum Platform { PF_UNKNOWN, PF_X86, PF_X64, PF_IA64, PF_ARM64 }; enum Platform { PF_UNKNOWN, PF_X86, PF_X64, PF_IA64, PF_ARM64 };

3
PowerEditor/src/Parameters.cpp
View File

@ -839,6 +839,9 @@ winVer NppParameters::getWindowsVersion()
{ {
case VER_PLATFORM_WIN32_NT: case VER_PLATFORM_WIN32_NT:
{ {
if (osvi.dwMajorVersion == 10 && osvi.dwMinorVersion == 0 && osvi.dwBuildNumber >= 22000)
return WV_WIN11;
if (osvi.dwMajorVersion == 10 && osvi.dwMinorVersion == 0) if (osvi.dwMajorVersion == 10 && osvi.dwMinorVersion == 0)
return WV_WIN10; return WV_WIN10;