diff --git a/Docs/src/history.but b/Docs/src/history.but index 8237ec43..08e34590 100644 --- a/Docs/src/history.but +++ b/Docs/src/history.but @@ -18,6 +18,8 @@ Released on ? \b FileReadByte no longer performs a Unicode conversion on non-ASCII characters +\b Windows 8.1 & 2012R2 support in WinVer.nsh + \b Fixed !define Unicode null terminator bug (\W{http://sf.net/p/nsis/bugs/1079/}{bug #1079}) \b Unicode stubs create WCHAR richedit controls (\W{http://sf.net/p/nsis/bugs/1080/}{bug #1080}) diff --git a/Include/WinVer.nsh b/Include/WinVer.nsh index 09753912..963587ec 100644 --- a/Include/WinVer.nsh +++ b/Include/WinVer.nsh @@ -34,6 +34,8 @@ ; 2008R2 ; 8 ; 2012 +; 8.1 +; 2012R2 ; ; AtLeastServicePack checks if the installer is running on Windows service pack version at least as specified. ; IsServicePack checks if the installer is running on Windows service pack version exactly as specified. @@ -122,7 +124,7 @@ ;define WINVER_98SE 0x040a0000 ;4.10.2222 !define WINVER_ME_NT 0x045a0000 ;4.90.3000 !define WINVER_ME 0x045a0000 ;4.90.3000 -;define WINVER_NT3d51 ;3.51.1057 +;define WINVER_NT3.51 ;3.51.1057 !define WINVER_NT4_NT 0x84000000 ;4.00.1381 !define WINVER_NT4 0x04000000 ;4.00.1381 !define WINVER_2000_NT 0x85000000 ;5.00.2195 @@ -144,6 +146,10 @@ !define WINVER_8 0x06020000 ;6.02.9200 !define WINVER_2012_NT 0x86020001 ;6.02.9200 !define WINVER_2012 0x06020001 ;6.02.9200 +!define WINVER_8.1_NT 0x86030000 ;6.03.9600 +!define WINVER_8.1 0x06030000 ;6.03.9600 +!define WINVER_2012R2_NT 0x86030001 ;6.03.9600 +!define WINVER_2012R2 0x06030001 ;6.03.9600 # use this to make all nt > 9x @@ -402,6 +408,8 @@ !insertmacro __WinVer_DefineOSTest ${Test} 2008R2 '${Suffix}' !insertmacro __WinVer_DefineOSTest ${Test} 8 '${Suffix}' !insertmacro __WinVer_DefineOSTest ${Test} 2012 '${Suffix}' + !insertmacro __WinVer_DefineOSTest ${Test} 8.1 '${Suffix}' + !insertmacro __WinVer_DefineOSTest ${Test} 2012R2 '${Suffix}' !macroend !insertmacro __WinVer_DefineOSTests AtLeast ""