Tera TermRevision: 10819
https://osdn.net/projects/ttssh2/scm/svn/commits/10819
Author: nmaya
Date: 2023-08-10 08:48:29 +0900 (Thu, 10 Aug 2023)
Log Message:
-----------
表示される MSVC, Windows SDK バージョンについてコメント追加・調整
cf. ttssh2-dev 667
Modified Paths:
--------------
trunk/teraterm/ttpdlg/ttdlg.c
-------------- next part --------------
Modified: trunk/teraterm/ttpdlg/ttdlg.c
===================================================================
--- trunk/teraterm/ttpdlg/ttdlg.c 2023-08-06 05:55:55 UTC (rev 10818)
+++ trunk/teraterm/ttpdlg/ttdlg.c 2023-08-09 23:48:29 UTC (rev 10819)
@@ -2173,6 +2173,9 @@
// 1916 2017 15.9.x 14.16
// 1920 2019 16.0.x 14.20
// 1921 2019 16.1.x 14.21
+ // 1929 2019 16.11.x 14.29
+ // 1930 2022 17.0.x 14.30
+ // 1936 2022 17.6.x 14.36
msc_ver = (_MSC_FULL_VER / 10000000);
msc_low_ver = (_MSC_FULL_VER / 100000) % 100;
if (msc_ver < 19) {
@@ -2226,12 +2229,14 @@
#if defined(WDK_NTDDI_VERSION)
// \x83r\x83\x8B\x83h\x82\xB5\x82\xBD\x82Ƃ\xAB\x82Ɏg\x82\xED\x82ꂽ SDK \x82̃o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x8E擾\x82\xB7\x82\xE9
// URL: https://developer.microsoft.com/en-us/windows/downloads/sdk-archive/
-// - Visual Studio Installer \x82ɕ\\x8E\xA6\x82\xB3\x82\xEA\x82\xE9\x83o\x81[\x83W\x83\x87\x83\x93
-// - \x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB3\x82ꂽ SDK \x82\xAA\x81u\x83A\x83v\x83\x8A\x82Ƌ@\x94\\x81v\x82ŕ\\x8E\xA6\x82\xB3\x82\xEA\x82\xE9\x83o\x81[\x83W\x83\x87\x83\x93
-// - \x8F\xE3\x8BL URL \x82ł̕\\x8E\xA6\x83o\x81[\x83W\x83\x87\x83\x93
-// - \x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x90\xE6\x83t\x83H\x83\x8B\x83_\x96\xBC
-// \x82ŁA\x8DŌ\xE3\x82̃u\x83\x8D\x83b\x83N\x82̐\x94\x8E\x9A\x82\xAA\x93\xAF\x82\xB6\x82ł͂Ȃ\xA2\x81B
-//
+// \x83o\x81[\x83W\x83\x87\x83\x93\x94ԍ\x86\x82ɂ\xCD
+// (1) Visual Studio \x82Ńv\x83\x8D\x83W\x83F\x83N\x83g\x82̃v\x83\x8D\x83p\x83e\x83B\x82\xCC "Windows SDK \x83o\x81[\x83W\x83\x87\x83\x93" \x82ɗ\xB3\x82\xEA\x82\xE9\x83o\x81[\x83W\x83\x87\x83\x93
+// (2) \x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x82\xB3\x82ꂽ SDK \x82\xAA\x81u\x83A\x83v\x83\x8A\x82Ƌ@\x94\\x81v\x82ŕ\\x8E\xA6\x82\xB3\x82\xEA\x82\xE9\x83o\x81[\x83W\x83\x87\x83\x93
+// (3) \x8F\xE3\x8BL URL \x82ł̕\\x8E\xA6\x83o\x81[\x83W\x83\x87\x83\x93
+// (4) \x83C\x83\x93\x83X\x83g\x81[\x83\x8B\x90\xE6\x83t\x83H\x83\x8B\x83_\x96\xBC
+// \x82\xAA\x82\xA0\x82邪\x81A\x8DŌ\xE3\x82̃u\x83\x8D\x83b\x83N\x82̐\x94\x8E\x9A\x82͓\xAF\x82\xB6\x82ɂȂ\xE7\x82Ȃ\xA2\x82\xB1\x82Ƃ\xAA\x91\xBD\x82\xA2\x81B
+// e.g. (1) 10.0.18362.0, (2) 10.0.18362.1, (3) 10.0.18362.1, (4) 10.0.18362.0
+// (1) 10.0.22000.0, (2) 10.0.22000.832, (3) 10.0.22000.832, (4) 10.0.22000.0
static void GetSDKInfo(char *buf, size_t buf_size)
{
if (WDK_NTDDI_VERSION >= 0x0A00000B) {
@@ -2238,10 +2243,14 @@
strncpy_s(buf, buf_size, "Windows SDK", _TRUNCATE);
switch (WDK_NTDDI_VERSION) {
case 0x0A00000B: // NTDDI_WIN10_CO
- strncat_s(buf, buf_size, " for Windows 11 (10.0.22000.194)", _TRUNCATE);
+ // 10.0.22000.194 \x82\xE0\x91\xB6\x8D݂\xB7\x82邪\x94\xBB\x92\xE8\x82ł\xAB\x82Ȃ\xA2
+ strncat_s(buf, buf_size, " for Windows 11 (10.0.22000.832)", _TRUNCATE);
break;
case 0x0A00000C: // NTDDI_WIN10_NI
- strncat_s(buf, buf_size, " for Windows 11 (10.0.22621.1)", _TRUNCATE);
+ // 10.0.22621.1 \x82\xE0\x91\xB6\x8D݂\xB7\x82邪\x94\xBB\x92\xE8\x82ł\xAB\x82Ȃ\xA2
+ // (2)\x83C\x83\x93\x83X\x83g\x81[\x83\x89, (3)URL \x82ł͕ʈ\xB5\x82\xA2\x82\xCC 10.0.22621.1778 \x82\xE0\x93\xAF\x82\xB6\x94\xBB\x92\xE8\x82ɂȂ\xE9
+ // AppVeyor \x82Ŏg\x82\xED\x82\xEA\x82Ă\xA2\x82\xE9\x82͂\xB8\x82̃o\x81[\x83W\x83\x87\x83\x93\x94ԍ\x86\x82\xF0\x95Ԃ\xB7
+ strncat_s(buf, buf_size, " for Windows 11 (10.0.22621.755)", _TRUNCATE);
break;
default: {
char str[32];