Tera TermRevision: 8864
https://osdn.net/projects/ttssh2/scm/svn/commits/8864
Author: zmatsuo
Date: 2020-07-28 00:28:08 +0900 (Tue, 28 Jul 2020)
Log Message:
-----------
SSH認証ダイアログで一部のコントロールが常に有効になっていた
MFT: r8735
Revision Links:
--------------
https://osdn.net/projects/ttssh2/scm/svn/commits/8735
Modified Paths:
--------------
branches/4-stable/doc/en/html/about/history.html
branches/4-stable/doc/ja/html/about/history.html
branches/4-stable/ttssh2/ttxssh/auth.c
branches/4-stable/ttssh2/ttxssh/resource.h
-------------- next part --------------
Modified: branches/4-stable/doc/en/html/about/history.html
===================================================================
--- branches/4-stable/doc/en/html/about/history.html 2020-07-25 16:00:58 UTC (rev 8863)
+++ branches/4-stable/doc/en/html/about/history.html 2020-07-27 15:28:08 UTC (rev 8864)
@@ -3280,6 +3280,7 @@
<ul>
<!-- li>\x83V\x83X\x83e\x83\x80\x82̃\x81\x83\x82\x83\x8A\x82\xAA\x95s\x91\xAB\x82\xB5\x82Ă\xA2\x82鎞\x81A\x8C\xAE\x8C\xF0\x8A\xB7\x8E\x9E\x82̃z\x83X\x83g\x8C\xAE\x82ɂ\xE6\x82鏐\x96\xBC\x8C\x9F\x8Fŕs\x90\xB3\x82ȏ\x90\x96\xBC\x82𐳂\xB5\x82\xA2\x95\xA8\x82Ƃ\xB5\x82Ĉ\xB5\x82\xA4\x89\\x90\xAB\x82\xAA\x97L\x82\xC1\x82\xBD\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li -->
<li>Resizing the VT window immediately after user authentication was completed, connection is closed by server.</li>
+ <!-- li>SSH\x94F\x8F_\x83C\x83A\x83\x8D\x83O\x82ňꕔ\x82̃R\x83\x93\x83g\x83\x8D\x81[\x83\x8B\x82\xAA\x8F\xED\x82ɗL\x8C\xF8\x82ɂȂ\xC1\x82Ă\xA2\x82\xBD</li -->
</ul>
</li>
Modified: branches/4-stable/doc/ja/html/about/history.html
===================================================================
--- branches/4-stable/doc/ja/html/about/history.html 2020-07-25 16:00:58 UTC (rev 8863)
+++ branches/4-stable/doc/ja/html/about/history.html 2020-07-27 15:28:08 UTC (rev 8864)
@@ -3286,6 +3286,7 @@
<ul>
<li>\x83V\x83X\x83e\x83\x80\x82̃\x81\x83\x82\x83\x8A\x82\xAA\x95s\x91\xAB\x82\xB5\x82Ă\xA2\x82鎞\x81A\x8C\xAE\x8C\xF0\x8A\xB7\x8E\x9E\x82̃z\x83X\x83g\x8C\xAE\x82ɂ\xE6\x82鏐\x96\xBC\x8C\x9F\x8Fŕs\x90\xB3\x82ȏ\x90\x96\xBC\x82𐳂\xB5\x82\xA2\x95\xA8\x82Ƃ\xB5\x82Ĉ\xB5\x82\xA4\x89\\x90\xAB\x82\xAA\x97L\x82\xC1\x82\xBD\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
<li>\x83\x86\x81[\x83U\x94F\x8F\xAA\x8A\xAE\x97\xB9\x82\xB5\x82\xBD\x92\xBC\x8C\xE3\x82\xC9VT\x83E\x83B\x83\x93\x83h\x83E\x82̃T\x83C\x83Y\x82\xF0\x95ύX\x82\xB7\x82\xE9\x82ƁA\x83T\x81[\x83o\x82\xA9\x82\xE7\x90ؒf\x82\xB3\x82\xEA\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+ <li>SSH\x94F\x8F_\x83C\x83A\x83\x8D\x83O\x82ňꕔ\x82̃R\x83\x93\x83g\x83\x8D\x81[\x83\x8B\x82\xAA\x8F\xED\x82ɗL\x8C\xF8\x82ɂȂ\xC1\x82Ă\xA2\x82\xBD</li>
</ul>
</li>
Modified: branches/4-stable/ttssh2/ttxssh/auth.c
===================================================================
--- branches/4-stable/ttssh2/ttxssh/auth.c 2020-07-25 16:00:58 UTC (rev 8863)
+++ branches/4-stable/ttssh2/ttxssh/auth.c 2020-07-27 15:28:08 UTC (rev 8864)
@@ -166,19 +166,36 @@
BOOL TIS_enabled = controlID == IDC_SSHUSETIS;
BOOL PAGEANT_enabled = controlID == IDC_SSHUSEPAGEANT;
int i;
+ static const int password_item_ids[] = {
+ IDC_SSHPASSWORDCAPTION,
+ IDC_SSHPASSWORD,
+ IDC_SSHPASSWORD_OPTION,
+ };
+ static const int rsa_item_ids[] = {
+ IDC_RSAFILENAMELABEL,
+ IDC_RSAFILENAME,
+ IDC_CHOOSERSAFILE,
+ };
+ static const int rhosts_item_ids[] = {
+ IDC_LOCALUSERNAMELABEL,
+ IDC_LOCALUSERNAME,
+ IDC_HOSTRSAFILENAMELABEL,
+ IDC_HOSTRSAFILENAME,
+ IDC_CHOOSEHOSTRSAFILE,
+ };
CheckRadioButton(dlg, IDC_SSHUSEPASSWORD, MAX_AUTH_CONTROL, controlID);
- EnableWindow(GetDlgItem(dlg, IDC_SSHPASSWORDCAPTION), (!TIS_enabled && !PAGEANT_enabled));
- EnableWindow(GetDlgItem(dlg, IDC_SSHPASSWORD), (!TIS_enabled && !PAGEANT_enabled));
- EnableWindow(GetDlgItem(dlg, IDC_SSHPASSWORD_OPTION), (!TIS_enabled && !PAGEANT_enabled));
+ for (i = 0; i < _countof(password_item_ids); i++) {
+ EnableWindow(GetDlgItem(dlg, password_item_ids[i]), (!TIS_enabled && !PAGEANT_enabled));
+ }
- for (i = IDC_CHOOSERSAFILE; i <= IDC_RSAFILENAME; i++) {
- EnableWindow(GetDlgItem(dlg, i), RSA_enabled);
+ for (i = 0; i < _countof(rsa_item_ids); i++) {
+ EnableWindow(GetDlgItem(dlg, rsa_item_ids[i]), RSA_enabled);
}
- for (i = IDC_LOCALUSERNAMELABEL; i <= IDC_HOSTRSAFILENAME; i++) {
- EnableWindow(GetDlgItem(dlg, i), rhosts_enabled);
+ for (i = 0; i < _countof(rhosts_item_ids); i++) {
+ EnableWindow(GetDlgItem(dlg, rhosts_item_ids[i]), rhosts_enabled);
}
}
Modified: branches/4-stable/ttssh2/ttxssh/resource.h
===================================================================
--- branches/4-stable/ttssh2/ttxssh/resource.h 2020-07-25 16:00:58 UTC (rev 8863)
+++ branches/4-stable/ttssh2/ttxssh/resource.h 2020-07-27 15:28:08 UTC (rev 8864)
@@ -168,7 +168,6 @@
#define IDC_FN_STATIC 1095
#define IDC_RECVFILE 1096
#define IDC_RECV 1097
-#define IDC_BUTTON1 1098
#define IDC_SFTP_TEST 1098
#define IDC_DUMMY_LINE 1099
#define IDC_LOCALUSERNAMELABEL 1100