From svnnotify ＠ sourceforge.jp  Fri Jun  2 00:11:54 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 02 Jun 2017 00:11:54 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY3NjRdICDml6XmnKzoqp7ku6XlpJbjga4=?=
 =?utf-8?b?5LuW6KiA6Kqe44Oa44O844K444Gr44CB5pel5pys6Kqe44Oa44O844K444G4?=
 =?utf-8?b?44Gu44Oq44Oz44Kv44KS5by144KL44KI44GG44Gr44GX44Gf44CC?=
Message-ID: <1496329914.882920.85888.nullmailer@users.sourceforge.jp>

Revision: 6764
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6764
Author:   yutakapon
Date:     2017-06-02 00:11:54 +0900 (Fri, 02 Jun 2017)
Log Message:
-----------
日本語以外の他言語ページに、日本語ページへのリンクを張るようにした。

Modified Paths:
--------------
    trunk/doc/ja/html/menu/setup-terminalen.html
    trunk/doc/ja/html/menu/setup-terminalk.html
    trunk/doc/ja/html/menu/setup-terminalr.html
    trunk/doc/ja/html/menu/setup-terminalutf8.html

-------------- next part --------------
Modified: trunk/doc/ja/html/menu/setup-terminalen.html
===================================================================
--- trunk/doc/ja/html/menu/setup-terminalen.html	2017-05-31 12:49:23 UTC (rev 6763)
+++ trunk/doc/ja/html/menu/setup-terminalen.html	2017-06-01 15:11:54 UTC (rev 6764)
@@ -17,7 +17,7 @@
     </p>
 
     <ul>
-      <li><a href="setup-terminalen.html">\x89p\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
+      <li><a href="setup-terminal.html">\x93\xFA\x96{\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
       <li><a href="setup-terminalr.html">\x83\x8D\x83V\x83A\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
       <li><a href="setup-terminalk.html">\x8A?\x91\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
       <li><a href="setup-terminalutf8.html">UTF-8\x83\x82\x81[\x83h\x82?w\x83\x8B\x83v</a></li>

Modified: trunk/doc/ja/html/menu/setup-terminalk.html
===================================================================
--- trunk/doc/ja/html/menu/setup-terminalk.html	2017-05-31 12:49:23 UTC (rev 6763)
+++ trunk/doc/ja/html/menu/setup-terminalk.html	2017-06-01 15:11:54 UTC (rev 6764)
@@ -19,7 +19,7 @@
     <ul>
       <li><a href="setup-terminalen.html">\x89p\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
       <li><a href="setup-terminalr.html">\x83\x8D\x83V\x83A\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
-      <li><a href="setup-terminalk.html">\x8A?\x91\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
+      <li><a href="setup-terminal.html">\x93\xFA\x96{\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
       <li><a href="setup-terminalutf8.html">UTF-8\x83\x82\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
     </ul>
 

Modified: trunk/doc/ja/html/menu/setup-terminalr.html
===================================================================
--- trunk/doc/ja/html/menu/setup-terminalr.html	2017-05-31 12:49:23 UTC (rev 6763)
+++ trunk/doc/ja/html/menu/setup-terminalr.html	2017-06-01 15:11:54 UTC (rev 6764)
@@ -18,7 +18,7 @@
 
     <ul>
       <li><a href="setup-terminalen.html">\x89p\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
-      <li><a href="setup-terminalr.html">\x83\x8D\x83V\x83A\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
+      <li><a href="setup-terminal.html">\x93\xFA\x96{\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
       <li><a href="setup-terminalk.html">\x8A?\x91\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
       <li><a href="setup-terminalutf8.html">UTF-8\x83\x82\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
     </ul>

Modified: trunk/doc/ja/html/menu/setup-terminalutf8.html
===================================================================
--- trunk/doc/ja/html/menu/setup-terminalutf8.html	2017-05-31 12:49:23 UTC (rev 6763)
+++ trunk/doc/ja/html/menu/setup-terminalutf8.html	2017-06-01 15:11:54 UTC (rev 6764)
@@ -20,7 +20,7 @@
       <li><a href="setup-terminalen.html">\x89p\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
       <li><a href="setup-terminalr.html">\x83\x8D\x83V\x83A\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
       <li><a href="setup-terminalk.html">\x8A?\x91\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
-      <li><a href="setup-terminalutf8.html">UTF-8\x83\x82\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
+      <li><a href="setup-terminal.html">\x93\xFA\x96{\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
     </ul>
 
     <h2>"Terminal setup" \x83_\x83C\x83A\x83\x8D\x83O\x83{\x83b\x83N\x83X</h2>

From svnnotify ＠ sourceforge.jp  Fri Jun  2 12:46:00 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 02 Jun 2017 12:46:00 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY3NjVdICDjg6njgqTjg5bjg6njg6rjgas=?=
 =?utf-8?b?44Gk44GE44Gm44Gu6Kqs5piO44KS5L+u5q2j?=
Message-ID: <1496375160.114861.122701.nullmailer@users.sourceforge.jp>

Revision: 6765
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6765
Author:   maya
Date:     2017-06-02 12:45:59 +0900 (Fri, 02 Jun 2017)
Log Message:
-----------
ライブラリについての説明を修正

- SMFTについて追記
- 説明の主語を統一
- 説明内容を調整
- 画像サイズを統一

Modified Paths:
--------------
    trunk/doc/en/html/reference/image/library_relation.png
    trunk/doc/en/html/reference/image/library_relation.ppt
    trunk/doc/en/html/reference/sourcecode.html
    trunk/doc/ja/html/reference/image/library_relation.png
    trunk/doc/ja/html/reference/image/library_relation.ppt
    trunk/doc/ja/html/reference/image/module_relation.png
    trunk/doc/ja/html/reference/sourcecode.html

-------------- next part --------------
Modified: trunk/doc/en/html/reference/image/library_relation.png
===================================================================
(Binary files differ)

Modified: trunk/doc/en/html/reference/image/library_relation.ppt
===================================================================
(Binary files differ)

Modified: trunk/doc/en/html/reference/sourcecode.html
===================================================================
--- trunk/doc/en/html/reference/sourcecode.html	2017-06-01 15:11:54 UTC (rev 6764)
+++ trunk/doc/en/html/reference/sourcecode.html	2017-06-02 03:45:59 UTC (rev 6765)
@@ -87,19 +87,29 @@
 <hr>
 
 <h2><a name="library">Third Party Libraries</a></h2>
-    It is inefficient to build advanced software from scratch, that's why Tera Term actively uses open source libraries. This, however, requires from developers to be careful and avoid license violations, especially GPL. <br>
-    
-    Several Tera Term modules are linked to open source libraries as shown on the drawing below. The macro program is linked to regular expression library "Oniguruma", which allows to handle regular expressions in "waitregex" and "sprintf" macro commands. Tera Term also calls this library to display Oniguruma version information in "About Tera Term" dialog box. <br>    
 <p>
-    "TTSSH" module uses OpenSSL library to perform cryptography related operations. One may think that OpenSSL library contains only Secure Socket Layer (SSL) protocol related functions used for secure web access, however that is wrong assumption. OpenSSL library also supports basic cipher algorithms, which are utilized by "TTSSH" module. Since Secure Layer related functions of the library are not used, it is very unlikely that "TTSSH" module will be compromised if a security hole is found in OpenSSL library. <br>
-    
-    Zlib library is used to compress SSH packets. Packet compression is effective on low speed networks like for example with dial-up connections, however in high speed networks it may slow down communication. That's why packet compression function is disabled by default. <br>
-
-    "PuTTY" is another free terminal emulator that became a de-facto standard worldwide. PuTTY package contains SSH authentication agent called "Pageant". TTSSH uses part of PuTTY source code to support Pageant based authentication method.    
+  It is inefficient to build advanced software from scratch, that's why Tera Term actively uses open source libraries. This, however, requires from developers to be careful and avoid license violations, especially GPL.<br>
+  Several Tera Term modules are linked to open source libraries as shown on the drawing below.
 </p>
-    
+<p>
+  The macro program is linked to regular expression library "Oniguruma", which allows to handle regular expressions in "waitregex", "strmatch" and "strreplace" macro commands.<br>
+  Tera Term also calls this library to display Oniguruma version information in "About Tera Term" dialog box.
+</p>
+<p>
+  The macro program is linked to pseudorandom number generator "SFMT", which allows to generate random number in "random" macro command.
+</p>
+<p>
+  "TTSSH" module is linkd to "OpenSSL" library to perform cryptography related operations. One may think that OpenSSL library contains only Secure Socket Layer (SSL) protocol related functions used for secure web access, however that is wrong assumption. OpenSSL library also supports basic cipher algorithms, which are utilized by "TTSSH" module. Since Secure Layer related functions of the library are not used, it is very unlikely that "TTSSH" module will be compromised if a SSL related security hole is found in OpenSSL library.
+</p>
+<p>
+  "TTSSH" module is linkd to compression Library "zlib" to compress SSH packets. Packet compression is effective on low speed networks like for example with dial-up connections, however in high speed networks it may slow down communication. That's why packet compression function is disabled by default. <br>
+</p>
+<p>
+  "TTSSH" module is linkd to terminal emulator "PuTTY." PuTTY package contains SSH authentication agent called "Pageant". TTSSH uses part of PuTTY source code to support Pageant based authentication method. SSH communication part of PuTTY source code is not used.
+</p>
+<p>
 Note that these libraries are called statically (not via dynamic link). When compiling the source code with these libraries use "/MT" option. Tera Term doesn't use dynamic calls to the libraries because not all user environments can support such calls, which may cause Tera Term to crash.
-  
+</p> 
 
 <div align="center">
 <img src="image/library_relation.png" width=720 height=540>

Modified: trunk/doc/ja/html/reference/image/library_relation.png
===================================================================
(Binary files differ)

Modified: trunk/doc/ja/html/reference/image/library_relation.ppt
===================================================================
(Binary files differ)

Modified: trunk/doc/ja/html/reference/image/module_relation.png
===================================================================
(Binary files differ)

Modified: trunk/doc/ja/html/reference/sourcecode.html
===================================================================
--- trunk/doc/ja/html/reference/sourcecode.html	2017-06-01 15:11:54 UTC (rev 6764)
+++ trunk/doc/ja/html/reference/sourcecode.html	2017-06-02 03:45:59 UTC (rev 6765)
@@ -83,17 +83,29 @@
 
 
 <h2><a name="library">\x83\x89\x83C\x83u\x83\x89\x83\x8A\x8D\\x90\xAC</a></h2>
-\x81@\x8D\x82\x93x\x82?@\x94\\x82\xF0\x8E\xC0\x8C\xBB\x82\xB7\x82邽\x82??A\x83t\x83\x8B\x83X\x83N\x83\x89\x83b\x83`\x82?\xC0\x91\x95\x82\xB7\x82邱\x82??\x{5E60AA}\x82\xA2\x82\xA2\x82??\xBE\x82\xA6\x82?\xB9\x82\xF1\x81BTera Term\x82ł?J\x94\xAD\x8C\x{5E627B}\x82\xF0\x90}\x82邽\x82??A\x83I\x81[\x83v\x83\x93\x83\\x81[\x83X\x82?\x89\x83C\x83u\x83\x89\x83\x8A\x82\xF0\x90ϋ?I\x82?\x98\x97p\x82\xB5\x82Ă\xA2\x82?\xB7\x81B\x82\xBD\x82\xBE\x82\xB5\x81A\x83I\x81[\x83v\x83\x93\x83\\x81[\x83X\x90\xBB\x95i\x82?\x89\x83C\x83Z\x83\x93\x83X\x82?\xE6\x82鋣\x8D\x87\x82??\x8D\x88??\xA4\x95K\x97v\x82\xAA\x82\xA0\x82\xE8\x82?\xB7\x81i\x93\xC1\x82\xC9GPL\x81j\x81B<br>
-\x81@\x89\xBA\x90}\x82?A\x83I\x81[\x83v\x83\x93\x83\\x81[\x83X\x82?\x89\x83C\x83u\x83\x89\x83\x8A\x82\xF0\x83\x8A\x83\x93\x83N\x82\xB5\x82Ă\xA2\x82?\x83W\x83\x85\x81[\x83\x8B\x82?A\x82\xBB\x82?\x8A\x83\x93\x83N\x8F?\xF0\x8E\xA6\x82\xB5\x82?\xB7\x81BTera Term\x83}\x83N\x83\x8D\x83v\x83\x8D\x83O\x83\x89\x83\x80\x82?\xA8\x82\xA2\x82āA"waitregex"\x82\xE2"sprintf"\x83R\x83}\x83\x93\x83h\x82?\xA8\x82\xA2\x82Đ\xB3\x8BK\x95\\x8C\xBB\x82?p\x82\xB7\x82邽\x82??AOniguruma\x82?Ă?\xEA\x82鐳\x8BK\x95\\x8C\xBB\x83\x89\x83C\x83u\x83\x89\x83\x8A\x82\xF0\x83\x8A\x83\x93\x83N\x82\xB5\x82Ă\xA2\x82?\xB7\x81BTera Term\x96{\x91?ł?A\x83o\x81[\x83W\x83\x87\x83\x93\x83_\x83C\x83A\x83\x8D\x83O\x82\xC9Oniguruma\x82?o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x95\\x8E\xA6\x82\xB7\x82邽\x82?\xBE\x82\xAF\x82?\x8A\x83\x93\x83N\x82\xF0\x82\xB5\x82Ă\xA2\x82?\xB7\x81B
-\x81@
 <p>
-\x81 ＠ SSH\x83\x82\x83W\x83\x85\x81[\x83\x8B\x82ł\xA0\x82\xE9"TTSSH"\x82?A\x88Í\x86\x8F\x88\x97\x9D\x82\xF0\x8Ds\x82\xA4\x82\xBD\x82?\xC9OpenSSL\x82?p\x82\xB5\x82Ă\xA2\x82?\xB7\x81B"OpenSSL"\x82?\xA2\x82\xA4\x83l\x81[\x83~\x83\x93\x83O\x82\xA9\x82\xE7Web\x83A\x83N\x83Z\x83X\x82?g\x82\xED\x82\xEA\x82\xE9SSL(Secure Socket Layer)\x83v\x83\x8D\x83g\x83R\x83\x8B\x90\xEA\x97p\x82?\x89\x83C\x83u\x83\x89\x83\x8A\x82\xA9\x82?v\x82\xED\x82?\x82\xBF\x82ł\xB7\x82\xAA\x81A\x8A\xEE\x96{\x93I\x82?Í\x86\x83A\x83\x8B\x83S\x83\x8A\x83Y\x83\x80\x82\xF0\x83T\x83|\x81[\x83g\x82\xB5\x82Ă\xA2\x82邱\x82?\xA9\x82\xE7\x81ATTSSH\x82ł\xCDOpenSSL\x82???\xEA\x82\xE9\x92?\x83C\x83\x84\x82?\x8B\x81[\x83`\x83\x93\x82?p\x82\xB7\x82邾\x82\xAF\x82?\xAF\x82?\xC1\x82Ă\xA2\x82?\xB7\x81B\x82\xB1\x82?\xB1\x82??A\x82\xB7\x82??OpenSSL\x83\x89\x83C\x83u\x83\x89\x83\x8A\x82?Z\x83L\x83\x85\x83\x8A\x83e\x83B\x83z\x81[\x83\x8B\x82\xAA\x94\xAD\x8C\xA9\x82\xB3\x82?\x82?\xB5\x82Ă\xE0\x81A
 TTSSH\x82??e\x8B\xBF\x82???Ē?\x82?\xA2\x82\xA4\x82\xB1\x82?ł\xB7\x81B<br>
-\x81 ＠ zlib\x83\x89\x83C\x83u\x83\x89\x83\x8A\x82?ASSH\x83p\x83P\x83b\x83g\x82?\xB3\x8Fk\x82\xF0\x8Ds\x82\xA4\x82\xBD\x82??\x98\x97p\x82\xB5\x82Ă\xA2\x82?\xB7\x81B\x82\xBD\x82\xBE\x82\xB5\x81A\x83_\x83C\x83\x84\x83\x8B\x83A\x83b\x83v\x89\xF1\x90\xFC\x82????\x93x\x82?l\x83b\x83g\x83\x8F\x81[\x83N\x82?\xA8\x82\xA2\x82Ă?A\x83p\x83P\x83b\x83g\x88\xB3\x8Fk\x82?L\x8C\xF8\x82ł\xB7\x82\xAA\x81A\x8D\xF0\x8D\xA1\x82?\x82\x91\xAC\x89\xF1\x90\xFC\x82ł??\xB5\x82?\x93x\x92?\x82\xF0\x8F\xB5\x82\xAD\x91\xAB\x82\xA9\x82\xB9\x82??\xE8\x82?\xB7\x81B\x82?\x82?A\x83f\x83t\x83H\x83\x8B\x83g\x82ł?p\x83P\x83b\x83g\x88\xB3\x8Fk\x8B@\x94\\x82?\xB3\x8C\x{27B0B3}\x82\xEA\x82Ă\xA2\x82?\xB7\x81B
-\x81 ＠ PuTTY\x82?\xA2\x8AE\x95W\x8F\x80\x82ł\xA0\x82\xE9\x83t\x83\x8A\x81[\x82?^\x81[\x83~\x83i\x83\x8B\x83G\x83~\x83\x85\x83\x8C\x81[\x83^\x82ł\xB7\x81BPuTTY\x82???\xEA\x82\xE9Pageant\x82?Ă?\xEA\x82\xE9SSH\x94F\x8F?G\x81[\x83W\x83F\x83\x93\x83g\x82\xAA\x82\xA0\x82\xE9\x82?ł\xB7\x82\xAA\x81ATTSSH\x82\xC5Pageant\x82?\xE6\x82\xE9\x8C\xF6\x8AJ\x8C\xAE\x94F\x8F?\xF0\x83T\x83|\x81[\x83g\x82\xB7\x82邽\x82??APuTTY\x82?\\x81[\x83X\x83R\x81[\x83h\x82?p\x82\xB5\x82Ă\xA2\x82?\xB7\x81B
+  \x8D\x82\x93x\x82?@\x94\\x82\xF0\x8E\xC0\x8C\xBB\x82\xB7\x82邽\x82??A\x83t\x83\x8B\x83X\x83N\x83\x89\x83b\x83`\x82?\xC0\x91\x95\x82\xB7\x82邱\x82??\x{5E60AA}\x82\xA2\x82\xA2\x82??\xBE\x82\xA6\x82?\xB9\x82\xF1\x81BTera Term\x82ł?J\x94\xAD\x8C\x{5E627B}\x82\xF0\x90}\x82邽\x82??A\x83I\x81[\x83v\x83\x93\x83\\x81[\x83X\x82?\x89\x83C\x83u\x83\x89\x83\x8A\x82\xF0\x90ϋ?I\x82?\x98\x97p\x82\xB5\x82Ă\xA2\x82?\xB7\x81B\x82\xBD\x82\xBE\x82\xB5\x81A\x83I\x81[\x83v\x83\x93\x83\\x81[\x83X\x90\xBB\x95i\x82?\x89\x83C\x83Z\x83\x93\x83X\x82?\xE6\x82鋣\x8D\x87\x82??\x8D\x88??\xA4\x95K\x97v\x82\xAA\x82\xA0\x82\xE8\x82?\xB7\x81i\x93\xC1\x82\xC9GPL\x81j\x81B<br>
+  \x89\xBA\x90}\x82?A\x83I\x81[\x83v\x83\x93\x83\\x81[\x83X\x82?\x89\x83C\x83u\x83\x89\x83\x8A\x82\xF0\x83\x8A\x83\x93\x83N\x82\xB5\x82Ă\xA2\x82?\x83W\x83\x85\x81[\x83\x8B\x82?A\x82\xBB\x82?\x8A\x83\x93\x83N\x8F?\xF0\x8E\xA6\x82\xB5\x82?\xB7\x81B
 </p>
-\x81@
-\x81@\x82?\xA8\x81A\x82\xA2\x82\xB8\x82\xEA\x82?\x89\x83C\x83u\x83\x89\x83\x8A\x82\xE0\x90ÓI\x83\x8A\x83\x93\x83N(static link)\x82?\xB5\x82Ă\xA2\x82?\xB7\x81B\x83\x89\x83C\x83u\x83\x89\x83\x8A\x82?R\x83\x93\x83p\x83C\x83\x8B\x83I\x83v\x83V\x83\x87\x83\x93\x82?\xCD"/MT"\x82\xF0\x95t\x89\xC1\x82\xB5\x82Ă\xA2\x82?\xB7\x81B\x93\xAE\x93I\x83\x8A\x83\x93\x83N(dynamic link)\x82\xF0\x8Ds\x82\xA4\x82?A\x88?\x82?\x86\x81[\x83U\x8A?\xAB\x82\xC5Tera Term\x82\xAA\x8BN\x93\xAE\x82ł\xAB\x82?\xA2\x82?\xA2\x82\xA4\x8C\xBB\x8F?\xAA\x94\xAD\x90\xB6\x82\xB5\x82\xBD\x82\xBD\x82??A\x8C\xBB\x8D?ł?\xAE\x93I\x83\x8A\x83\x93\x83N\x82?s\x82\xC1\x82Ă\xA2\x82?\xB9\x82\xF1\x81B
-\x81@
+<p>
+  Tera Term\x83}\x83N\x83\x8D\x83v\x83\x8D\x83O\x83\x89\x83\x80\x82?A\x90\xB3\x8BK\x95\\x8C\xBB\x83\x89\x83C\x83u\x83\x89\x83\x8A"Oniguruma"\x82\xF0\x83\x8A\x83\x93\x83N\x82\xB5\x82Ă\xA2\x82?\xB7\x81B"waitregex","strmatch","strreplace"\x83R\x83}\x83\x93\x83h\x82?\xA8\x82\xA2\x82Đ\xB3\x8BK\x95\\x8C\xBB\x82?p\x82\xB7\x82邽\x82?ł\xB7\x81B<br>
+  Tera Term\x96{\x91?ł?A\x83o\x81[\x83W\x83\x87\x83\x93\x83_\x83C\x83A\x83\x8D\x83O\x82\xC9Oniguruma\x82?o\x81[\x83W\x83\x87\x83\x93\x82\xF0\x95\\x8E\xA6\x82\xB7\x82邽\x82?\xBE\x82\xAF\x82?\x8A\x83\x93\x83N\x82\xF0\x82\xB5\x82Ă\xA2\x82?\xB7\x81B
+</p>
+<p>
+  Tera Term\x83}\x83N\x83\x8D\x83v\x83\x8D\x83O\x83\x89\x83\x80\x82?A\x8B^\x8E\x97\x97\x90\x90\x94\x90\xB6\x90\xAC\x8A\xED"SFMT"\x82\xF0\x83\x8A\x83\x93\x83N\x82\xB5\x82Ă\xA2\x82?\xB7\x81B"random"\x83R\x83}\x83\x93\x83h\x82?\xA8\x82\xA2\x82ė\x90\x90\x94\x82?\xB6\x90\xAC\x82?\x98\x97p\x82\xB3\x82\xEA\x82Ă\xA2\x82?\xB7\x81B
+</p>
+<p>
+  SSH\x83\x82\x83W\x83\x85\x81[\x83\x8B\x82ł\xA0\x82\xE9TTSSH\x82?A\x88Í\x86\x8F\x88\x97\x9D\x82\xF0\x8Ds\x82\xA4\x82\xBD\x82?\xC9"OpenSSL"\x82\xF0\x83\x8A\x83\x93\x83N\x82\xB5\x82Ă\xA2\x82?\xB7\x81BOpenSSL\x82?\xA2\x82\xA4\x83l\x81[\x83~\x83\x93\x83O\x82\xA9\x82\xE7Web\x83A\x83N\x83Z\x83X\x82?g\x82\xED\x82\xEA\x82\xE9SSL(Secure Socket Layer)\x83v\x83\x8D\x83g\x83R\x83\x8B\x90\xEA\x97p\x82?\x89\x83C\x83u\x83\x89\x83\x8A\x82\xA9\x82?v\x82\xED\x82?\x82\xBF\x82ł\xB7\x82\xAA\x81A\x82\xBB\x82\xA4\x82ł?\xA0\x82\xE8\x82?\xB9\x82\xF1\x81BOpenSSL\x82?\xEE\x96{\x93I\x82?Í\x86\x83A\x83\x8B\x83S\x83\x8A\x83Y\x83\x80\x82\xF0\x83T\x83|\x81[\x83g\x82\xB5\x82Ă\xA8\x82\xE8\x81ATTSSH\x82ł\xCDOpenSSL\x82???\xEA\x82\xE9\x88Í\x86\x89\xBB/\x95\x9C\x8D\x86\x83\x8B\x81[\x83`\x83\x93\x82???p\x82\xB5\x82Ă\xA2\x82?\xB7\x81B\x82\xB1\x82?\xB1\x82??A\x82\xB7\x82??OpenSSL\x83\x89\x83C\x83u\x83\x89\x83\x8A\x82\xC9SSL\x8A?A\x82?Z\x83L\x83\x85\x83\x8A\x83e\x83B\x83z\x81[\x83\x
 8B\x82\xAA\x94\xAD\x8C\xA9\x82\xB3\x82?\x82?\xB5\x82Ă\xE0\x81ATTSSH\x82??e\x8B\xBF\x82???Ē?\x82?\xA2\x82\xA4\x82\xB1\x82?ł\xB7\x81B
+</p>
+<p>
+  SSH\x83\x82\x83W\x83\x85\x81[\x83\x8B\x82ł\xA0\x82\xE9TTSSH\x82?ASSH\x83p\x83P\x83b\x83g\x82?\xB3\x8Fk\x82\xF0\x8Ds\x82\xA4\x82\xBD\x82??\xB3\x8Fk\x83\x89\x83C\x83u\x83\x89\x83\x8A"zlib"\x82\xF0\x83\x8A\x83\x93\x83N\x82\xB5\x82Ă\xA2\x82?\xB7\x81B\x82\xBD\x82\xBE\x82\xB5\x81A\x83_\x83C\x83\x84\x83\x8B\x83A\x83b\x83v\x89\xF1\x90\xFC\x82????\x93x\x82?l\x83b\x83g\x83\x8F\x81[\x83N\x82?\xA8\x82\xA2\x82Ă?A\x83p\x83P\x83b\x83g\x88\xB3\x8Fk\x82?L\x8C\xF8\x82ł\xB7\x82\xAA\x81A\x8D\xF0\x8D\xA1\x82?\x82\x91\xAC\x89\xF1\x90\xFC\x82ł??\xB5\x82?\x93x\x92?\x82\xF0\x8F\xB5\x82\xAD\x91\xAB\x82\xA9\x82\xB9\x82??\xE8\x82?\xB7\x81B\x82?\x82?A\x83f\x83t\x83H\x83\x8B\x83g\x82ł?p\x83P\x83b\x83g\x88\xB3\x8Fk\x8B@\x94\\x82?\xB3\x8C\x{27B0B3}\x82\xEA\x82Ă\xA2\x82?\xB7\x81B
+</p>
+<p>
+  SSH\x83\x82\x83W\x83\x85\x81[\x83\x8B\x82ł\xA0\x82\xE9TTSSH\x82?A\x92[\x96\x96\x83G\x83~\x83\x85\x83\x8C\x81[\x83^"PuTTY"\x82\xF0\x83\x8A\x83\x93\x83N\x82\xB5\x82Ă\xA2\x82?\xB7\x81BPuTTY\x82?\xCDPageant\x82?Ă?\xEA\x82\xE9SSH\x94F\x8F?G\x81[\x83W\x83F\x83\x93\x83g\x82\xAA\x82\xA0\x82\xE9\x82?ł\xB7\x82\xAA\x81ATTSSH\x82\xC5Pageant\x82?\xE6\x82\xE9\x8C\xF6\x8AJ\x8C\xAE\x94F\x8F?\xF0\x83T\x83|\x81[\x83g\x82\xB7\x82邽\x82??APuTTY\x82?\\x81[\x83X\x83R\x81[\x83h\x82?p\x82\xB5\x82Ă\xA2\x82?\xB7\x81BPuTTY\x82\xCCSSH\x92?M\x95\x94\x95\xAA\x82?\\x81[\x83X\x83R\x81[\x83h\x82?\x98\x97p\x82\xB5\x82Ă\xA2\x82?\xB9\x82\xF1\x81B
+</p>
+<p>
+  \x82?\xA8\x81A\x82\xA2\x82\xB8\x82\xEA\x82?\x89\x83C\x83u\x83\x89\x83\x8A\x82\xE0\x90ÓI\x83\x8A\x83\x93\x83N(static link)\x82?\xB5\x82Ă\xA2\x82?\xB7\x81B\x83\x89\x83C\x83u\x83\x89\x83\x8A\x82?R\x83\x93\x83p\x83C\x83\x8B\x83I\x83v\x83V\x83\x87\x83\x93\x82?\xCD"/MT"\x82\xF0\x95t\x89\xC1\x82\xB5\x82Ă\xA2\x82?\xB7\x81B\x93\xAE\x93I\x83\x8A\x83\x93\x83N(dynamic link)\x82\xF0\x8Ds\x82\xA4\x82?A\x88?\x82?\x86\x81[\x83U\x8A?\xAB\x82\xC5Tera Term\x82\xAA\x8BN\x93\xAE\x82ł\xAB\x82?\xA2\x82?\xA2\x82\xA4\x8C\xBB\x8F?\xAA\x94\xAD\x90\xB6\x82\xB5\x82\xBD\x82\xBD\x82??A\x8C\xBB\x8D?ł?\xAE\x93I\x83\x8A\x83\x93\x83N\x82?s\x82\xC1\x82Ă\xA2\x82?\xB9\x82\xF1\x81B
+<p>
 
 <div align="center">
 <img src="image/library_relation.png" width=720 height=540>

From svnnotify ＠ sourceforge.jp  Sat Jun  3 01:10:58 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sat, 03 Jun 2017 01:10:58 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B6766=5D__*_Usage_-_Unicode_=E6=9B=B4?=
 =?utf-8?b?5paw?=
Message-ID: <1496419858.699046.122698.nullmailer@users.sourceforge.jp>

Revision: 6766
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6766
Author:   yutakapon
Date:     2017-06-03 01:10:58 +0900 (Sat, 03 Jun 2017)
Log Message:
-----------
* Usage - Unicode 更新
* Setup - Terminal にJapanese, Korean, UTF-8を追加した

Modified Paths:
--------------
    trunk/doc/en/html/menu/setup-terminal.html
    trunk/doc/en/html/menu/setup-terminalr.html
    trunk/doc/en/html/usage/unicode.html

Added Paths:
-----------
    trunk/doc/en/html/menu/setup-terminaljp.html
    trunk/doc/en/html/menu/setup-terminalk.html
    trunk/doc/en/html/menu/setup-terminalutf8.html

-------------- next part --------------
Modified: trunk/doc/en/html/menu/setup-terminal.html
===================================================================
--- trunk/doc/en/html/menu/setup-terminal.html	2017-06-02 03:45:59 UTC (rev 6765)
+++ trunk/doc/en/html/menu/setup-terminal.html	2017-06-02 16:10:58 UTC (rev 6766)
@@ -3,14 +3,26 @@
 <html>
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <title>Terminal ([Setup] menu)</title>
+    <title>Terminal ([Setup] menu; English mode)</title>
     <META http-equiv="Content-Style-Type" content="text/css">
     <link rel="stylesheet" href="../style.css" type="text/css">
   </head>
 
   <body>
-    <h1>Terminal ([Setup] menu)</h1>
+    <h1>Terminal ([Setup] menu; English mode)</h1>
 
+    <p>
+      This page is described when the <a href="setup-general.html#Language">Language</a> is selected to English on the <a href="setup-general.html">Setup - General</a> dialog.
+      Please refer to below page if another language mode is used.
+    </p>
+
+    <ul>
+      <li><a href="setup-terminaljp.html">Japanese mode</a></li>
+      <li><a href="setup-terminalr.html">Russian mode</a></li>
+      <li><a href="setup-terminalk.html">Korean mode</a></li>
+      <li><a href="setup-terminalutf8.html">UTF-8 mode</a></li>
+    </ul>
+
     <h2>"Terminal setup" dialog box</h2>
     <dl>
       <dt id="TerminalSize">Terminal size</dt>
@@ -97,8 +109,6 @@
 	Enables auto switching between VT and TEK emulations.
       </dd>
     </dl>
-    <p>
-      <a href="setup-terminalr.html">Help for Russian mode</a>
-    </p>
+
   </body>
 </html>

Added: trunk/doc/en/html/menu/setup-terminaljp.html
===================================================================
--- trunk/doc/en/html/menu/setup-terminaljp.html	                        (rev 0)
+++ trunk/doc/en/html/menu/setup-terminaljp.html	2017-06-02 16:10:58 UTC (rev 6766)
@@ -0,0 +1,169 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+  "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <title>Terminal ([Setup] menu; Japanese mode)</title>
+    <META http-equiv="Content-Style-Type" content="text/css">
+    <link rel="stylesheet" href="../style.css" type="text/css">
+  </head>
+
+  <body>
+    <h1>Terminal ([Setup] menu; Japanese mode)</h1>
+
+    <p>
+      This page is described when the <a href="setup-general.html#Language">Language</a> is selected to Japanese on the <a href="setup-general.html">Setup - General</a> dialog.
+      Please refer to below page if another language mode is used.
+    </p>
+
+    <ul>
+      <li><a href="setup-terminal.html">English mode</a></li>
+      <li><a href="setup-terminalr.html">Russian mode</a></li>
+      <li><a href="setup-terminalk.html">Korean mode</a></li>
+      <li><a href="setup-terminalutf8.html">UTF-8 mode</a></li>
+    </ul>
+
+    <h2>"Terminal setup" dialog box</h2>
+    <dl>
+      <dt id="TerminalSize">Terminal size</dt>
+      <dd>
+	The logical size of the terminal (numbers of columns and lines).
+	Note that the window size (real screen size) is not necessarily
+	equal to the terminal size.
+      </dd>
+
+      <dt id="TermIsWin">Term size = win size</dt>
+      <dd>
+	Forces the terminal size to be always equal to the window size.
+      </dd>
+
+      <dt id="AutoWinResize">Auto window resize</dt>
+      <dd>
+	When the terminal size is changed, resizes the window to the
+	terminal size.
+      </dd>
+
+      <dt id="CRReceive">New-line (receive)</dt>
+      <dd>
+        <dl>
+          <dt>CR</dt>
+          <dd>Tera Term doesn't convert it.</dd>
+
+          <dt>CR+LF</dt>
+          <dd>Received CR ($0D) character is converted to CR+LF ($0D $0A) pairs.<br>
+              e.g.) If "CR LF" is received, it is converted to "CR LF LF."</dd>
+
+          <dt>LF</dt>
+          <dd>Received LF ($0A) character is converted to CR+LF ($0D $0A) pairs.<br>
+              e.g.) If "CR LF" is received, it is converted to "CR CR LF."</dd>
+
+          <dt>AUTO</dt>
+          <dd>Received CR ($0D) or LF ($0A) character is converted to CR+LF ($0D $0A) pairs.<br>
+              e.g.) If "CR+LF" are received, it is not converted.<br>
+                    If "CR" is received, it is converted to "CR LF."<br>
+                    If "LF" is received, it is converted to "CR LF."</dd>
+        </dl>
+      </dd>
+
+      <dt id="CRSend">New-line (transmit)</dt>
+      <dd>
+        <dl>
+          <dt>CR</dt>
+          <dd>Tera Term doesn't convert it.</dd>
+
+          <dt>CR+LF</dt>
+          <dd>CR ($0D) character to be sent is converted to CR+LF ($0D $0A) pairs before it is actually sent.</dd>
+
+          <dt>LF</dt>
+          <dd>CR ($0D) character to be sent is converted to LF ($0A) before it is actually sent.</dd>
+        </dl>
+      </dd>
+
+      <dt id="TerminalID">Terminal ID</dt>
+      <dd>
+	Terminal ID to be reported to the host when the host requests it.
+	Note that the terminal ID is not identical to the telnet terminal
+	type. To change the telnet terminal type, use the
+	<a href="setup-tcpip.html">[Setup] TCP/IP</a> command.
+      </dd>
+
+      <dt id="LocalEcho">Local echo</dt>
+      <dd>
+	Enables local echoing of characters sent.
+      </dd>
+
+      <dt id="Answerback">Answerback</dt>
+      <dd>
+	The string to be answered back to the host, when the ENQ ($05)
+	character is received. Each non-printable character in the string
+	can be expressed as a "$" and ASCII code in two-character hex number.
+	For example, the string "ABC&lt;CR&gt;&lt;LF&gt;" is expressed as
+	the following:
+	<p class="indent1">
+	  ABC$0D$0A
+	</p>
+      </dd>
+
+      <dt id="AutoWinSwitch">Auto switch (VT&lt;-&gt;TEK)</dt>
+      <dd>
+	Enables auto switching between VT and TEK emulations.
+      </dd>
+
+      <dt id="KanjiReceive">Kanji (receive)</dt>
+      <dd>
+	Kanji character that is received from host(SJIS, EUC, JIS, UTF-8 and UTF-8m).
+      </dd>
+
+      <dt id="KatakanaReceive">7bit katakana (receive)</dt>
+      <dd>
+	When "HANKAKU" katakana code from host is described for 7bit
+	(Shift control with SO/SI is using), please select this entry.
+	This is only enabled when Kanji (receive) is JIS.
+      </dd>
+
+      <dt id="KanjiSend">Kanji (transmit)</dt>
+      <dd>
+	Kanji character that is sent from client(SJIS, EUC, JIS and UTF-8).
+      </dd>
+
+      <dt id="KatakanaSend">7bit katakana (transmit)</dt>
+      <dd>
+	When "HANKAKU" katakana code from host is described for 7bit
+	(Shift control with SO/SI is using), please select this entry.
+	This is only enabled when Kanji (transmit) is JIS.
+      </dd>
+
+      <dt id="KanjiIn">Kanji-in (transmit)</dt>
+      <dd>
+	The escape sequence is used when Kanji (transmit) is JIS.
+	(Sequence regarding Kanji character is specified to G0.
+	^[$@ or ^[$B).
+	The escape sequence from host can use any sequence.
+      </dd>
+
+      <dt id="KanjiOut">Kanji-out (transmit)</dt>
+      <dd>
+	The escape sequence is used when Kanji (transmit) is JIS.
+	(Sequence regarding ASCII and JIS Roman code is specified to G0.
+	^[(B or ^[(J ).
+	The escape sequence from host can use any sequence.
+	<p>
+	  NOTICE: ^[(H can not be selected on initial setting. <br>
+	  <!--a href="../usage/tips/incorrect-kanjiout.html">\x81\xA8 ^[(H \x82\xF0\x91I\x91\xF0\x89?\\x82?\xB7\x82\xE9\x81B</a-->
+	</p>
+      </dd>
+
+      <dt id="locale">locale</dt>
+      <dd>
+	Locale setting.
+	Refer to <a href="../usage/unicode.html">Unicode</a> for details.
+      </dd>
+
+      <dt id="CodePage">CodePage</dt>
+      <dd>
+	Codepage setting.
+	Refer to <a href="../usage/unicode.html">Unicode</a> for details.
+      </dd>
+    </dl>
+  </body>
+</html>

Added: trunk/doc/en/html/menu/setup-terminalk.html
===================================================================
--- trunk/doc/en/html/menu/setup-terminalk.html	                        (rev 0)
+++ trunk/doc/en/html/menu/setup-terminalk.html	2017-06-02 16:10:58 UTC (rev 6766)
@@ -0,0 +1,135 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+  "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <title>Terminal ([Setup] menu; Korean mode)</title>
+    <META http-equiv="Content-Style-Type" content="text/css">
+    <link rel="stylesheet" href="../style.css" type="text/css">
+  </head>
+
+  <body>
+    <h1>Terminal ([Setup] menu; Korean mode)</h1>
+
+    <p>
+      This page is described when the <a href="setup-general.html#Language">Language</a> is selected to Korean on the <a href="setup-general.html">Setup - General</a> dialog.
+      Please refer to below page if another language mode is used.
+    </p>
+
+    <ul>
+      <li><a href="setup-terminaljp.html">Japanese mode</a></li>
+      <li><a href="setup-terminalr.html">Russian mode</a></li>
+      <li><a href="setup-terminal.html">English mode</a></li>
+      <li><a href="setup-terminalutf8.html">UTF-8 mode</a></li>
+    </ul>
+
+    <h2>"Terminal setup" dialog box</h2>
+    <dl>
+      <dt id="TerminalSize">Terminal size</dt>
+      <dd>
+	The logical size of the terminal (numbers of columns and lines).
+	Note that the window size (real screen size) is not necessarily
+	equal to the terminal size.
+      </dd>
+
+      <dt id="TermIsWin">Term size = win size</dt>
+      <dd>
+	Forces the terminal size to be always equal to the window size.
+      </dd>
+
+      <dt id="AutoWinResize">Auto window resize</dt>
+      <dd>
+	When the terminal size is changed, resizes the window to the
+	terminal size.
+      </dd>
+
+      <dt id="CRReceive">New-line (receive)</dt>
+      <dd>
+        <dl>
+          <dt>CR</dt>
+          <dd>Tera Term doesn't convert it.</dd>
+
+          <dt>CR+LF</dt>
+          <dd>Received CR ($0D) character is converted to CR+LF ($0D $0A) pairs.<br>
+              e.g.) If "CR LF" is received, it is converted to "CR LF LF."</dd>
+
+          <dt>LF</dt>
+          <dd>Received LF ($0A) character is converted to CR+LF ($0D $0A) pairs.<br>
+              e.g.) If "CR LF" is received, it is converted to "CR CR LF."</dd>
+
+          <dt>AUTO</dt>
+          <dd>Received CR ($0D) or LF ($0A) character is converted to CR+LF ($0D $0A) pairs.<br>
+              e.g.) If "CR+LF" are received, it is not converted.<br>
+                    If "CR" is received, it is converted to "CR LF."<br>
+                    If "LF" is received, it is converted to "CR LF."</dd>
+        </dl>
+      </dd>
+
+      <dt id="CRSend">New-line (transmit)</dt>
+      <dd>
+        <dl>
+          <dt>CR</dt>
+          <dd>Tera Term doesn't convert it.</dd>
+
+          <dt>CR+LF</dt>
+          <dd>CR ($0D) character to be sent is converted to CR+LF ($0D $0A) pairs before it is actually sent.</dd>
+
+          <dt>LF</dt>
+          <dd>CR ($0D) character to be sent is converted to LF ($0A) before it is actually sent.</dd>
+        </dl>
+      </dd>
+
+      <dt id="TerminalID">Terminal ID</dt>
+      <dd>
+	Terminal ID to be reported to the host when the host requests it.
+	Note that the terminal ID is not identical to the telnet terminal
+	type. To change the telnet terminal type, use the
+	<a href="setup-tcpip.html">[Setup] TCP/IP</a> command.
+      </dd>
+
+      <dt id="LocalEcho">Local echo</dt>
+      <dd>
+	Enables local echoing of characters sent.
+      </dd>
+
+      <dt id="Answerback">Answerback</dt>
+      <dd>
+	The string to be answered back to the host, when the ENQ ($05)
+	character is received. Each non-printable character in the string
+	can be expressed as a "$" and ASCII code in two-character hex number.
+	For example, the string "ABC&lt;CR&gt;&lt;LF&gt;" is expressed as
+	the following:
+	<p class="indent1">
+	  ABC$0D$0A
+	</p>
+      </dd>
+
+      <dt id="AutoWinSwitch">Auto switch (VT&lt;-&gt;TEK)</dt>
+      <dd>
+	Enables auto switching between VT and TEK emulations.
+      </dd>
+
+      <dt id="KanjiReceive">Coding (receive)</dt>
+      <dd>
+	Character code that is received from host(KS5601, UTF-8 and UTF-8m).
+      </dd>
+
+      <dt id="KanjiSend">Coding (transmit)</dt>
+      <dd>
+	Character code that is sent from client(KS5601 and UTF-8).
+      </dd>
+
+      <dt id="locale">locale</dt>
+      <dd>
+	Locale setting.
+	Refer to <a href="../usage/unicode.html">Unicode</a> for details.
+      </dd>
+
+      <dt id="CodePage">CodePage</dt>
+      <dd>
+	Codepage setting.
+	Refer to <a href="../usage/unicode.html">Unicode</a> for details.
+      </dd>
+    </dl>
+  </body>
+</html>

Modified: trunk/doc/en/html/menu/setup-terminalr.html
===================================================================
--- trunk/doc/en/html/menu/setup-terminalr.html	2017-06-02 03:45:59 UTC (rev 6765)
+++ trunk/doc/en/html/menu/setup-terminalr.html	2017-06-02 16:10:58 UTC (rev 6766)
@@ -11,9 +11,22 @@
   <body>
     <h1>Terminal ([Setup] menu; Russian mode)</h1>
 
+    <p>
+      This page is described when the <a href="setup-general.html#Language">Language</a> is selected to Russian on the <a href="setup-general.html">Setup - General</a> dialog.
+      Please refer to below page if another language mode is used.
+    </p>
+
+    <ul>
+      <li><a href="setup-terminaljp.html">Japanese mode</a></li>
+      <li><a href="setup-terminal.html">English mode</a></li>
+      <li><a href="setup-terminalk.html">Korean mode</a></li>
+      <li><a href="setup-terminalutf8.html">UTF-8 mode</a></li>
+    </ul>
+
+
     <h2>"Terminal setup" dialog box</h2>
     <dl>
-      <dt>Terminal size</dt>
+      <dt id="TerminalSize">Terminal size</dt>
       <dd>
 	The logical size of the terminal (numbers of columns and lines).
 	Note that the window size (real screen size) is not necessarily
@@ -20,18 +33,18 @@
 	equal to the terminal size.
       </dd>
 
-      <dt>Term size = win size</dt>
+      <dt id="TermIsWin">Term size = win size</dt>
       <dd>
 	Forces the terminal size to be always equal to the window size.
       </dd>
 
-      <dt>Auto window resize</dt>
+      <dt id="AutoWinResize">Auto window resize</dt>
       <dd>
 	When the terminal size is changed, resizes the window to the
 	terminal size.
       </dd>
 
-      <dt>New-line (receive)</dt>
+      <dt id="CRReceive">New-line (receive)</dt>
       <dd>
         <dl>
           <dt>CR</dt>
@@ -53,7 +66,7 @@
         </dl>
       </dd>
 
-      <dt>New-line (transmit)</dt>
+      <dt id="CRSend">New-line (transmit)</dt>
       <dd>
         <dl>
           <dt>CR</dt>
@@ -64,7 +77,7 @@
         </dl>
       </dd>
 
-      <dt>Terminal ID</dt>
+      <dt id="TerminalID">Terminal ID</dt>
       <dd>
 	Terminal ID to be reported to the host when the host requests it.
 	Note that the terminal ID is not identical to the telnet terminal
@@ -72,12 +85,12 @@
 	<a href="setup-tcpip.html">[Setup] TCP/IP</a> command.
       </dd>
 
-      <dt>Local echo</dt>
+      <dt id="LocalEcho">Local echo</dt>
       <dd>
 	Enables local echoing of characters sent.
       </dd>
 
-      <dt>Answerback</dt>
+      <dt id="Answerback">Answerback</dt>
       <dd>
 	The string to be answered back to the host, when the ENQ ($05)
 	character is received. Each non-printable character in the string
@@ -89,12 +102,12 @@
 	</p>
       </dd>
 
-      <dt>Auto switch (VT&lt;-&gt;TEK)</dt>
+      <dt id="AutoWinSwitch">Auto switch (VT&lt;-&gt;TEK)</dt>
       <dd>
 	Enables auto switching between VT and TEK emulations.
       </dd>
 
-      <dt>Character set</dt>
+      <dt id="RussCharSet">Character set</dt>
       <dd>
 	<dl>
 	  <dt id="RussHost">Host</dt>

Added: trunk/doc/en/html/menu/setup-terminalutf8.html
===================================================================
--- trunk/doc/en/html/menu/setup-terminalutf8.html	                        (rev 0)
+++ trunk/doc/en/html/menu/setup-terminalutf8.html	2017-06-02 16:10:58 UTC (rev 6766)
@@ -0,0 +1,135 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+  "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <title>Terminal ([Setup] menu; UTF-8 mode)</title> 
+    <META http-equiv="Content-Style-Type" content="text/css">
+    <link rel="stylesheet" href="../style.css" type="text/css">
+  </head>
+
+  <body>
+    <h1>Terminal ([Setup] menu; UTF-8 mode)</h1>
+
+    <p>
+      This page is described when the <a href="setup-general.html#Language">Language</a> is selected to UTF-8 on the <a href="setup-general.html">Setup - General</a> dialog.
+      Please refer to below page if another language mode is used.
+    </p>
+
+    <ul>
+      <li><a href="setup-terminaljp.html">Japanese mode</a></li>
+      <li><a href="setup-terminalr.html">Russian mode</a></li>
+      <li><a href="setup-terminal.html">English mode</a></li>
+      <li><a href="setup-terminalk.html">Korean mode</a></li>
+    </ul>
+
+    <h2>"Terminal setup" dialog box</h2>
+    <dl>
+      <dt id="TerminalSize">Terminal size</dt>
+      <dd>
+	The logical size of the terminal (numbers of columns and lines).
+	Note that the window size (real screen size) is not necessarily
+	equal to the terminal size.
+      </dd>
+
+      <dt id="TermIsWin">Term size = win size</dt>
+      <dd>
+	Forces the terminal size to be always equal to the window size.
+      </dd>
+
+      <dt id="AutoWinResize">Auto window resize</dt>
+      <dd>
+	When the terminal size is changed, resizes the window to the
+	terminal size.
+      </dd>
+
+      <dt id="CRReceive">New-line (receive)</dt>
+      <dd>
+        <dl>
+          <dt>CR</dt>
+          <dd>Tera Term doesn't convert it.</dd>
+
+          <dt>CR+LF</dt>
+          <dd>Received CR ($0D) character is converted to CR+LF ($0D $0A) pairs.<br>
+              e.g.) If "CR LF" is received, it is converted to "CR LF LF."</dd>
+
+          <dt>LF</dt>
+          <dd>Received LF ($0A) character is converted to CR+LF ($0D $0A) pairs.<br>
+              e.g.) If "CR LF" is received, it is converted to "CR CR LF."</dd>
+
+          <dt>AUTO</dt>
+          <dd>Received CR ($0D) or LF ($0A) character is converted to CR+LF ($0D $0A) pairs.<br>
+              e.g.) If "CR+LF" are received, it is not converted.<br>
+                    If "CR" is received, it is converted to "CR LF."<br>
+                    If "LF" is received, it is converted to "CR LF."</dd>
+        </dl>
+      </dd>
+
+      <dt id="CRSend">New-line (transmit)</dt>
+      <dd>
+        <dl>
+          <dt>CR</dt>
+          <dd>Tera Term doesn't convert it.</dd>
+
+          <dt>CR+LF</dt>
+          <dd>CR ($0D) character to be sent is converted to CR+LF ($0D $0A) pairs before it is actually sent.</dd>
+
+          <dt>LF</dt>
+          <dd>CR ($0D) character to be sent is converted to LF ($0A) before it is actually sent.</dd>
+        </dl>
+      </dd>
+
+      <dt id="TerminalID">Terminal ID</dt>
+      <dd>
+	Terminal ID to be reported to the host when the host requests it.
+	Note that the terminal ID is not identical to the telnet terminal
+	type. To change the telnet terminal type, use the
+	<a href="setup-tcpip.html">[Setup] TCP/IP</a> command.
+      </dd>
+
+      <dt id="LocalEcho">Local echo</dt>
+      <dd>
+	Enables local echoing of characters sent.
+      </dd>
+
+      <dt id="Answerback">Answerback</dt>
+      <dd>
+	The string to be answered back to the host, when the ENQ ($05)
+	character is received. Each non-printable character in the string
+	can be expressed as a "$" and ASCII code in two-character hex number.
+	For example, the string "ABC&lt;CR&gt;&lt;LF&gt;" is expressed as
+	the following:
+	<p class="indent1">
+	  ABC$0D$0A
+	</p>
+      </dd>
+
+      <dt id="AutoWinSwitch">Auto switch (VT&lt;-&gt;TEK)</dt>
+      <dd>
+	Enables auto switching between VT and TEK emulations.
+      </dd>
+
+      <dt id="KanjiReceive">Coding (receive)</dt>
+      <dd>
+	Character code that is received from host(UTF-8 and UTF-8m).
+      </dd>
+
+      <dt id="KanjiSend">Coding (transmit)</dt>
+      <dd>
+	Character code that is sent from client(UTF-8).
+      </dd>
+
+      <dt id="locale">locale</dt>
+      <dd>
+	Locale setting.
+	Refer to <a href="../usage/unicode.html">Unicode</a> for details.
+      </dd>
+
+      <dt id="CodePage">CodePage</dt>
+      <dd>
+	Codepage setting.
+	Refer to <a href="../usage/unicode.html">Unicode</a> for details.
+      </dd>
+    </dl>
+  </body>
+</html>

Modified: trunk/doc/en/html/usage/unicode.html
===================================================================
--- trunk/doc/en/html/usage/unicode.html	2017-06-02 03:45:59 UTC (rev 6765)
+++ trunk/doc/en/html/usage/unicode.html	2017-06-02 16:10:58 UTC (rev 6766)
@@ -14,6 +14,17 @@
 <p>
 To use UTF-8, changed from English to "UTF-8" or "Japanese" or "Korean" under Setup-&gt;General menu.<br>
 
+<p>
+When the Language "UTF-8" is selected, below function can not be used beside Japanese setting.
+</p>
+<ul>
+  <li>The JIS, EUC and SJIS character code except for UTF-8</li>
+  <li>Specifying Japanese character set of ISO/IEC 2022</li>
+  <li>TTXKanjiMenu plug-in</li>
+</ul>
+
+<p>
+
 If you set the Language "Japanese" or "Korean", select "Terminal" from the Tera Term "Setup" menu. Inside the dialog-box,
 select "UTF-8" from "Kanji(receive)" or "Kanji(transmit)".
 There is no need to restart Tera Term to activate these configuration changes.<br>

From svnnotify ＠ sourceforge.jp  Sun Jun  4 21:54:47 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sun, 04 Jun 2017 21:54:47 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY3NjddICDjg63jgrDjga7jgr/jgqTjg6A=?=
 =?utf-8?b?44K544K/44Oz44OX44Gu44OV44Kp44O844Oe44OD44OI44KS5oyH5a6a44Gn?=
 =?utf-8?b?44GN44KL44KI44GG44Gr44GX44Gf?=
Message-ID: <1496580887.971842.133118.nullmailer@users.sourceforge.jp>

Revision: 6767
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6767
Author:   maya
Date:     2017-06-04 21:54:47 +0900 (Sun, 04 Jun 2017)
Log Message:
-----------
ログのタイムスタンプのフォーマットを指定できるようにした

https://osdn.net/ticket/browse.php?group_id=1412&tid=36971

Modified Paths:
--------------
    trunk/installer/release/TERATERM.INI
    trunk/teraterm/common/ttlib.c
    trunk/teraterm/common/ttlib.h
    trunk/teraterm/common/tttypes.h
    trunk/teraterm/teraterm/filesys.cpp
    trunk/teraterm/ttpset/ttset.c

-------------- next part --------------
Modified: trunk/installer/release/TERATERM.INI
===================================================================
--- trunk/installer/release/TERATERM.INI	2017-06-02 16:10:58 UTC (rev 6766)
+++ trunk/installer/release/TERATERM.INI	2017-06-04 12:54:47 UTC (rev 6767)
@@ -538,6 +538,11 @@
 ; Lock Terminal Unique ID
 LockTUID=on
 
+; Timestamp format of Log each line
+;   %a %b %e %H:%M:%S.%N %Y ... Sun Jun  4 21:12:40.123 JST 2017
+;   %Y/%m/%d %H:%M:%S.%N    ... 2017/06/04 21:12:40.123
+LogTimestampFormat=%a %b %e %H:%M:%S.%N %Y
+
 ; Exclusive lock for log file
 LogLockExclusive=on
 

Modified: trunk/teraterm/common/ttlib.c
===================================================================
--- trunk/teraterm/common/ttlib.c	2017-06-02 16:10:58 UTC (rev 6766)
+++ trunk/teraterm/common/ttlib.c	2017-06-04 12:54:47 UTC (rev 6767)
@@ -1460,25 +1460,92 @@
 	return Table[lang][kcode];
 }
 
-char *mctimelocal()
+char *mctimelocal(char *format)
 {
-	SYSTEMTIME LocalTime;
+	SYSTEMTIME systime;
 	static char strtime[29];
 	char week[][4] = {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
 	char month[][4] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
 	                   "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
+	char tmp[5];
+	unsigned int i = strlen(format);
 
-	GetLocalTime(&LocalTime);
-	_snprintf_s(strtime, sizeof(strtime), _TRUNCATE,
-	            "%s %s %02d %02d:%02d:%02d.%03d %04d",
-	            week[LocalTime.wDayOfWeek],
-	            month[LocalTime.wMonth-1],
-	            LocalTime.wDay,
-	            LocalTime.wHour,
-	            LocalTime.wMinute,
-	            LocalTime.wSecond,
-	            LocalTime.wMilliseconds,
-	            LocalTime.wYear);
+	GetLocalTime(&systime);
+	memset(strtime, 0, sizeof(strtime));
+	for (i=0; i<strlen(format); i++) {
+		if (format[i] == '%') {
+			char c = format[i + 1];
+			switch (c) {
+				case 'a':
+					_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "%s", week[systime.wDayOfWeek]);
+					strncat_s(strtime, sizeof(strtime), tmp, _TRUNCATE);
+					i++;
+					break;
+				case 'b':
+					_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "%s", month[systime.wMonth - 1]);
+					strncat_s(strtime, sizeof(strtime), tmp, _TRUNCATE);
+					i++;
+					break;
+				case 'd':
+					_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "%02d", systime.wDay);
+					strncat_s(strtime, sizeof(strtime), tmp, _TRUNCATE);
+					i++;
+					break;
+				case 'e':
+					_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "%2d", systime.wDay);
+					strncat_s(strtime, sizeof(strtime), tmp, _TRUNCATE);
+					i++;
+					break;
+				case 'H':
+					_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "%02d", systime.wHour);
+					strncat_s(strtime, sizeof(strtime), tmp, _TRUNCATE);
+					i++;
+					break;
+				case 'N':
+					_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "%03d", systime.wMilliseconds);
+					strncat_s(strtime, sizeof(strtime), tmp, _TRUNCATE);
+					i++;
+					break;
+				case 'm':
+					_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "%02d", systime.wMonth);
+					strncat_s(strtime, sizeof(strtime), tmp, _TRUNCATE);
+					i++;
+					break;
+				case 'M':
+					_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "%02d", systime.wMinute);
+					strncat_s(strtime, sizeof(strtime), tmp, _TRUNCATE);
+					i++;
+					break;
+				case 'S':
+					_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "%02d", systime.wSecond);
+					strncat_s(strtime, sizeof(strtime), tmp, _TRUNCATE);
+					i++;
+					break;
+				case 'w':
+					_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "%d", systime.wDayOfWeek);
+					strncat_s(strtime, sizeof(strtime), tmp, _TRUNCATE);
+					i++;
+					break;
+				case 'Y':
+					_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "%04d", systime.wYear);
+					strncat_s(strtime, sizeof(strtime), tmp, _TRUNCATE);
+					i++;
+					break;
+				case '%':
+					strncat_s(strtime, sizeof(strtime), "%", _TRUNCATE);
+					i++;
+					break;
+				default:
+					_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "%c", format[i]);
+					strncat_s(strtime, sizeof(strtime), tmp, _TRUNCATE);
+					break;
+			}
+		}
+		else {
+			_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "%c", format[i]);
+			strncat_s(strtime, sizeof(strtime), tmp, _TRUNCATE);
+		}
+	}
 
 	return strtime;
 }

Modified: trunk/teraterm/common/ttlib.h
===================================================================
--- trunk/teraterm/common/ttlib.h	2017-06-02 16:10:58 UTC (rev 6766)
+++ trunk/teraterm/common/ttlib.h	2017-06-04 12:54:47 UTC (rev 6767)
@@ -63,7 +63,7 @@
 int KanjiCode2List(int lang, int kcode);
 int List2KanjiCode(int lang, int kcode);
 int KanjiCodeTranslate(int lang, int kcode);
-char *mctimelocal();
+char *mctimelocal(char *format);
 
 void b64encode(PCHAR dst, int dsize, PCHAR src, int len);
 int b64decode(PCHAR dst, int dsize, PCHAR src);

Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h	2017-06-02 16:10:58 UTC (rev 6766)
+++ trunk/teraterm/common/tttypes.h	2017-06-04 12:54:47 UTC (rev 6767)
@@ -619,6 +619,7 @@
 	int ZmodemTimeOutFin;
 	WORD WaitCom;
 	WORD Dummy5;	// \x8B\x8CTrimTrailingNLonPaste. PasteFlag\x82?\x9D\x8D\x87\x82\xB5\x82\xBD\x88?p\x8E~\x81B\x91\xBC\x82?]\x97p
+	char LogTimestampFormat[48];
 };
 
 typedef struct tttset TTTSet, *PTTSet;
@@ -1081,6 +1082,9 @@
  * Increment the number of this macro value
  * when you change TMap or member of TMap.
  *
+ * - At version 4.96, ttset_memfilemap was replaced with ttset_memfilemap_32.
+ *   added tttset.LogTimestampFormat
+ *
  * - At version 4.95, ttset_memfilemap was replaced with ttset_memfilemap_31.
  *   added tttset.NotifyClipboardAccess
  *
@@ -1262,4 +1266,4 @@
  *   added tttset.VTCompatTab.
  */
 
-#define TT_FILEMAPNAME "ttset_memfilemap_31"
+#define TT_FILEMAPNAME "ttset_memfilemap_32"

Modified: trunk/teraterm/teraterm/filesys.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys.cpp	2017-06-02 16:10:58 UTC (rev 6766)
+++ trunk/teraterm/teraterm/filesys.cpp	2017-06-04 12:54:47 UTC (rev 6767)
@@ -957,7 +957,7 @@
 			{
 				tmp[0] = 0;
 				if ( ts.LogTimestamp && eLineEnd ) {
-					char *strtime = mctimelocal();
+					char *strtime = mctimelocal(ts.LogTimestampFormat);
 					/* 2007.05.24 Gentaro */
 					if( eLineEnd == Line_FileHead ){
 						strncat_s(tmp, sizeof(tmp), "\r\n", _TRUNCATE);
@@ -1012,7 +1012,7 @@
 							LocalTime.wHour, LocalTime.wMinute, LocalTime.wSecond,
 							LocalTime.wMilliseconds);
 	#else
-					char *strtime = mctimelocal();
+					char *strtime = mctimelocal(ts.LogTimestampFormat);
 	#endif
 	#else
 						time_t tick = time(NULL);

Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c	2017-06-02 16:10:58 UTC (rev 6766)
+++ trunk/teraterm/ttpset/ttset.c	2017-06-04 12:54:47 UTC (rev 6767)
@@ -1052,6 +1052,11 @@
 
 	ts->LogAllBuffIncludedInFirst = GetOnOff(Section, "LogIncludeScreenBuffer", FName, FALSE);
 
+	/* Timestamp format of Log each line */
+	GetPrivateProfileString(Section, "LogTimestampFormat", "%a %b %e %H:%M:%S.%N %Y",
+	                        ts->LogTimestampFormat, sizeof(ts->LogTimestampFormat),
+	                        FName);
+
 	/* File Transfer dialog visibility */
 	ts->FTHideDialog = GetOnOff(Section, "FTHideDialog", FName, FALSE);
 
@@ -2531,6 +2536,10 @@
 
 	WriteOnOff(Section, "LogIncludeScreenBuffer", FName, ts->LogAllBuffIncludedInFirst);
 
+	/* Timestamp format of Log each line */
+	WritePrivateProfileString(Section, "LogTimestampFormat",
+	                          ts->LogTimestampFormat, FName);
+
 	/* Default Log file name (2006.8.28 maya) */
 	WritePrivateProfileString(Section, "LogDefaultName",
 	                          ts->LogDefaultName, FName);

From svnnotify ＠ sourceforge.jp  Sun Jun  4 22:06:22 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sun, 04 Jun 2017 22:06:22 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY3NjhdICDjg63jgrDjga7jgr/jgqTjg6A=?=
 =?utf-8?b?44K544K/44Oz44OX44GrVVRD44KS5L2/55So44Gn44GN44KL44KI44GG44Gr?=
 =?utf-8?b?44GX44Gf?=
Message-ID: <1496581582.196082.7028.nullmailer@users.sourceforge.jp>

Revision: 6768
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6768
Author:   maya
Date:     2017-06-04 22:06:21 +0900 (Sun, 04 Jun 2017)
Log Message:
-----------
ログのタイムスタンプにUTCを使用できるようにした

https://osdn.net/ticket/browse.php?group_id=1412&tid=36971

Modified Paths:
--------------
    trunk/installer/release/TERATERM.INI
    trunk/teraterm/common/ttlib.c
    trunk/teraterm/common/ttlib.h
    trunk/teraterm/common/tttypes.h
    trunk/teraterm/teraterm/filesys.cpp
    trunk/teraterm/ttpset/ttset.c

-------------- next part --------------
Modified: trunk/installer/release/TERATERM.INI
===================================================================
--- trunk/installer/release/TERATERM.INI	2017-06-04 12:54:47 UTC (rev 6767)
+++ trunk/installer/release/TERATERM.INI	2017-06-04 13:06:21 UTC (rev 6768)
@@ -543,6 +543,9 @@
 ;   %Y/%m/%d %H:%M:%S.%N    ... 2017/06/04 21:12:40.123
 LogTimestampFormat=%a %b %e %H:%M:%S.%N %Y
 
+; Use UTC/GMT time for Log each line timestamp
+LogTimestampUTC=off
+
 ; Exclusive lock for log file
 LogLockExclusive=on
 

Modified: trunk/teraterm/common/ttlib.c
===================================================================
--- trunk/teraterm/common/ttlib.c	2017-06-04 12:54:47 UTC (rev 6767)
+++ trunk/teraterm/common/ttlib.c	2017-06-04 13:06:21 UTC (rev 6768)
@@ -1460,7 +1460,7 @@
 	return Table[lang][kcode];
 }
 
-char *mctimelocal(char *format)
+char *mctimelocal(char *format, BOOL utc_flag)
 {
 	SYSTEMTIME systime;
 	static char strtime[29];
@@ -1470,7 +1470,12 @@
 	char tmp[5];
 	unsigned int i = strlen(format);
 
-	GetLocalTime(&systime);
+	if (utc_flag) {
+		GetSystemTime(&systime);
+	}
+	else {
+		GetLocalTime(&systime);
+	}
 	memset(strtime, 0, sizeof(strtime));
 	for (i=0; i<strlen(format); i++) {
 		if (format[i] == '%') {

Modified: trunk/teraterm/common/ttlib.h
===================================================================
--- trunk/teraterm/common/ttlib.h	2017-06-04 12:54:47 UTC (rev 6767)
+++ trunk/teraterm/common/ttlib.h	2017-06-04 13:06:21 UTC (rev 6768)
@@ -63,7 +63,7 @@
 int KanjiCode2List(int lang, int kcode);
 int List2KanjiCode(int lang, int kcode);
 int KanjiCodeTranslate(int lang, int kcode);
-char *mctimelocal(char *format);
+char *mctimelocal(char *format, BOOL utc_flag);
 
 void b64encode(PCHAR dst, int dsize, PCHAR src, int len);
 int b64decode(PCHAR dst, int dsize, PCHAR src);

Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h	2017-06-04 12:54:47 UTC (rev 6767)
+++ trunk/teraterm/common/tttypes.h	2017-06-04 13:06:21 UTC (rev 6768)
@@ -540,7 +540,7 @@
 	WORD MaximizedBugTweak;
 	WORD NotifyClipboardAccess;
 	WORD SaveVTWinPos;
-	WORD Dummy3;		// \x8B\x8CDisablePasteMouseMButton. PasteFlag\x82?\x9D\x8D\x87\x82\xB5\x82\xBD\x82\xBD\x82?p\x8E~\x81B\x91\xBC\x82?]\x97p
+	WORD LogTimestampUTC;
 	int MouseWheelScrollLine;
 	WORD CRSend_ini;
 	WORD LocalEcho_ini;
@@ -1084,6 +1084,7 @@
  *
  * - At version 4.96, ttset_memfilemap was replaced with ttset_memfilemap_32.
  *   added tttset.LogTimestampFormat
+ *   added tttset.LogTimestampUTC
  *
  * - At version 4.95, ttset_memfilemap was replaced with ttset_memfilemap_31.
  *   added tttset.NotifyClipboardAccess

Modified: trunk/teraterm/teraterm/filesys.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys.cpp	2017-06-04 12:54:47 UTC (rev 6767)
+++ trunk/teraterm/teraterm/filesys.cpp	2017-06-04 13:06:21 UTC (rev 6768)
@@ -957,7 +957,7 @@
 			{
 				tmp[0] = 0;
 				if ( ts.LogTimestamp && eLineEnd ) {
-					char *strtime = mctimelocal(ts.LogTimestampFormat);
+					char *strtime = mctimelocal(ts.LogTimestampFormat, ts.LogTimestampUTC);
 					/* 2007.05.24 Gentaro */
 					if( eLineEnd == Line_FileHead ){
 						strncat_s(tmp, sizeof(tmp), "\r\n", _TRUNCATE);
@@ -1012,7 +1012,7 @@
 							LocalTime.wHour, LocalTime.wMinute, LocalTime.wSecond,
 							LocalTime.wMilliseconds);
 	#else
-					char *strtime = mctimelocal(ts.LogTimestampFormat);
+					char *strtime = mctimelocal(ts.LogTimestampFormat, ts.LogTimestampUTC);
 	#endif
 	#else
 						time_t tick = time(NULL);

Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c	2017-06-04 12:54:47 UTC (rev 6767)
+++ trunk/teraterm/ttpset/ttset.c	2017-06-04 13:06:21 UTC (rev 6768)
@@ -1057,6 +1057,9 @@
 	                        ts->LogTimestampFormat, sizeof(ts->LogTimestampFormat),
 	                        FName);
 
+	/* Use UTC/GMT time for Log each line timestamp */
+	ts->LogTimestampUTC = GetOnOff(Section, "LogTimestampUTC", FName, FALSE);
+
 	/* File Transfer dialog visibility */
 	ts->FTHideDialog = GetOnOff(Section, "FTHideDialog", FName, FALSE);
 
@@ -2540,6 +2543,9 @@
 	WritePrivateProfileString(Section, "LogTimestampFormat",
 	                          ts->LogTimestampFormat, FName);
 
+	/* Use UTC/GMT time for Log each line timestamp */
+	WriteOnOff(Section, "LogTimestampUTC", FName, ts->LogTimestampUTC);
+
 	/* Default Log file name (2006.8.28 maya) */
 	WritePrivateProfileString(Section, "LogDefaultName",
 	                          ts->LogDefaultName, FName);

From svnnotify ＠ sourceforge.jp  Mon Jun  5 17:37:56 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 05 Jun 2017 17:37:56 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY3NjldICBGaWxlVmFyV2luMTYg44Oe44Kv?=
 =?utf-8?b?44Ot44KS5YmK6Zmk?=
Message-ID: <1496651876.912122.19264.nullmailer@users.sourceforge.jp>

Revision: 6769
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6769
Author:   maya
Date:     2017-06-05 17:37:56 +0900 (Mon, 05 Jun 2017)
Log Message:
-----------
FileVarWin16 マクロを削除

Modified Paths:
--------------
    trunk/teraterm/teraterm/filesys.cpp
    trunk/teraterm/teraterm/ttdde.c

-------------- next part --------------
Modified: trunk/teraterm/teraterm/filesys.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys.cpp	2017-06-04 13:06:21 UTC (rev 6768)
+++ trunk/teraterm/teraterm/filesys.cpp	2017-06-05 08:37:56 UTC (rev 6769)
@@ -416,11 +416,7 @@
 		CloseHandle(ptr->LogThread);
 		ptr->LogThread = (HANDLE)-1;
 	}
-#ifdef FileVarWin16
-	_lclose(ptr->FileHandle);
-#else
 	CloseHandle((HANDLE)ptr->FileHandle);
-#endif
 }
 
 // \x92x\x89\x84\x8F\x91\x82\xAB\x8D\x9E\x82?p\x83X\x83\x8C\x83b\x83h
@@ -444,11 +440,7 @@
 			case WM_DPC_LOGTHREAD_SEND:
 				buf = (PCHAR)msg.wParam;
 				buflen = (DWORD)msg.lParam;
-#ifdef FileVarWin16
-				_lwrite(fv->FileHandle, buf, buflen );
-#else
 				WriteFile((HANDLE)LogVar->FileHandle, buf, buflen, &wrote, NULL);
-#endif
 				free(buf);   // \x82\xB1\x82\xB1\x82Ń\x81\x83\x82\x83\x8A\x89\xF0\x95\xFA
 				break;
 
@@ -617,11 +609,7 @@
 		LogVar->FileHandle = (int)CreateFile(LogVar->FullName, GENERIC_WRITE, dwShareMode, NULL,
 		                                     OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
 		if (LogVar->FileHandle>0){
-#ifdef FileVarWin16
-			_llseek(LogVar->FileHandle,0,2);
-#else
 			SetFilePointer((HANDLE)LogVar->FileHandle, 0, NULL, FILE_END);
-#endif
 			/* 2007.05.24 Gentaro
 				If log file already exists,
 				a newline is inserted before the first timestamp.
@@ -1020,21 +1008,11 @@
 	#endif
 					/* 2007.05.24 Gentaro */
 					if( eLineEnd == Line_FileHead ){
-#ifdef FileVarWin16
-						_lwrite(LogVar->FileHandle,"\r\n",2);
-#else
 						WriteFile((HANDLE)LogVar->FileHandle, "\r\n", 2, &wrote, NULL);
-#endif
 					}
-#ifdef FileVarWin16
-					_lwrite(LogVar->FileHandle,"[",1);
-					_lwrite(LogVar->FileHandle, strtime, strlen(strtime));
-					_lwrite(LogVar->FileHandle,"] ",2);
-#else
 					WriteFile((HANDLE)LogVar->FileHandle, "[", 1, &wrote, NULL);
 					WriteFile((HANDLE)LogVar->FileHandle, strtime, strlen(strtime), &wrote, NULL);
 					WriteFile((HANDLE)LogVar->FileHandle, "] ", 2, &wrote, NULL);
-#endif
 				}
 
 				/* 2007.05.24 Gentaro */
@@ -1045,11 +1023,7 @@
 					eLineEnd = Line_Other; /* clear endmark*/
 				}
 
-#ifdef FileVarWin16
-				_lwrite(LogVar->FileHandle,(PCHAR)&b,1);
-#else
 				WriteFile((HANDLE)LogVar->FileHandle, (PCHAR)&b, 1, &wrote, NULL);
-#endif
 				(LogVar->ByteCount)++;
 			}
 		}
@@ -1171,12 +1145,8 @@
 	else
 		(*SetFileVar)(SendVar);
 
-#ifdef FileVarWin16
-	SendVar->FileHandle = _lopen(SendVar->FullName,OF_READ);
-#else
 	SendVar->FileHandle = (int)CreateFile(SendVar->FullName, GENERIC_READ, FILE_SHARE_READ, NULL,
 	                                      OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN, NULL);
-#endif
 	SendVar->FileOpen = (SendVar->FileHandle>0);
 	if (! SendVar->FileOpen)
 	{
@@ -1295,12 +1265,8 @@
 
 	do {
 		if (FileSendHandler.pos == FileSendHandler.end) {
-#ifdef FileVarWin16
-			fc = _lread(SendVar->FileHandle, &(FileSendHandler.buf[0]), sizeof(FileSendHandler.buf));
-#else
 			ReadFile((HANDLE)SendVar->FileHandle, &(FileSendHandler.buf[0]), sizeof(FileSendHandler.buf), &read_bytes, NULL);
 			fc = LOWORD(read_bytes);
-#endif
 			FileSendHandler.pos = 0;
 			FileSendHandler.end = fc;
 		} else {
@@ -1380,21 +1346,13 @@
 			}
 		}
 		else if (! FileReadEOF) {
-#ifdef FileVarWin16
-			fc = _lread(SendVar->FileHandle,&FileByte,1);
-#else
 			ReadFile((HANDLE)SendVar->FileHandle, &FileByte, 1, &read_bytes, NULL);
 			fc = LOWORD(read_bytes);
-#endif
 			SendVar->ByteCount = SendVar->ByteCount + fc;
 
 			if (FileCRSend && (fc==1) && (FileByte==0x0A)) {
-#ifdef FileVarWin16
-				fc = _lread(SendVar->FileHandle,&FileByte,1);
-#else
 				ReadFile((HANDLE)SendVar->FileHandle, &FileByte, 1, &read_bytes, NULL);
 				fc = LOWORD(read_bytes);
-#endif
 				SendVar->ByteCount = SendVar->ByteCount + fc;
 			}
 		}

Modified: trunk/teraterm/teraterm/ttdde.c
===================================================================
--- trunk/teraterm/teraterm/ttdde.c	2017-06-04 13:06:21 UTC (rev 6768)
+++ trunk/teraterm/teraterm/ttdde.c	2017-06-05 08:37:56 UTC (rev 6769)
@@ -601,12 +601,7 @@
 		if (LogVar != NULL)
 		{
 			DWORD wrote;
-#ifdef FileVarWin16
-			_lwrite(LogVar->FileHandle,
-				ParamFileName,strlen(ParamFileName));
-#else
 			WriteFile((HANDLE)LogVar->FileHandle, ParamFileName, strlen(ParamFileName), &wrote, NULL);
-#endif
 			LogVar->ByteCount =
 				LogVar->ByteCount + strlen(ParamFileName);
 			FLogRefreshNum();

From svnnotify ＠ sourceforge.jp  Mon Jun  5 17:39:19 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 05 Jun 2017 17:39:19 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY3NzBdICAjaWYgMCDjgafjga7jgrPjg6E=?=
 =?utf-8?b?44Oz44OI44Ki44Km44OI44KS5YmK6Zmk?=
Message-ID: <1496651959.940986.21209.nullmailer@users.sourceforge.jp>

Revision: 6770
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6770
Author:   maya
Date:     2017-06-05 17:39:19 +0900 (Mon, 05 Jun 2017)
Log Message:
-----------
#if 0 でのコメントアウトを削除

Modified Paths:
--------------
    trunk/teraterm/teraterm/filesys.cpp

-------------- next part --------------
Modified: trunk/teraterm/teraterm/filesys.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys.cpp	2017-06-05 08:37:56 UTC (rev 6769)
+++ trunk/teraterm/teraterm/filesys.cpp	2017-06-05 08:39:19 UTC (rev 6770)
@@ -983,33 +983,8 @@
 		{
 			if (((cv.FilePause & OpLog)==0) && (! cv.ProtoFlag))
 			{
-				// \x8E\x9E\x8D\x8F\x82\xF0\x8F\x91\x82\xAB\x8Fo\x82\xB7(2006.7.23 maya)
-				// \x93\xFA\x95t\x83t\x83H\x81[\x83}\x83b\x83g\x82\xF0\x93\xFA\x96{\x82ł??\xAD\x90\xA2\x8AE\x95W\x8F\x80\x82?ύX\x82\xB5\x82\xBD (2006.7.23 yutaka)
-				/* 2007.05.24 Gentaro */
-				// \x83~\x83\x8A\x95b\x82\xE0\x95\\x8E\xA6\x82\xB7\x82\xE9\x82悤\x82?ύX (2009.5.23 maya)
 				if ( ts.LogTimestamp && eLineEnd ) {
-	#if 1
-	#if 0
-					SYSTEMTIME	LocalTime;
-					GetLocalTime(&LocalTime);
-					char strtime[27];
-
-					// format time
-					sprintf(strtime, "[%04d/%02d/%02d %02d:%02d:%02d.%03d] ",
-							LocalTime.wYear, LocalTime.wMonth,LocalTime.wDay,
-							LocalTime.wHour, LocalTime.wMinute, LocalTime.wSecond,
-							LocalTime.wMilliseconds);
-	#else
 					char *strtime = mctimelocal(ts.LogTimestampFormat, ts.LogTimestampUTC);
-	#endif
-	#else
-						time_t tick = time(NULL);
-						char *strtime = ctime(&tick);
-	#endif
-					/* 2007.05.24 Gentaro */
-					if( eLineEnd == Line_FileHead ){
-						WriteFile((HANDLE)LogVar->FileHandle, "\r\n", 2, &wrote, NULL);
-					}
 					WriteFile((HANDLE)LogVar->FileHandle, "[", 1, &wrote, NULL);
 					WriteFile((HANDLE)LogVar->FileHandle, strtime, strlen(strtime), &wrote, NULL);
 					WriteFile((HANDLE)LogVar->FileHandle, "] ", 2, &wrote, NULL);

From svnnotify ＠ sourceforge.jp  Mon Jun  5 17:48:49 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 05 Jun 2017 17:48:49 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY3NzFdICDkuI3nlKjjgarmnaHku7bliKQ=?=
 =?utf-8?b?5pat44GK44KI44Gz44Kz44O844OJ44KS5YmK6Zmk?=
Message-ID: <1496652529.210664.34661.nullmailer@users.sourceforge.jp>

Revision: 6771
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6771
Author:   doda
Date:     2017-06-05 17:48:48 +0900 (Mon, 05 Jun 2017)
Log Message:
-----------
不用な条件判断およびコードを削除

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/pkt.c
    trunk/ttssh2/ttxssh/ssh.c

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/pkt.c
===================================================================
--- trunk/ttssh2/ttxssh/pkt.c	2017-06-05 08:39:19 UTC (rev 6770)
+++ trunk/ttssh2/ttxssh/pkt.c	2017-06-05 08:48:48 UTC (rev 6771)
@@ -205,17 +205,10 @@
 
 			//debug_print(10, data, pvar->pkt_state.datalen);
 
-			// SSH2\x82?\xE7\x88Í\x86\x89\xBB\x83p\x83P\x83b\x83g\x82??\x82?\x86\x89\xBB\x82\xB7\x82\xE9\x81B
+			// \x88Í\x86\x89\xBB\x83p\x83P\x83b\x83g\x82??\x82?\x86\x89\xBB\x82\xB7\x82\xE9\x81B
 			if (!pvar->pkt_state.predecrypted_packet) {
-				//DEBUG_PRINT_TO_FILE(0, data, pvar->pkt_state.datalen);
 				SSH_predecrpyt_packet(pvar, data);
-
-				if (SSHv1(pvar)) {
-					pvar->pkt_state.predecrypted_packet = TRUE;
-				} else { // for SSH2(yutaka)
-					// do nothing
-					pvar->pkt_state.predecrypted_packet = TRUE;
-				}
+				pvar->pkt_state.predecrypted_packet = TRUE;
 			}
 
 			if (SSHv1(pvar)) {

Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2017-06-05 08:39:19 UTC (rev 6770)
+++ trunk/ttssh2/ttxssh/ssh.c	2017-06-05 08:48:48 UTC (rev 6771)
@@ -2113,24 +2113,6 @@
 {
 	unsigned char message = prep_packet(pvar, data, len, padding);
 
-	
-#ifdef SSH2_DEBUG
-	// for SSH2(yutaka)
-	if (SSHv2(pvar)) {
-		if (pvar->key_done) {
-			message = message;
-		}
-
-		if (pvar->userauth_success) {
-			message = message;
-		}
-
-		if (pvar->rekeying) {
-			message = message;
-		}
-	}
-#endif
-
 	// SSH\x82?\x81\x83b\x83Z\x81[\x83W\x83^\x83C\x83v\x82\xF0\x83`\x83F\x83b\x83N
 	if (message != SSH_MSG_NONE) {
 		// \x83\x81\x83b\x83Z\x81[\x83W\x83^\x83C\x83v\x82?\x9E\x82\xB6\x82\xBD\x83n\x83\x93\x83h\x83\x89\x82\xF0\x8BN\x93\xAE

From svnnotify ＠ sourceforge.jp  Mon Jun  5 19:38:05 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 05 Jun 2017 19:38:05 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY3NzJdICDlpInmm7TlsaXmrbTmm7TmlrAg?=
 =?utf-8?q?=28_r6767-r6768=29?=
Message-ID: <1496659085.680338.108224.nullmailer@users.sourceforge.jp>

Revision: 6772
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6772
Author:   maya
Date:     2017-06-05 19:38:05 +0900 (Mon, 05 Jun 2017)
Log Message:
-----------
変更履歴更新 (r6767-r6768)

Revision Links:
--------------
    http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6767
    http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6768

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/en/html/setup/teraterm-ini.html
    trunk/doc/en/html/setup/teraterm-misc.html
    trunk/doc/en/html/setup/teraterm.html
    trunk/doc/ja/html/about/history.html
    trunk/doc/ja/html/setup/teraterm-ini.html
    trunk/doc/ja/html/setup/teraterm-misc.html
    trunk/doc/ja/html/setup/teraterm.html

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2017-06-05 08:48:48 UTC (rev 6771)
+++ trunk/doc/en/html/about/history.html	2017-06-05 10:38:05 UTC (rev 6772)
@@ -33,10 +33,10 @@
 
 <h3><a name="teraterm_4.96">2017.08.xx (Ver 4.96)</a></h3>
 <ul class="history">
-  <!--li>Changes
+  <li>Changes
     <ul>
     </ul>
-  </li-->
+  </li>
 
   <!--li>Bug fixes
     <ul>

Modified: trunk/doc/en/html/setup/teraterm-ini.html
===================================================================
--- trunk/doc/en/html/setup/teraterm-ini.html	2017-06-05 08:48:48 UTC (rev 6771)
+++ trunk/doc/en/html/setup/teraterm-ini.html	2017-06-05 10:38:05 UTC (rev 6772)
@@ -830,6 +830,18 @@
 		<td></td>
 	</tr>
 	<tr>
+		<td id="LogTimestampFormat"><a href="teraterm-misc.html#LogTimestampFormat">LogTimestampFormat</a></td>
+		<td style="width:250px;">%a %b %e %H:%M:%S.%N %Y</td>
+		<td style="width:250px;">&lt;-</td>
+		<td></td>
+	</tr>
+	<tr>
+		<td id="LogTimestampUTC"><a href="teraterm-misc.html#LogTimestampUTC">LogTimestampUTC</a></td>
+		<td style="width:250px;">off</td>
+		<td style="width:250px;">&lt;-</td>
+		<td></td>
+	</tr>
+	<tr>
 		<td id="LogTypePlainText"><a href="../menu/setup-additional.html#LogTypePlainText">LogTypePlainText</a></td>
 		<td style="width:250px;">on</td>
 		<td style="width:250px;">off</td>

Modified: trunk/doc/en/html/setup/teraterm-misc.html
===================================================================
--- trunk/doc/en/html/setup/teraterm-misc.html	2017-06-05 08:48:48 UTC (rev 6771)
+++ trunk/doc/en/html/setup/teraterm-misc.html	2017-06-05 10:38:05 UTC (rev 6772)
@@ -353,5 +353,59 @@
 </pre>
 
 
+<h1><a name="LogTimestampFormat"><!--\x83\x8D\x83O\x82?s\x93\xAA\x82??\xC1\x82\xB7\x82\xE9\x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82?t\x83H\x81[\x83}\x83b\x83g\x82\xF0\x8Ew\x92?\x82\xE9--></a></h1>
+
+<!--p>
+Tera Term \x82?\x8D\x83O\x83t\x83@\x83C\x83\x8B\x82?\x91\x82\xAB\x8D\x9E\x82?\x9E\x82?s\x93\xAA\x82?^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82\xF0\x8F\x91\x82\xAB\x8D\x9E\x82?\xB1\x82?\xAA\x82ł\xAB\x82?\xB7\x82\xAA\x81A\x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82?t\x83H\x81[\x83}\x83b\x83g\x82\xF0\x8Ew\x92?\x82邱\x82?\xAA\x82ł\xAB\x82?\xB7\x81B
+</p-->
+
+<pre>
+SYNOPSIS:
+%a      Abbreviated weekday name
+%b      Abbreviated month name
+%d      Day of month as decimal number (01 - 31)
+%e      Day of month as decimal number ( 1 - 31)
+%H      Hour in 24-hour format (00 - 23)
+%N      Milisecond as decimal number (000 - 999)
+%m      Month as decimal number (01 - 12)
+%M      Minute as decimal number (00 -  59)
+%S      Second as decimal number (00 - 59)
+%w      Weekday as decimal number (0 - 6; Sunday is 0)
+%Y      Year with century, as decimal number
+%%      Percent sign
+</pre>
+
+<pre>
+Example:
+; 2017/06/04 21:12:40.123
+LogTimestampFormat=%Y/%m/%d %H:%M:%S.%N
+</pre>
+
+<pre>
+Default:
+; Sun Jun  4 21:12:40.123 JST 2017
+LogTimestampFormat=%a %b %e %H:%M:%S.%N %Y
+</pre>
+
+
+<h1><a name="LogTimestampUTC"><!--\x83\x8D\x83O\x82?s\x93\xAA\x82??\xC1\x82\xB7\x82\xE9\x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82?\x9E\x8D\x8F\x82\xC9UTC\x82\xF0\x8Eg\x97p\x82\xB7\x82\xE9--></a></h1>
+
+<!--p>
+Tera Term \x82?\x8D\x83O\x83t\x83@\x83C\x83\x8B\x82?\x91\x82\xAB\x8D\x9E\x82?\x9E\x82?s\x93\xAA\x82?^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82\xF0\x8F\x91\x82\xAB\x8D\x9E\x82?\xB1\x82?\xAA\x82ł\xAB\x82?\xB7\x82\xAA\x81A\x92?\xED\x82?\x8D\x81[\x83J\x83\x8B\x93\xFA\x8E\x9E\x82\xF0\x8Eg\x97p\x82\xB5\x82?\xB7\x81B<br>
+\x89Ď\x9E\x8A??Ή\x9E\x82\xB5\x82\xBD\x83\x8D\x81[\x83J\x83\x8B\x93\xFA\x8E\x9E\x82\xF0\x8Eg\x97p\x82\xB5\x82Ă\xA2\x82\xE9\x82?A\x89Ď\x9E\x8A???\xE8\x91?\xA6\x83^\x83C\x83~\x83\x93\x83O\x82?\x9E\x8D\x8F\x82\xAA\x90i\x82?i\x82?\xBD\x82??\xE9\x81j\x82\xBD\x82???}\x82\xB5\x82?\xA2\x8E\x9E\x8D\x8F\x82\xAA\x8BL\x98^\x82\xB3\x82\xEA\x82邱\x82?\xAA\x82\xA0\x82\xE8\x82?\xB7\x81B<br>
+UTC \x82?\xFA\x8E\x9E\x82??Ď\x9E\x8A?\xAA\x82?\xA2\x82\xBD\x82?A\x82\xB1\x82?\xE2\x91\xE8\x82\xF0\x89\xF1\x94\xF0\x82\xB7\x82邱\x82?\xAA\x82ł\xAB\x82?\xB7\x81B<br>
+\x83\x8D\x81[\x83J\x83\x8B\x93\xFA\x8E\x9E\x82?\xA9\x82\xED\x82\xE8\x82\xC9 UTC \x82?\xFA\x8E\x9E\x82\xF0\x8Eg\x97p\x82\xB7\x82\xE9\x8F?\x82?A\x90?\xE8\x83t\x83@\x83C\x83\x8B\x82\xCC [Tera Term] \x83Z\x83N\x83V\x83\x87\x83\x93\x82\xCC LogTimestampUTC \x8Ds\x82\xF0\x88?\xBA\x82?悤\x82?ύX\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+</p-->
+
+<pre>
+LogTimestampUTC=on
+</pre>
+
+<pre>
+Default:
+LogTimestampUTC=off
+</pre>
+
+
 </BODY>
 </HTML>

Modified: trunk/doc/en/html/setup/teraterm.html
===================================================================
--- trunk/doc/en/html/setup/teraterm.html	2017-06-05 08:48:48 UTC (rev 6771)
+++ trunk/doc/en/html/setup/teraterm.html	2017-06-05 10:38:05 UTC (rev 6772)
@@ -175,6 +175,8 @@
  <li><a href="teraterm-misc.html#ClickableUrlBrowser">A browser by using Clickable URL</a></li>
  <li><a href="teraterm-misc.html#LogLockExclusive">Exclusive-lock log file</a></li>
  <li><a href="teraterm-misc.html#DeferredLogWriteMode">Deferred log write mode</a></li>
+ <!--li><a href="teraterm-misc.html#LogTimestampFormat">\x83\x8D\x83O\x82?s\x93\xAA\x82??\xC1\x82\xB7\x82\xE9\x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82?t\x83H\x81[\x83}\x83b\x83g\x82\xF0\x8Ew\x92?\x82\xE9</a></li>
+ <li><a href="teraterm-misc.html#LogTimestampUTC">\x83\x8D\x83O\x82?s\x93\xAA\x82??\xC1\x82\xB7\x82\xE9\x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82?\x9E\x8D\x8F\x82\xC9UTC\x82\xF0\x8Eg\x97p\x82\xB7\x82\xE9</a></li-->
 </ul>
 
 </body>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2017-06-05 08:48:48 UTC (rev 6771)
+++ trunk/doc/ja/html/about/history.html	2017-06-05 10:38:05 UTC (rev 6772)
@@ -33,10 +33,18 @@
 
 <h3><a name="teraterm_4.96">2017.08.xx (Ver 4.96)</a></h3>
 <ul class="history">
-  <!--li>\x95ύX
+  <li>\x95ύX
     <ul>
+      <li>\x83\x8D\x83O\x82?s\x93\xAA\x82??\xC1\x82\xB7\x82\xE9\x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82?t\x83H\x81[\x83}\x83b\x83g\x82\xF0\x8Ew\x92\xE8\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B
+        <ul>
+          <li>teraterm.ini \x82\xC9 <a href="../setup/teraterm-misc.html#LogTimestampFormat">LogTimestampFormat</a> \x83G\x83\x93\x83g\x83\x8A\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B\x83f\x83t\x83H\x83\x8B\x83g\x82\xCD"%a %b %e %H:%M:%S.%N %Y"\x81B</li>
+        </ul></li>
+      <li>\x83\x8D\x83O\x82?s\x93\xAA\x82??\xC1\x82\xB7\x82\xE9\x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82?\x9E\x8D\x8F\x82\xC9UTC\x82\xF0\x8Eg\x97p\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B
+        <ul>
+          <li>teraterm.ini \x82\xC9 <a href="../setup/teraterm-misc.html#LogTimestampUTC">LogTimestampUTC</a> \x83G\x83\x93\x83g\x83\x8A\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B\x83f\x83t\x83H\x83\x8B\x83g\x82\xCDoff\x81B</li>
+        </ul></li>
     </ul>
-  </li-->
+  </li>
 
   <!--li>\x83o\x83O\x8FC\x90\xB3
     <ul>

Modified: trunk/doc/ja/html/setup/teraterm-ini.html
===================================================================
--- trunk/doc/ja/html/setup/teraterm-ini.html	2017-06-05 08:48:48 UTC (rev 6771)
+++ trunk/doc/ja/html/setup/teraterm-ini.html	2017-06-05 10:38:05 UTC (rev 6772)
@@ -830,6 +830,18 @@
 		<td></td>
 	</tr>
 	<tr>
+		<td id="LogTimestampFormat"><a href="teraterm-misc.html#LogTimestampFormat">LogTimestampFormat</a></td>
+		<td style="width:250px;">%a %b %e %H:%M:%S.%N %Y</td>
+		<td style="width:250px;">&lt;-</td>
+		<td></td>
+	</tr>
+	<tr>
+		<td id="LogTimestampUTC"><a href="teraterm-misc.html#LogTimestampUTC">LogTimestampUTC</a></td>
+		<td style="width:250px;">off</td>
+		<td style="width:250px;">&lt;-</td>
+		<td></td>
+	</tr>
+	<tr>
 		<td id="LogTypePlainText"><a href="../menu/setup-additional.html#LogTypePlainText">LogTypePlainText</a></td>
 		<td style="width:250px;">on</td>
 		<td style="width:250px;">off</td>

Modified: trunk/doc/ja/html/setup/teraterm-misc.html
===================================================================
--- trunk/doc/ja/html/setup/teraterm-misc.html	2017-06-05 08:48:48 UTC (rev 6771)
+++ trunk/doc/ja/html/setup/teraterm-misc.html	2017-06-05 10:38:05 UTC (rev 6772)
@@ -373,5 +373,59 @@
 </pre>
 
 
+<h1><a name="LogTimestampFormat">\x83\x8D\x83O\x82?s\x93\xAA\x82??\xC1\x82\xB7\x82\xE9\x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82?t\x83H\x81[\x83}\x83b\x83g\x82\xF0\x8Ew\x92?\x82\xE9</a></h1>
+
+<p>
+Tera Term \x82?\x8D\x83O\x83t\x83@\x83C\x83\x8B\x82?\x91\x82\xAB\x8D\x9E\x82?\x9E\x82?s\x93\xAA\x82?^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82\xF0\x8F\x91\x82\xAB\x8D\x9E\x82?\xB1\x82?\xAA\x82ł\xAB\x82?\xB7\x82\xAA\x81A\x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82?t\x83H\x81[\x83}\x83b\x83g\x82\xF0\x8Ew\x92?\x82邱\x82?\xAA\x82ł\xAB\x82?\xB7\x81B
+</p>
+
+<pre>
+\x8F\x91\x8E\xAE
+%a      \x97j\x93\xFA\x82??\xAA\x8C`\x81B
+%b      \x8C\x8E\x82??\xAA\x8C`\x81B
+%d      10 \x90i\x90\x94\x82ŕ\\x82\xB7\x8C\x8E\x82?\xFA\x95t (01 \x81` 31)\x81B
+%e      10 \x90i\x90\x94\x82ŕ\\x82\xB7\x8C\x8E\x82?\xFA\x95t ( 1 \x81` 31)\x81B
+%H      24 \x8E\x9E\x8A?\\x8BL\x82?\x9E\x8A\xD4 (00 \x81` 23)\x81B
+%N      10 \x90i\x90\x94\x82ŕ\\x82\xB7\x83~\x83\x8A\x95b (000 \x81` 999)\x81B
+%m      10 \x90i\x90\x94\x82ŕ\\x82\xB7\x8C\x8E (01 \x81` 12)\x81B
+%M      10 \x90i\x90\x94\x82ŕ\\x82\xB7\x95\xAA (00 \x81` 59)\x81B
+%S      10 \x90i\x90\x94\x82ŕ\\x82\xB7\x95b (00 \x81` 59)\x81B
+%w      10 \x90i\x90\x94\x82ŕ\\x82\xB7\x97j\x93\xFA (0 \x81` 6\x81A\x93\xFA\x97j\x93\xFA\x82\xAA 0)\x81B
+%Y      10 \x90i\x90\x94\x82ŕ\\x82\xB7 4 \x8C\x85\x82?\xBC\x97\xEF\x81B
+%%      \x83p\x81[\x83Z\x83\x93\x83g\x8BL\x8D\x86\x81B
+</pre>
+
+<pre>
+\x97\xE1:
+; 2017/06/04 21:12:40.123
+LogTimestampFormat=%Y/%m/%d %H:%M:%S.%N
+</pre>
+
+<pre>
+\x8F?\xAA\x8E\x9E:
+; Sun Jun  4 21:12:40.123 JST 2017
+LogTimestampFormat=%a %b %e %H:%M:%S.%N %Y
+</pre>
+
+
+<h1><a name="LogTimestampUTC">\x83\x8D\x83O\x82?s\x93\xAA\x82??\xC1\x82\xB7\x82\xE9\x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82?\x9E\x8D\x8F\x82\xC9UTC\x82\xF0\x8Eg\x97p\x82\xB7\x82\xE9</a></h1>
+
+<p>
+Tera Term \x82?\x8D\x83O\x83t\x83@\x83C\x83\x8B\x82?\x91\x82\xAB\x8D\x9E\x82?\x9E\x82?s\x93\xAA\x82?^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82\xF0\x8F\x91\x82\xAB\x8D\x9E\x82?\xB1\x82?\xAA\x82ł\xAB\x82?\xB7\x82\xAA\x81A\x92?\xED\x82?\x8D\x81[\x83J\x83\x8B\x93\xFA\x8E\x9E\x82\xF0\x8Eg\x97p\x82\xB5\x82?\xB7\x81B<br>
+\x89Ď\x9E\x8A??Ή\x9E\x82\xB5\x82\xBD\x83\x8D\x81[\x83J\x83\x8B\x93\xFA\x8E\x9E\x82\xF0\x8Eg\x97p\x82\xB5\x82Ă\xA2\x82\xE9\x82?A\x89Ď\x9E\x8A???\xE8\x91?\xA6\x83^\x83C\x83~\x83\x93\x83O\x82?\x9E\x8D\x8F\x82\xAA\x90i\x82?i\x82?\xBD\x82??\xE9\x81j\x82\xBD\x82???}\x82\xB5\x82?\xA2\x8E\x9E\x8D\x8F\x82\xAA\x8BL\x98^\x82\xB3\x82\xEA\x82邱\x82?\xAA\x82\xA0\x82\xE8\x82?\xB7\x81B<br>
+UTC \x82?\xFA\x8E\x9E\x82??Ď\x9E\x8A?\xAA\x82?\xA2\x82\xBD\x82?A\x82\xB1\x82?\xE2\x91\xE8\x82\xF0\x89\xF1\x94\xF0\x82\xB7\x82邱\x82?\xAA\x82ł\xAB\x82?\xB7\x81B<br>
+\x83\x8D\x81[\x83J\x83\x8B\x93\xFA\x8E\x9E\x82?\xA9\x82\xED\x82\xE8\x82\xC9 UTC \x82?\xFA\x8E\x9E\x82\xF0\x8Eg\x97p\x82\xB7\x82\xE9\x8F?\x82?A\x90?\xE8\x83t\x83@\x83C\x83\x8B\x82\xCC [Tera Term] \x83Z\x83N\x83V\x83\x87\x83\x93\x82\xCC LogTimestampUTC \x8Ds\x82\xF0\x88?\xBA\x82?悤\x82?ύX\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+</p>
+
+<pre>
+LogTimestampUTC=on
+</pre>
+
+<pre>
+\x8F?\xAA\x8E\x9E:
+LogTimestampUTC=off
+</pre>
+
+
 </BODY>
 </HTML>

Modified: trunk/doc/ja/html/setup/teraterm.html
===================================================================
--- trunk/doc/ja/html/setup/teraterm.html	2017-06-05 08:48:48 UTC (rev 6771)
+++ trunk/doc/ja/html/setup/teraterm.html	2017-06-05 10:38:05 UTC (rev 6772)
@@ -179,6 +179,8 @@
  <li><a href="teraterm-misc.html#ClickableUrlBrowser">\x83N\x83\x8A\x83b\x83J\x83u\x83\x8B URL \x82ŋN\x93\xAE\x82\xB7\x82\xE9\x83u\x83\x89\x83E\x83U</a></li>
  <li><a href="teraterm-misc.html#LogLockExclusive">\x83\x8D\x83O\x83t\x83@\x83C\x83\x8B\x82\xF0\x94r\x91\xBC\x83\x8D\x83b\x83N\x82\xB7\x82\xE9</a></li>
  <li><a href="teraterm-misc.html#DeferredLogWriteMode">\x83\x8D\x83O\x83t\x83@\x83C\x83\x8B\x82\xF0\x92x\x89\x84\x8F\x91\x82\xAB\x8D\x9E\x82?\xB7\x82\xE9</a></li>
+ <li><a href="teraterm-misc.html#LogTimestampFormat">\x83\x8D\x83O\x82?s\x93\xAA\x82??\xC1\x82\xB7\x82\xE9\x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82?t\x83H\x81[\x83}\x83b\x83g\x82\xF0\x8Ew\x92?\x82\xE9</a></li>
+ <li><a href="teraterm-misc.html#LogTimestampUTC">\x83\x8D\x83O\x82?s\x93\xAA\x82??\xC1\x82\xB7\x82\xE9\x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82?\x9E\x8D\x8F\x82\xC9UTC\x82\xF0\x8Eg\x97p\x82\xB7\x82\xE9</a></li>
 </ul>
 
 </body>

From svnnotify ＠ sourceforge.jp  Mon Jun  5 19:44:18 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 05 Jun 2017 19:44:18 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY3NzNdICDlpInmm7TlsaXmrbTmm7TmlrAg?=
 =?utf-8?q?=28_r6767-r6768=29?=
Message-ID: <1496659458.451681.118421.nullmailer@users.sourceforge.jp>

Revision: 6773
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6773
Author:   maya
Date:     2017-06-05 19:44:18 +0900 (Mon, 05 Jun 2017)
Log Message:
-----------
変更履歴更新 (r6767-r6768)

Revision Links:
--------------
    http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6767
    http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6768

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2017-06-05 10:38:05 UTC (rev 6772)
+++ trunk/doc/en/html/about/history.html	2017-06-05 10:44:18 UTC (rev 6773)
@@ -35,6 +35,14 @@
 <ul class="history">
   <li>Changes
     <ul>
+      <!--li>\x83\x8D\x83O\x82?s\x93\xAA\x82??\xC1\x82\xB7\x82\xE9\x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82?t\x83H\x81[\x83}\x83b\x83g\x82\xF0\x8Ew\x92\xE8\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B
+        <ul>
+          <li>teraterm.ini \x82\xC9 <a href="../setup/teraterm-misc.html#LogTimestampFormat">LogTimestampFormat</a> \x83G\x83\x93\x83g\x83\x8A\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B\x83f\x83t\x83H\x83\x8B\x83g\x82\xCD"%a %b %e %H:%M:%S.%N %Y"\x81B</li>
+        </ul></li>
+      <li>\x83\x8D\x83O\x82?s\x93\xAA\x82??\xC1\x82\xB7\x82\xE9\x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82?\x9E\x8D\x8F\x82\xC9UTC\x82\xF0\x8Eg\x97p\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B
+        <ul>
+          <li>teraterm.ini \x82\xC9 <a href="../setup/teraterm-misc.html#LogTimestampUTC">LogTimestampUTC</a> \x83G\x83\x93\x83g\x83\x8A\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B\x83f\x83t\x83H\x83\x8B\x83g\x82\xCDoff\x81B</li>
+        </ul></li-->
     </ul>
   </li>
 

From svnnotify ＠ sourceforge.jp  Mon Jun  5 20:30:42 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 05 Jun 2017 20:30:42 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY3NzRdICDjg4fjg5Djg4PjgrDjg63jgrA=?=
 =?utf-8?b?44KSIElTTy04NjAxIOW9ouW8j+OBp+WHuuWKm+OBmeOCi+OCiOOBhuOBqw==?=
 =?utf-8?b?44GX44Gf44CC?=
Message-ID: <1496662242.119006.57119.nullmailer@users.sourceforge.jp>

Revision: 6774
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6774
Author:   doda
Date:     2017-06-05 20:30:41 +0900 (Mon, 05 Jun 2017)
Log Message:
-----------
デバッグログを ISO-8601 形式で出力するようにした。

デバッグログは基本的にはユーザが見る物では無いので、ユーザ指定の形式を反映しなくても大丈夫?
タイムゾーンを取るのが面倒なので UTC にしているけれど、これも問題ない?

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/ttxssh.c

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c	2017-06-05 10:44:18 UTC (rev 6773)
+++ trunk/ttssh2/ttxssh/ttxssh.c	2017-06-05 11:30:41 UTC (rev 6774)
@@ -931,7 +931,7 @@
 		             _S_IREAD | _S_IWRITE);
 
 		if (file >= 0) {
-			char *strtime = mctimelocal();
+			char *strtime = mctimelocal("%Y-%m-%dT%H:%M:%S,%NZ", TRUE);
 			DWORD processid;
 			char tmp[26];
 

From svnnotify ＠ sourceforge.jp  Mon Jun  5 21:13:46 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 05 Jun 2017 21:13:46 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY3NzVdICDjg5Hjgrnjg6/jg7zjg4noqo0=?=
 =?utf-8?b?6Ki85pmC44Gu44OR44K544Ov44O844OJ5aSJ5pu044OA44Kk44Ki44Ot44Kw?=
 =?utf-8?b?44Gn44Kt44Oj44Oz44K744Or44GX44Gf5pmC44Gr44CB44OH44OQ44OD44Kw?=
 =?utf-8?b?44Ot44Kw44Gr44K044Of44GM5Ye65Yqb44GV44KM44KL5ZWP6aGM44KS5L+u?=
 =?utf-8?b?5q2j44GX44Gf44CC?=
Message-ID: <1496664826.840324.134161.nullmailer@users.sourceforge.jp>

Revision: 6775
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6775
Author:   doda
Date:     2017-06-05 21:13:46 +0900 (Mon, 05 Jun 2017)
Log Message:
-----------
パスワード認証時のパスワード変更ダイアログでキャンセルした時に、デバッグログにゴミが出力される問題を修正した。

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html
    trunk/ttssh2/ttxssh/ssh.c

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2017-06-05 11:30:41 UTC (rev 6774)
+++ trunk/doc/en/html/about/history.html	2017-06-05 12:13:46 UTC (rev 6775)
@@ -2916,6 +2916,7 @@
 
   <!--li>Bug fixes
     <ul>
+      <li>\x83p\x83X\x83\x8F\x81[\x83h\x94F\x8F?\x9E\x82?p\x83X\x83\x8F\x81[\x83h\x95ύX\x83_\x83C\x83A\x83\x8D\x83O\x82ŃL\x83\x83\x83\x93\x83Z\x83\x8B\x82\xB5\x82\xBD\x8E\x9E\x82?A\x83f\x83o\x83b\x83O\x83\x8D\x83O\x82?S\x83~\x82\xAA\x8Fo\x97?\xB3\x82\xEA\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
     </ul>
   </li-->
 

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2017-06-05 11:30:41 UTC (rev 6774)
+++ trunk/doc/ja/html/about/history.html	2017-06-05 12:13:46 UTC (rev 6775)
@@ -2920,10 +2920,11 @@
     </ul>
   </li-->
 
-  <!--li>\x83o\x83O\x8FC\x90\xB3
+  <li>\x83o\x83O\x8FC\x90\xB3
     <ul>
+      <li>\x83p\x83X\x83\x8F\x81[\x83h\x94F\x8F?\x9E\x82?p\x83X\x83\x8F\x81[\x83h\x95ύX\x83_\x83C\x83A\x83\x8D\x83O\x82ŃL\x83\x83\x83\x93\x83Z\x83\x8B\x82\xB5\x82\xBD\x8E\x9E\x82?A\x83f\x83o\x83b\x83O\x83\x8D\x83O\x82?S\x83~\x82\xAA\x8Fo\x97?\xB3\x82\xEA\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
     </ul>
-  </li-->
+  </li>
 
   <li>\x82\xBB\x82?\xBC
     <ul>

Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2017-06-05 11:30:41 UTC (rev 6774)
+++ trunk/ttssh2/ttxssh/ssh.c	2017-06-05 12:13:46 UTC (rev 6775)
@@ -7317,11 +7317,11 @@
 	ret = DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_SSHPASSWD_INPUT), pvar->cv->HWin, passwd_change_dialog, (LPARAM)&cp);
 
 	if (ret == -1) {
-		logprintf(pvar, LOG_LEVEL_WARNING, __FUNCTION__ "%s: DialogBoxParam failed.");
+		logprintf(pvar, LOG_LEVEL_WARNING, __FUNCTION__ ": DialogBoxParam failed.");
 		return FALSE;
 	}
 	else if (ret == 0) {
-		logprintf(pvar, LOG_LEVEL_NOTICE, __FUNCTION__ "%s: dialog cancelled.");
+		logprintf(pvar, LOG_LEVEL_NOTICE, __FUNCTION__ ": dialog cancelled.");
 		return FALSE;
 	}
 

From svnnotify ＠ sourceforge.jp  Mon Jun  5 23:07:29 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 05 Jun 2017 23:07:29 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B6777=5D__Setup_-_Terminal_=E3=83=80?=
 =?utf-8?b?44Kk44Ki44Ot44Kw44GuIEhlbHAg44Oc44K/44Oz44Gn44CB5a++5b+c44GZ?=
 =?utf-8?b?44KL6KiA6Kqe44Gu44OY44Or44OX44KS6KGo56S644GZ44KL44KI44GG44Gr?=
 =?utf-8?b?44GX44Gf44CC?=
Message-ID: <1496671649.291104.117158.nullmailer@users.sourceforge.jp>

Revision: 6777
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6777
Author:   doda
Date:     2017-06-05 23:07:29 +0900 (Mon, 05 Jun 2017)
Log Message:
-----------
Setup - Terminal ダイアログの Help ボタンで、対応する言語のヘルプを表示するようにした。

Modified Paths:
--------------
    trunk/doc/en/teraterm.hhp
    trunk/doc/ja/teraterm.hhp
    trunk/teraterm/common/helpid.h
    trunk/teraterm/teraterm/vtwin.cpp

-------------- next part --------------
Modified: trunk/doc/en/teraterm.hhp
===================================================================
--- trunk/doc/en/teraterm.hhp	2017-06-05 14:07:25 UTC (rev 6776)
+++ trunk/doc/en/teraterm.hhp	2017-06-05 14:07:29 UTC (rev 6777)
@@ -32,6 +32,11 @@
 HlpFilePrint=html\menu\file-print.html
 HlpSetupTerminal=html\menu\setup-terminal.html
 HlpSetupTerminalRuss=html\menu\setup-terminal_ru.html
+HlpSetupTerminalEn=html\menu\setup-terminal.html
+HlpSetupTerminalJa=html\menu\setup-terminal_ja.html
+HlpSetupTerminalKo=html\menu\setup-terminal_ko.html
+HlpSetupTerminalRu=html\menu\setup-terminal_ru.html
+HlpSetupTerminalUtf8=html\menu\setup-terminal_utf8.html
 HlpSetupWindow=html\menu\setup-window.html
 HlpSetupFont=html\menu\setup-font.html
 HlpSetupKeyboard=html\menu\setup-keyboard.html

Modified: trunk/doc/ja/teraterm.hhp
===================================================================
--- trunk/doc/ja/teraterm.hhp	2017-06-05 14:07:25 UTC (rev 6776)
+++ trunk/doc/ja/teraterm.hhp	2017-06-05 14:07:29 UTC (rev 6777)
@@ -32,6 +32,11 @@
 HlpFilePrint=html\menu\file-print.html
 HlpSetupTerminal=html\menu\setup-terminal.html
 HlpSetupTerminalRuss=html\menu\setup-terminal_ru.html
+HlpSetupTerminalEn=html\menu\setup-terminal_en.html
+HlpSetupTerminalJa=html\menu\setup-terminal.html
+HlpSetupTerminalKo=html\menu\setup-terminal_ko.html
+HlpSetupTerminalRu=html\menu\setup-terminal_ru.html
+HlpSetupTerminalUtf8=html\menu\setup-terminal_utf8.html
 HlpSetupWindow=html\menu\setup-window.html
 HlpSetupFont=html\menu\setup-font.html
 HlpSetupKeyboard=html\menu\setup-keyboard.html

Modified: trunk/teraterm/common/helpid.h
===================================================================
--- trunk/teraterm/common/helpid.h	2017-06-05 14:07:25 UTC (rev 6776)
+++ trunk/teraterm/common/helpid.h	2017-06-05 14:07:29 UTC (rev 6777)
@@ -19,6 +19,11 @@
 #define HlpFilePrint            12
 #define HlpSetupTerminal        13
 #define HlpSetupTerminalRuss    14
+#define HlpSetupTerminalEn      41
+#define HlpSetupTerminalJa      42
+#define HlpSetupTerminalKo      43
+#define HlpSetupTerminalRu      44
+#define HlpSetupTerminalUtf8    45
 #define HlpSetupWindow          15
 #define HlpSetupFont            16
 #define HlpSetupKeyboard        18

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2017-06-05 14:07:25 UTC (rev 6776)
+++ trunk/teraterm/teraterm/vtwin.cpp	2017-06-05 14:07:29 UTC (rev 6777)
@@ -4599,11 +4599,25 @@
 {
 	BOOL Ok;
 
-	if (ts.Language==IdRussian) {
-		HelpId = HlpSetupTerminalRuss;
-	}
-	else {
+	switch (ts.Language) {
+	case IdJapanese:
+		HelpId = HlpSetupTerminalJa;
+		break;
+	case IdEnglish:
+		HelpId = HlpSetupTerminalEn;
+		break;
+	case IdKorean:
+		HelpId = HlpSetupTerminalKo;
+		break;
+	case IdRussian:
+		HelpId = HlpSetupTerminalRu;
+		break;
+	case IdUtf8:
+		HelpId = HlpSetupTerminalUtf8;
+		break;
+	default:
 		HelpId = HlpSetupTerminal;
+		break;
 	}
 	if (! LoadTTDLG()) {
 		return;

From svnnotify ＠ sourceforge.jp  Mon Jun  5 23:07:25 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 05 Jun 2017 23:07:25 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY3NzZdICDoqIDoqp7lkI3jgavplqLjgZk=?=
 =?utf-8?b?44KL44OV44Kh44Kk44Or5ZCN44Gu5ZG95ZCN5pa55rOV44KS57Wx5LiA44GX?=
 =?utf-8?b?44Gf44CC?=
Message-ID: <1496671645.247102.116398.nullmailer@users.sourceforge.jp>

Revision: 6776
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6776
Author:   doda
Date:     2017-06-05 23:07:25 +0900 (Mon, 05 Jun 2017)
Log Message:
-----------
言語名に関するファイル名の命名方法を統一した。

・基本は ISO 639-1 でのコードを _ と共に末尾に追加 (jp -> _ja 等)
・言語名でない UTF-8 は _utf8 を追加

Modified Paths:
--------------
    trunk/doc/en/html/menu/setup-keyboard.html
    trunk/doc/en/html/menu/setup-terminal.html
    trunk/doc/en/teraterm.hhp
    trunk/doc/ja/html/menu/setup-keyboard.html
    trunk/doc/ja/html/menu/setup-terminal.html
    trunk/doc/ja/teraterm.hhp

Added Paths:
-----------
    trunk/doc/en/html/menu/setup-keyboard_ru.html
    trunk/doc/en/html/menu/setup-terminal_ja.html
    trunk/doc/en/html/menu/setup-terminal_ko.html
    trunk/doc/en/html/menu/setup-terminal_ru.html
    trunk/doc/en/html/menu/setup-terminal_utf8.html
    trunk/doc/ja/html/menu/setup-keyboard_ru.html
    trunk/doc/ja/html/menu/setup-terminal_en.html
    trunk/doc/ja/html/menu/setup-terminal_ko.html
    trunk/doc/ja/html/menu/setup-terminal_ru.html
    trunk/doc/ja/html/menu/setup-terminal_utf8.html

Removed Paths:
-------------
    trunk/doc/en/html/menu/setup-keyboardr.html
    trunk/doc/en/html/menu/setup-terminaljp.html
    trunk/doc/en/html/menu/setup-terminalk.html
    trunk/doc/en/html/menu/setup-terminalr.html
    trunk/doc/en/html/menu/setup-terminalutf8.html
    trunk/doc/ja/html/menu/setup-keyboardr.html
    trunk/doc/ja/html/menu/setup-terminalen.html
    trunk/doc/ja/html/menu/setup-terminalk.html
    trunk/doc/ja/html/menu/setup-terminalr.html
    trunk/doc/ja/html/menu/setup-terminalutf8.html

-------------- next part --------------
Modified: trunk/doc/en/html/menu/setup-keyboard.html
===================================================================
--- trunk/doc/en/html/menu/setup-keyboard.html	2017-06-05 12:13:46 UTC (rev 6775)
+++ trunk/doc/en/html/menu/setup-keyboard.html	2017-06-05 14:07:25 UTC (rev 6776)
@@ -70,7 +70,7 @@
     </p>
 
     <p>
-      <a href="setup-keyboardr.html">Help for Russian mode</a>
+      <a href="setup-keyboard_ru.html">Help for Russian mode</a>
     </p>
   </body>
 </html>

Copied: trunk/doc/en/html/menu/setup-keyboard_ru.html (from rev 6775, trunk/doc/en/html/menu/setup-keyboardr.html)
===================================================================
--- trunk/doc/en/html/menu/setup-keyboard_ru.html	                        (rev 0)
+++ trunk/doc/en/html/menu/setup-keyboard_ru.html	2017-06-05 14:07:25 UTC (rev 6776)
@@ -0,0 +1,79 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+  "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <title>Keyboard ([Setup] menu; Russian mode)</title>
+    <META http-equiv="Content-Style-Type" content="text/css">
+    <link rel="stylesheet" href="../style.css" type="text/css">
+  </head>
+
+  <body>
+    <h1>Keyboard ([Setup] menu; Russian mode)</h1>
+
+    <h2>"Keyboard setup" dialog box</h2>
+    <dl>
+      <dt>Transmit DEL by:</dt>
+      <dd>
+	<dl>
+	  <dt>Backspace key</dt>
+	  <dd>
+	    If this option is checked, pressing the backspace key sends
+	    the DEL character (ASCII 0x7F). If not checked, the BS character
+	    (ASCII 0x08) is sent. Even if this option is (not) checked,
+	    the BS (DEL) character can be sent by pressing the
+	    Ctrl+backspace key.
+	  </dd>
+
+	  <dt>Delete key</dt>
+	  <dd>
+	    If this option is checked, pressing the Delete key sends the
+	    DEL character. If not checked, the function assigned for the
+	    Delete key is determined by the
+	    <a href="../setup/keyboard.html">keyboard setupfile</a>.
+	  </dd>
+	</dl>
+      </dd>
+
+      <dt id="RussKeyb">Keyboard</dt>
+      <dd>
+	Russian keyboard driver type. If you are using the standard
+	keyboard driver which comes with Russian Windows, select Windows.
+	If you are using non-Russian Windows and using a driver which
+	generates KOI8-R code, select KOI8-R.
+      </dd>
+
+      <dt>Meta key</dt>
+      <dd>
+	Enables the meta-key mode. The Alt key is used as the meta key.
+	For example, the sequence ESC A is sent by pressing the Alt+A key.
+	Shortcut keys which use the Alt key (such as Alt+C) are disabled.
+      </dd>
+
+      <dt>Disabled mode:</dt>
+      <dd>
+	<dl>
+	  <dt>Application Keypad</dt>
+	  <dd>
+	    This option disables Application Keypad mode.<br>
+	    If this option is selected, you can prevent a problem of a
+	    numeric keypad from being unavailable due to an accidental
+	    transition to Application Keypad mode.<br>
+	    Note that some application which uses application keypad mode
+	    may encounter other problems when this option is selected.
+	  </dd>
+
+	  <dt>Application Cursor</dt>
+	  <dd>
+	    This option disables Application Cursor mode.
+	  </dd>
+	</dl>
+      </dd>
+    </dl>
+
+    <p>
+      You can modify key assignments by editing the
+      <a href="../setup/keyboard.html">keyboard setupfile</a>.
+    </p>
+  </body>
+</html>

Deleted: trunk/doc/en/html/menu/setup-keyboardr.html
===================================================================
--- trunk/doc/en/html/menu/setup-keyboardr.html	2017-06-05 12:13:46 UTC (rev 6775)
+++ trunk/doc/en/html/menu/setup-keyboardr.html	2017-06-05 14:07:25 UTC (rev 6776)
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <title>Keyboard ([Setup] menu; Russian mode)</title>
-    <META http-equiv="Content-Style-Type" content="text/css">
-    <link rel="stylesheet" href="../style.css" type="text/css">
-  </head>
-
-  <body>
-    <h1>Keyboard ([Setup] menu; Russian mode)</h1>
-
-    <h2>"Keyboard setup" dialog box</h2>
-    <dl>
-      <dt>Transmit DEL by:</dt>
-      <dd>
-	<dl>
-	  <dt>Backspace key</dt>
-	  <dd>
-	    If this option is checked, pressing the backspace key sends
-	    the DEL character (ASCII 0x7F). If not checked, the BS character
-	    (ASCII 0x08) is sent. Even if this option is (not) checked,
-	    the BS (DEL) character can be sent by pressing the
-	    Ctrl+backspace key.
-	  </dd>
-
-	  <dt>Delete key</dt>
-	  <dd>
-	    If this option is checked, pressing the Delete key sends the
-	    DEL character. If not checked, the function assigned for the
-	    Delete key is determined by the
-	    <a href="../setup/keyboard.html">keyboard setupfile</a>.
-	  </dd>
-	</dl>
-      </dd>
-
-      <dt id="RussKeyb">Keyboard</dt>
-      <dd>
-	Russian keyboard driver type. If you are using the standard
-	keyboard driver which comes with Russian Windows, select Windows.
-	If you are using non-Russian Windows and using a driver which
-	generates KOI8-R code, select KOI8-R.
-      </dd>
-
-      <dt>Meta key</dt>
-      <dd>
-	Enables the meta-key mode. The Alt key is used as the meta key.
-	For example, the sequence ESC A is sent by pressing the Alt+A key.
-	Shortcut keys which use the Alt key (such as Alt+C) are disabled.
-      </dd>
-
-      <dt>Disabled mode:</dt>
-      <dd>
-	<dl>
-	  <dt>Application Keypad</dt>
-	  <dd>
-	    This option disables Application Keypad mode.<br>
-	    If this option is selected, you can prevent a problem of a
-	    numeric keypad from being unavailable due to an accidental
-	    transition to Application Keypad mode.<br>
-	    Note that some application which uses application keypad mode
-	    may encounter other problems when this option is selected.
-	  </dd>
-
-	  <dt>Application Cursor</dt>
-	  <dd>
-	    This option disables Application Cursor mode.
-	  </dd>
-	</dl>
-      </dd>
-    </dl>
-
-    <p>
-      You can modify key assignments by editing the
-      <a href="../setup/keyboard.html">keyboard setupfile</a>.
-    </p>
-  </body>
-</html>

Modified: trunk/doc/en/html/menu/setup-terminal.html
===================================================================
--- trunk/doc/en/html/menu/setup-terminal.html	2017-06-05 12:13:46 UTC (rev 6775)
+++ trunk/doc/en/html/menu/setup-terminal.html	2017-06-05 14:07:25 UTC (rev 6776)
@@ -17,10 +17,10 @@
     </p>
 
     <ul>
-      <li><a href="setup-terminaljp.html">Japanese mode</a></li>
-      <li><a href="setup-terminalr.html">Russian mode</a></li>
-      <li><a href="setup-terminalk.html">Korean mode</a></li>
-      <li><a href="setup-terminalutf8.html">UTF-8 mode</a></li>
+      <li><a href="setup-terminal_ja.html">Japanese mode</a></li>
+      <li><a href="setup-terminal_ko.html">Korean mode</a></li>
+      <li><a href="setup-terminal_ru.html">Russian mode</a></li>
+      <li><a href="setup-terminal_utf8.html">UTF-8 mode</a></li>
     </ul>
 
     <h2>"Terminal setup" dialog box</h2>

Copied: trunk/doc/en/html/menu/setup-terminal_ja.html (from rev 6775, trunk/doc/en/html/menu/setup-terminaljp.html)
===================================================================
--- trunk/doc/en/html/menu/setup-terminal_ja.html	                        (rev 0)
+++ trunk/doc/en/html/menu/setup-terminal_ja.html	2017-06-05 14:07:25 UTC (rev 6776)
@@ -0,0 +1,169 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+  "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <title>Terminal ([Setup] menu; Japanese mode)</title>
+    <META http-equiv="Content-Style-Type" content="text/css">
+    <link rel="stylesheet" href="../style.css" type="text/css">
+  </head>
+
+  <body>
+    <h1>Terminal ([Setup] menu; Japanese mode)</h1>
+
+    <p>
+      This page is described when the <a href="setup-general.html#Language">Language</a> is selected to Japanese on the <a href="setup-general.html">Setup - General</a> dialog.
+      Please refer to below page if another language mode is used.
+    </p>
+
+    <ul>
+      <li><a href="setup-terminal.html">English mode</a></li>
+      <li><a href="setup-terminal_ko.html">Korean mode</a></li>
+      <li><a href="setup-terminal_ru.html">Russian mode</a></li>
+      <li><a href="setup-terminal_utf8.html">UTF-8 mode</a></li>
+    </ul>
+
+    <h2>"Terminal setup" dialog box</h2>
+    <dl>
+      <dt id="TerminalSize">Terminal size</dt>
+      <dd>
+	The logical size of the terminal (numbers of columns and lines).
+	Note that the window size (real screen size) is not necessarily
+	equal to the terminal size.
+      </dd>
+
+      <dt id="TermIsWin">Term size = win size</dt>
+      <dd>
+	Forces the terminal size to be always equal to the window size.
+      </dd>
+
+      <dt id="AutoWinResize">Auto window resize</dt>
+      <dd>
+	When the terminal size is changed, resizes the window to the
+	terminal size.
+      </dd>
+
+      <dt id="CRReceive">New-line (receive)</dt>
+      <dd>
+        <dl>
+          <dt>CR</dt>
+          <dd>Tera Term doesn't convert it.</dd>
+
+          <dt>CR+LF</dt>
+          <dd>Received CR ($0D) character is converted to CR+LF ($0D $0A) pairs.<br>
+              e.g.) If "CR LF" is received, it is converted to "CR LF LF."</dd>
+
+          <dt>LF</dt>
+          <dd>Received LF ($0A) character is converted to CR+LF ($0D $0A) pairs.<br>
+              e.g.) If "CR LF" is received, it is converted to "CR CR LF."</dd>
+
+          <dt>AUTO</dt>
+          <dd>Received CR ($0D) or LF ($0A) character is converted to CR+LF ($0D $0A) pairs.<br>
+              e.g.) If "CR+LF" are received, it is not converted.<br>
+                    If "CR" is received, it is converted to "CR LF."<br>
+                    If "LF" is received, it is converted to "CR LF."</dd>
+        </dl>
+      </dd>
+
+      <dt id="CRSend">New-line (transmit)</dt>
+      <dd>
+        <dl>
+          <dt>CR</dt>
+          <dd>Tera Term doesn't convert it.</dd>
+
+          <dt>CR+LF</dt>
+          <dd>CR ($0D) character to be sent is converted to CR+LF ($0D $0A) pairs before it is actually sent.</dd>
+
+          <dt>LF</dt>
+          <dd>CR ($0D) character to be sent is converted to LF ($0A) before it is actually sent.</dd>
+        </dl>
+      </dd>
+
+      <dt id="TerminalID">Terminal ID</dt>
+      <dd>
+	Terminal ID to be reported to the host when the host requests it.
+	Note that the terminal ID is not identical to the telnet terminal
+	type. To change the telnet terminal type, use the
+	<a href="setup-tcpip.html">[Setup] TCP/IP</a> command.
+      </dd>
+
+      <dt id="LocalEcho">Local echo</dt>
+      <dd>
+	Enables local echoing of characters sent.
+      </dd>
+
+      <dt id="Answerback">Answerback</dt>
+      <dd>
+	The string to be answered back to the host, when the ENQ ($05)
+	character is received. Each non-printable character in the string
+	can be expressed as a "$" and ASCII code in two-character hex number.
+	For example, the string "ABC&lt;CR&gt;&lt;LF&gt;" is expressed as
+	the following:
+	<p class="indent1">
+	  ABC$0D$0A
+	</p>
+      </dd>
+
+      <dt id="AutoWinSwitch">Auto switch (VT&lt;-&gt;TEK)</dt>
+      <dd>
+	Enables auto switching between VT and TEK emulations.
+      </dd>
+
+      <dt id="KanjiReceive">Kanji (receive)</dt>
+      <dd>
+	Kanji character that is received from host(SJIS, EUC, JIS, UTF-8 and UTF-8m).
+      </dd>
+
+      <dt id="KatakanaReceive">7bit katakana (receive)</dt>
+      <dd>
+	When "HANKAKU" katakana code from host is described for 7bit
+	(Shift control with SO/SI is using), please select this entry.
+	This is only enabled when Kanji (receive) is JIS.
+      </dd>
+
+      <dt id="KanjiSend">Kanji (transmit)</dt>
+      <dd>
+	Kanji character that is sent from client(SJIS, EUC, JIS and UTF-8).
+      </dd>
+
+      <dt id="KatakanaSend">7bit katakana (transmit)</dt>
+      <dd>
+	When "HANKAKU" katakana code from host is described for 7bit
+	(Shift control with SO/SI is using), please select this entry.
+	This is only enabled when Kanji (transmit) is JIS.
+      </dd>
+
+      <dt id="KanjiIn">Kanji-in (transmit)</dt>
+      <dd>
+	The escape sequence is used when Kanji (transmit) is JIS.
+	(Sequence regarding Kanji character is specified to G0.
+	^[$@ or ^[$B).
+	The escape sequence from host can use any sequence.
+      </dd>
+
+      <dt id="KanjiOut">Kanji-out (transmit)</dt>
+      <dd>
+	The escape sequence is used when Kanji (transmit) is JIS.
+	(Sequence regarding ASCII and JIS Roman code is specified to G0.
+	^[(B or ^[(J ).
+	The escape sequence from host can use any sequence.
+	<p>
+	  NOTICE: ^[(H can not be selected on initial setting. <br>
+	  <!--a href="../usage/tips/incorrect-kanjiout.html">\x81\xA8 ^[(H \x82\xF0\x91I\x91\xF0\x89?\\x82?\xB7\x82\xE9\x81B</a-->
+	</p>
+      </dd>
+
+      <dt id="locale">locale</dt>
+      <dd>
+	Locale setting.
+	Refer to <a href="../usage/unicode.html">Unicode</a> for details.
+      </dd>
+
+      <dt id="CodePage">CodePage</dt>
+      <dd>
+	Codepage setting.
+	Refer to <a href="../usage/unicode.html">Unicode</a> for details.
+      </dd>
+    </dl>
+  </body>
+</html>

Copied: trunk/doc/en/html/menu/setup-terminal_ko.html (from rev 6775, trunk/doc/en/html/menu/setup-terminalk.html)
===================================================================
--- trunk/doc/en/html/menu/setup-terminal_ko.html	                        (rev 0)
+++ trunk/doc/en/html/menu/setup-terminal_ko.html	2017-06-05 14:07:25 UTC (rev 6776)
@@ -0,0 +1,135 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+  "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <title>Terminal ([Setup] menu; Korean mode)</title>
+    <META http-equiv="Content-Style-Type" content="text/css">
+    <link rel="stylesheet" href="../style.css" type="text/css">
+  </head>
+
+  <body>
+    <h1>Terminal ([Setup] menu; Korean mode)</h1>
+
+    <p>
+      This page is described when the <a href="setup-general.html#Language">Language</a> is selected to Korean on the <a href="setup-general.html">Setup - General</a> dialog.
+      Please refer to below page if another language mode is used.
+    </p>
+
+    <ul>
+      <li><a href="setup-terminal.html">English mode</a></li>
+      <li><a href="setup-terminal_ja.html">Japanese mode</a></li>
+      <li><a href="setup-terminal_ru.html">Russian mode</a></li>
+      <li><a href="setup-terminal_utf8.html">UTF-8 mode</a></li>
+    </ul>
+
+    <h2>"Terminal setup" dialog box</h2>
+    <dl>
+      <dt id="TerminalSize">Terminal size</dt>
+      <dd>
+	The logical size of the terminal (numbers of columns and lines).
+	Note that the window size (real screen size) is not necessarily
+	equal to the terminal size.
+      </dd>
+
+      <dt id="TermIsWin">Term size = win size</dt>
+      <dd>
+	Forces the terminal size to be always equal to the window size.
+      </dd>
+
+      <dt id="AutoWinResize">Auto window resize</dt>
+      <dd>
+	When the terminal size is changed, resizes the window to the
+	terminal size.
+      </dd>
+
+      <dt id="CRReceive">New-line (receive)</dt>
+      <dd>
+        <dl>
+          <dt>CR</dt>
+          <dd>Tera Term doesn't convert it.</dd>
+
+          <dt>CR+LF</dt>
+          <dd>Received CR ($0D) character is converted to CR+LF ($0D $0A) pairs.<br>
+              e.g.) If "CR LF" is received, it is converted to "CR LF LF."</dd>
+
+          <dt>LF</dt>
+          <dd>Received LF ($0A) character is converted to CR+LF ($0D $0A) pairs.<br>
+              e.g.) If "CR LF" is received, it is converted to "CR CR LF."</dd>
+
+          <dt>AUTO</dt>
+          <dd>Received CR ($0D) or LF ($0A) character is converted to CR+LF ($0D $0A) pairs.<br>
+              e.g.) If "CR+LF" are received, it is not converted.<br>
+                    If "CR" is received, it is converted to "CR LF."<br>
+                    If "LF" is received, it is converted to "CR LF."</dd>
+        </dl>
+      </dd>
+
+      <dt id="CRSend">New-line (transmit)</dt>
+      <dd>
+        <dl>
+          <dt>CR</dt>
+          <dd>Tera Term doesn't convert it.</dd>
+
+          <dt>CR+LF</dt>
+          <dd>CR ($0D) character to be sent is converted to CR+LF ($0D $0A) pairs before it is actually sent.</dd>
+
+          <dt>LF</dt>
+          <dd>CR ($0D) character to be sent is converted to LF ($0A) before it is actually sent.</dd>
+        </dl>
+      </dd>
+
+      <dt id="TerminalID">Terminal ID</dt>
+      <dd>
+	Terminal ID to be reported to the host when the host requests it.
+	Note that the terminal ID is not identical to the telnet terminal
+	type. To change the telnet terminal type, use the
+	<a href="setup-tcpip.html">[Setup] TCP/IP</a> command.
+      </dd>
+
+      <dt id="LocalEcho">Local echo</dt>
+      <dd>
+	Enables local echoing of characters sent.
+      </dd>
+
+      <dt id="Answerback">Answerback</dt>
+      <dd>
+	The string to be answered back to the host, when the ENQ ($05)
+	character is received. Each non-printable character in the string
+	can be expressed as a "$" and ASCII code in two-character hex number.
+	For example, the string "ABC&lt;CR&gt;&lt;LF&gt;" is expressed as
+	the following:
+	<p class="indent1">
+	  ABC$0D$0A
+	</p>
+      </dd>
+
+      <dt id="AutoWinSwitch">Auto switch (VT&lt;-&gt;TEK)</dt>
+      <dd>
+	Enables auto switching between VT and TEK emulations.
+      </dd>
+
+      <dt id="KanjiReceive">Coding (receive)</dt>
+      <dd>
+	Character code that is received from host(KS5601, UTF-8 and UTF-8m).
+      </dd>
+
+      <dt id="KanjiSend">Coding (transmit)</dt>
+      <dd>
+	Character code that is sent from client(KS5601 and UTF-8).
+      </dd>
+
+      <dt id="locale">locale</dt>
+      <dd>
+	Locale setting.
+	Refer to <a href="../usage/unicode.html">Unicode</a> for details.
+      </dd>
+
+      <dt id="CodePage">CodePage</dt>
+      <dd>
+	Codepage setting.
+	Refer to <a href="../usage/unicode.html">Unicode</a> for details.
+      </dd>
+    </dl>
+  </body>
+</html>

Copied: trunk/doc/en/html/menu/setup-terminal_ru.html (from rev 6775, trunk/doc/en/html/menu/setup-terminalr.html)
===================================================================
--- trunk/doc/en/html/menu/setup-terminal_ru.html	                        (rev 0)
+++ trunk/doc/en/html/menu/setup-terminal_ru.html	2017-06-05 14:07:25 UTC (rev 6776)
@@ -0,0 +1,135 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+  "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <title>Terminal ([Setup] menu; Russian mode)</title>
+    <META http-equiv="Content-Style-Type" content="text/css">
+    <link rel="stylesheet" href="../style.css" type="text/css">
+  </head>
+
+  <body>
+    <h1>Terminal ([Setup] menu; Russian mode)</h1>
+
+    <p>
+      This page is described when the <a href="setup-general.html#Language">Language</a> is selected to Russian on the <a href="setup-general.html">Setup - General</a> dialog.
+      Please refer to below page if another language mode is used.
+    </p>
+
+    <ul>
+      <li><a href="setup-terminal.html">English mode</a></li>
+      <li><a href="setup-terminal_ja.html">Japanese mode</a></li>
+      <li><a href="setup-terminal_ko.html">Korean mode</a></li>
+      <li><a href="setup-terminal_utf8.html">UTF-8 mode</a></li>
+    </ul>
+
+
+    <h2>"Terminal setup" dialog box</h2>
+    <dl>
+      <dt id="TerminalSize">Terminal size</dt>
+      <dd>
+	The logical size of the terminal (numbers of columns and lines).
+	Note that the window size (real screen size) is not necessarily
+	equal to the terminal size.
+      </dd>
+
+      <dt id="TermIsWin">Term size = win size</dt>
+      <dd>
+	Forces the terminal size to be always equal to the window size.
+      </dd>
+
+      <dt id="AutoWinResize">Auto window resize</dt>
+      <dd>
+	When the terminal size is changed, resizes the window to the
+	terminal size.
+      </dd>
+
+      <dt id="CRReceive">New-line (receive)</dt>
+      <dd>
+        <dl>
+          <dt>CR</dt>
+          <dd>Tera Term doesn't convert it.</dd>
+
+          <dt>CR+LF</dt>
+          <dd>Received CR ($0D) characters are converted to CR+LF ($0D $0A) pairs.<br>
+              e.g.) If "CR LF" is received, it is converted to "CR LF LF."</dd>
+
+          <dt>LF</dt>
+          <dd>Received LF ($0A) characters are converted to CR+LF ($0D $0A) pairs.<br>
+              e.g.) If "CR LF" is received, it is converted to "CR CR LF."</dd>
+
+          <dt>AUTO</dt>
+          <dd>Received CR ($0D) or LF ($0A) character is converted to CR+LF ($0D $0A) pairs.<br>
+              e.g.) If "CR+LF" are received, it is not converted.<br>
+                    If "CR" is received, it is converted to "CR LF."<br>
+                    If "LF" is received, it is converted to "CR LF."</dd>
+        </dl>
+      </dd>
+
+      <dt id="CRSend">New-line (transmit)</dt>
+      <dd>
+        <dl>
+          <dt>CR</dt>
+          <dd>Tera Term doesn't convert it.</dd>
+
+          <dt>CR+LF</dt>
+          <dd>CR ($0D) characters to be sent are converted to CR+LF ($0D $0A) pairs before they are actually sent.</dd>
+        </dl>
+      </dd>
+
+      <dt id="TerminalID">Terminal ID</dt>
+      <dd>
+	Terminal ID to be reported to the host when the host requests it.
+	Note that the terminal ID is not identical to the telnet terminal
+	type. To change the telnet terminal type, use the
+	<a href="setup-tcpip.html">[Setup] TCP/IP</a> command.
+      </dd>
+
+      <dt id="LocalEcho">Local echo</dt>
+      <dd>
+	Enables local echoing of characters sent.
+      </dd>
+
+      <dt id="Answerback">Answerback</dt>
+      <dd>
+	The string to be answered back to the host, when the ENQ ($05)
+	character is received. Each non-printable character in the string
+	can be expressed as a "$" and ASCII code in two-character hex number.
+	For example, the string "ABC&lt;CR&gt;&lt;LF&gt;" is expressed as
+	the following:
+	<p class="indent1">
+	  ABC$0D$0A
+	</p>
+      </dd>
+
+      <dt id="AutoWinSwitch">Auto switch (VT&lt;-&gt;TEK)</dt>
+      <dd>
+	Enables auto switching between VT and TEK emulations.
+      </dd>
+
+      <dt id="RussCharSet">Character set</dt>
+      <dd>
+	<dl>
+	  <dt id="RussHost">Host</dt>
+	  <dd>
+	    Russian character set used in the host computer.
+	    Windows (CP 1251), KOI8-R, CP 866 or ISO 8859-5.
+	  </dd>
+
+	  <dt id="RussClient">Client</dt>
+	  <dd>
+	    Russian character set used in your PC. Windows (CP 1251),
+	    KOI8-R, CP 866 or ISO 8859-5. If you are using Russian version
+	    of Windows, you should select Windows.
+	  </dd>
+
+      <dt id="RussFont">Font</dt>
+      <dd>
+	Character code set of the specified font, Windows (CP 1251),
+	KOI8-R, CP 866 or ISO 8859-5.
+      </dd>
+	</dl>
+      </dd>
+    </dl>
+  </body>
+</html>

Copied: trunk/doc/en/html/menu/setup-terminal_utf8.html (from rev 6775, trunk/doc/en/html/menu/setup-terminalutf8.html)
===================================================================
--- trunk/doc/en/html/menu/setup-terminal_utf8.html	                        (rev 0)
+++ trunk/doc/en/html/menu/setup-terminal_utf8.html	2017-06-05 14:07:25 UTC (rev 6776)
@@ -0,0 +1,135 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+  "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <title>Terminal ([Setup] menu; UTF-8 mode)</title> 
+    <META http-equiv="Content-Style-Type" content="text/css">
+    <link rel="stylesheet" href="../style.css" type="text/css">
+  </head>
+
+  <body>
+    <h1>Terminal ([Setup] menu; UTF-8 mode)</h1>
+
+    <p>
+      This page is described when the <a href="setup-general.html#Language">Language</a> is selected to UTF-8 on the <a href="setup-general.html">Setup - General</a> dialog.
+      Please refer to below page if another language mode is used.
+    </p>
+
+    <ul>
+      <li><a href="setup-terminal.html">English mode</a></li>
+      <li><a href="setup-terminal_ja.html">Japanese mode</a></li>
+      <li><a href="setup-terminal_ko.html">Korean mode</a></li>
+      <li><a href="setup-terminal_ru.html">Russian mode</a></li>
+    </ul>
+
+    <h2>"Terminal setup" dialog box</h2>
+    <dl>
+      <dt id="TerminalSize">Terminal size</dt>
+      <dd>
+	The logical size of the terminal (numbers of columns and lines).
+	Note that the window size (real screen size) is not necessarily
+	equal to the terminal size.
+      </dd>
+
+      <dt id="TermIsWin">Term size = win size</dt>
+      <dd>
+	Forces the terminal size to be always equal to the window size.
+      </dd>
+
+      <dt id="AutoWinResize">Auto window resize</dt>
+      <dd>
+	When the terminal size is changed, resizes the window to the
+	terminal size.
+      </dd>
+
+      <dt id="CRReceive">New-line (receive)</dt>
+      <dd>
+        <dl>
+          <dt>CR</dt>
+          <dd>Tera Term doesn't convert it.</dd>
+
+          <dt>CR+LF</dt>
+          <dd>Received CR ($0D) character is converted to CR+LF ($0D $0A) pairs.<br>
+              e.g.) If "CR LF" is received, it is converted to "CR LF LF."</dd>
+
+          <dt>LF</dt>
+          <dd>Received LF ($0A) character is converted to CR+LF ($0D $0A) pairs.<br>
+              e.g.) If "CR LF" is received, it is converted to "CR CR LF."</dd>
+
+          <dt>AUTO</dt>
+          <dd>Received CR ($0D) or LF ($0A) character is converted to CR+LF ($0D $0A) pairs.<br>
+              e.g.) If "CR+LF" are received, it is not converted.<br>
+                    If "CR" is received, it is converted to "CR LF."<br>
+                    If "LF" is received, it is converted to "CR LF."</dd>
+        </dl>
+      </dd>
+
+      <dt id="CRSend">New-line (transmit)</dt>
+      <dd>
+        <dl>
+          <dt>CR</dt>
+          <dd>Tera Term doesn't convert it.</dd>
+
+          <dt>CR+LF</dt>
+          <dd>CR ($0D) character to be sent is converted to CR+LF ($0D $0A) pairs before it is actually sent.</dd>
+
+          <dt>LF</dt>
+          <dd>CR ($0D) character to be sent is converted to LF ($0A) before it is actually sent.</dd>
+        </dl>
+      </dd>
+
+      <dt id="TerminalID">Terminal ID</dt>
+      <dd>
+	Terminal ID to be reported to the host when the host requests it.
+	Note that the terminal ID is not identical to the telnet terminal
+	type. To change the telnet terminal type, use the
+	<a href="setup-tcpip.html">[Setup] TCP/IP</a> command.
+      </dd>
+
+      <dt id="LocalEcho">Local echo</dt>
+      <dd>
+	Enables local echoing of characters sent.
+      </dd>
+
+      <dt id="Answerback">Answerback</dt>
+      <dd>
+	The string to be answered back to the host, when the ENQ ($05)
+	character is received. Each non-printable character in the string
+	can be expressed as a "$" and ASCII code in two-character hex number.
+	For example, the string "ABC&lt;CR&gt;&lt;LF&gt;" is expressed as
+	the following:
+	<p class="indent1">
+	  ABC$0D$0A
+	</p>
+      </dd>
+
+      <dt id="AutoWinSwitch">Auto switch (VT&lt;-&gt;TEK)</dt>
+      <dd>
+	Enables auto switching between VT and TEK emulations.
+      </dd>
+
+      <dt id="KanjiReceive">Coding (receive)</dt>
+      <dd>
+	Character code that is received from host(UTF-8 and UTF-8m).
+      </dd>
+
+      <dt id="KanjiSend">Coding (transmit)</dt>
+      <dd>
+	Character code that is sent from client(UTF-8).
+      </dd>
+
+      <dt id="locale">locale</dt>
+      <dd>
+	Locale setting.
+	Refer to <a href="../usage/unicode.html">Unicode</a> for details.
+      </dd>
+
+      <dt id="CodePage">CodePage</dt>
+      <dd>
+	Codepage setting.
+	Refer to <a href="../usage/unicode.html">Unicode</a> for details.
+      </dd>
+    </dl>
+  </body>
+</html>

Deleted: trunk/doc/en/html/menu/setup-terminaljp.html
===================================================================
--- trunk/doc/en/html/menu/setup-terminaljp.html	2017-06-05 12:13:46 UTC (rev 6775)
+++ trunk/doc/en/html/menu/setup-terminaljp.html	2017-06-05 14:07:25 UTC (rev 6776)
@@ -1,169 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <title>Terminal ([Setup] menu; Japanese mode)</title>
-    <META http-equiv="Content-Style-Type" content="text/css">
-    <link rel="stylesheet" href="../style.css" type="text/css">
-  </head>
-
-  <body>
-    <h1>Terminal ([Setup] menu; Japanese mode)</h1>
-
-    <p>
-      This page is described when the <a href="setup-general.html#Language">Language</a> is selected to Japanese on the <a href="setup-general.html">Setup - General</a> dialog.
-      Please refer to below page if another language mode is used.
-    </p>
-
-    <ul>
-      <li><a href="setup-terminal.html">English mode</a></li>
-      <li><a href="setup-terminalr.html">Russian mode</a></li>
-      <li><a href="setup-terminalk.html">Korean mode</a></li>
-      <li><a href="setup-terminalutf8.html">UTF-8 mode</a></li>
-    </ul>
-
-    <h2>"Terminal setup" dialog box</h2>
-    <dl>
-      <dt id="TerminalSize">Terminal size</dt>
-      <dd>
-	The logical size of the terminal (numbers of columns and lines).
-	Note that the window size (real screen size) is not necessarily
-	equal to the terminal size.
-      </dd>
-
-      <dt id="TermIsWin">Term size = win size</dt>
-      <dd>
-	Forces the terminal size to be always equal to the window size.
-      </dd>
-
-      <dt id="AutoWinResize">Auto window resize</dt>
-      <dd>
-	When the terminal size is changed, resizes the window to the
-	terminal size.
-      </dd>
-
-      <dt id="CRReceive">New-line (receive)</dt>
-      <dd>
-        <dl>
-          <dt>CR</dt>
-          <dd>Tera Term doesn't convert it.</dd>
-
-          <dt>CR+LF</dt>
-          <dd>Received CR ($0D) character is converted to CR+LF ($0D $0A) pairs.<br>
-              e.g.) If "CR LF" is received, it is converted to "CR LF LF."</dd>
-
-          <dt>LF</dt>
-          <dd>Received LF ($0A) character is converted to CR+LF ($0D $0A) pairs.<br>
-              e.g.) If "CR LF" is received, it is converted to "CR CR LF."</dd>
-
-          <dt>AUTO</dt>
-          <dd>Received CR ($0D) or LF ($0A) character is converted to CR+LF ($0D $0A) pairs.<br>
-              e.g.) If "CR+LF" are received, it is not converted.<br>
-                    If "CR" is received, it is converted to "CR LF."<br>
-                    If "LF" is received, it is converted to "CR LF."</dd>
-        </dl>
-      </dd>
-
-      <dt id="CRSend">New-line (transmit)</dt>
-      <dd>
-        <dl>
-          <dt>CR</dt>
-          <dd>Tera Term doesn't convert it.</dd>
-
-          <dt>CR+LF</dt>
-          <dd>CR ($0D) character to be sent is converted to CR+LF ($0D $0A) pairs before it is actually sent.</dd>
-
-          <dt>LF</dt>
-          <dd>CR ($0D) character to be sent is converted to LF ($0A) before it is actually sent.</dd>
-        </dl>
-      </dd>
-
-      <dt id="TerminalID">Terminal ID</dt>
-      <dd>
-	Terminal ID to be reported to the host when the host requests it.
-	Note that the terminal ID is not identical to the telnet terminal
-	type. To change the telnet terminal type, use the
-	<a href="setup-tcpip.html">[Setup] TCP/IP</a> command.
-      </dd>
-
-      <dt id="LocalEcho">Local echo</dt>
-      <dd>
-	Enables local echoing of characters sent.
-      </dd>
-
-      <dt id="Answerback">Answerback</dt>
-      <dd>
-	The string to be answered back to the host, when the ENQ ($05)
-	character is received. Each non-printable character in the string
-	can be expressed as a "$" and ASCII code in two-character hex number.
-	For example, the string "ABC&lt;CR&gt;&lt;LF&gt;" is expressed as
-	the following:
-	<p class="indent1">
-	  ABC$0D$0A
-	</p>
-      </dd>
-
-      <dt id="AutoWinSwitch">Auto switch (VT&lt;-&gt;TEK)</dt>
-      <dd>
-	Enables auto switching between VT and TEK emulations.
-      </dd>
-
-      <dt id="KanjiReceive">Kanji (receive)</dt>
-      <dd>
-	Kanji character that is received from host(SJIS, EUC, JIS, UTF-8 and UTF-8m).
-      </dd>
-
-      <dt id="KatakanaReceive">7bit katakana (receive)</dt>
-      <dd>
-	When "HANKAKU" katakana code from host is described for 7bit
-	(Shift control with SO/SI is using), please select this entry.
-	This is only enabled when Kanji (receive) is JIS.
-      </dd>
-
-      <dt id="KanjiSend">Kanji (transmit)</dt>
-      <dd>
-	Kanji character that is sent from client(SJIS, EUC, JIS and UTF-8).
-      </dd>
-
-      <dt id="KatakanaSend">7bit katakana (transmit)</dt>
-      <dd>
-	When "HANKAKU" katakana code from host is described for 7bit
-	(Shift control with SO/SI is using), please select this entry.
-	This is only enabled when Kanji (transmit) is JIS.
-      </dd>
-
-      <dt id="KanjiIn">Kanji-in (transmit)</dt>
-      <dd>
-	The escape sequence is used when Kanji (transmit) is JIS.
-	(Sequence regarding Kanji character is specified to G0.
-	^[$@ or ^[$B).
-	The escape sequence from host can use any sequence.
-      </dd>
-
-      <dt id="KanjiOut">Kanji-out (transmit)</dt>
-      <dd>
-	The escape sequence is used when Kanji (transmit) is JIS.
-	(Sequence regarding ASCII and JIS Roman code is specified to G0.
-	^[(B or ^[(J ).
-	The escape sequence from host can use any sequence.
-	<p>
-	  NOTICE: ^[(H can not be selected on initial setting. <br>
-	  <!--a href="../usage/tips/incorrect-kanjiout.html">\x81\xA8 ^[(H \x82\xF0\x91I\x91\xF0\x89?\\x82?\xB7\x82\xE9\x81B</a-->
-	</p>
-      </dd>
-
-      <dt id="locale">locale</dt>
-      <dd>
-	Locale setting.
-	Refer to <a href="../usage/unicode.html">Unicode</a> for details.
-      </dd>
-
-      <dt id="CodePage">CodePage</dt>
-      <dd>
-	Codepage setting.
-	Refer to <a href="../usage/unicode.html">Unicode</a> for details.
-      </dd>
-    </dl>
-  </body>
-</html>

Deleted: trunk/doc/en/html/menu/setup-terminalk.html
===================================================================
--- trunk/doc/en/html/menu/setup-terminalk.html	2017-06-05 12:13:46 UTC (rev 6775)
+++ trunk/doc/en/html/menu/setup-terminalk.html	2017-06-05 14:07:25 UTC (rev 6776)
@@ -1,135 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <title>Terminal ([Setup] menu; Korean mode)</title>
-    <META http-equiv="Content-Style-Type" content="text/css">
-    <link rel="stylesheet" href="../style.css" type="text/css">
-  </head>
-
-  <body>
-    <h1>Terminal ([Setup] menu; Korean mode)</h1>
-
-    <p>
-      This page is described when the <a href="setup-general.html#Language">Language</a> is selected to Korean on the <a href="setup-general.html">Setup - General</a> dialog.
-      Please refer to below page if another language mode is used.
-    </p>
-
-    <ul>
-      <li><a href="setup-terminaljp.html">Japanese mode</a></li>
-      <li><a href="setup-terminalr.html">Russian mode</a></li>
-      <li><a href="setup-terminal.html">English mode</a></li>
-      <li><a href="setup-terminalutf8.html">UTF-8 mode</a></li>
-    </ul>
-
-    <h2>"Terminal setup" dialog box</h2>
-    <dl>
-      <dt id="TerminalSize">Terminal size</dt>
-      <dd>
-	The logical size of the terminal (numbers of columns and lines).
-	Note that the window size (real screen size) is not necessarily
-	equal to the terminal size.
-      </dd>
-
-      <dt id="TermIsWin">Term size = win size</dt>
-      <dd>
-	Forces the terminal size to be always equal to the window size.
-      </dd>
-
-      <dt id="AutoWinResize">Auto window resize</dt>
-      <dd>
-	When the terminal size is changed, resizes the window to the
-	terminal size.
-      </dd>
-
-      <dt id="CRReceive">New-line (receive)</dt>
-      <dd>
-        <dl>
-          <dt>CR</dt>
-          <dd>Tera Term doesn't convert it.</dd>
-
-          <dt>CR+LF</dt>
-          <dd>Received CR ($0D) character is converted to CR+LF ($0D $0A) pairs.<br>
-              e.g.) If "CR LF" is received, it is converted to "CR LF LF."</dd>
-
-          <dt>LF</dt>
-          <dd>Received LF ($0A) character is converted to CR+LF ($0D $0A) pairs.<br>
-              e.g.) If "CR LF" is received, it is converted to "CR CR LF."</dd>
-
-          <dt>AUTO</dt>
-          <dd>Received CR ($0D) or LF ($0A) character is converted to CR+LF ($0D $0A) pairs.<br>
-              e.g.) If "CR+LF" are received, it is not converted.<br>
-                    If "CR" is received, it is converted to "CR LF."<br>
-                    If "LF" is received, it is converted to "CR LF."</dd>
-        </dl>
-      </dd>
-
-      <dt id="CRSend">New-line (transmit)</dt>
-      <dd>
-        <dl>
-          <dt>CR</dt>
-          <dd>Tera Term doesn't convert it.</dd>
-
-          <dt>CR+LF</dt>
-          <dd>CR ($0D) character to be sent is converted to CR+LF ($0D $0A) pairs before it is actually sent.</dd>
-
-          <dt>LF</dt>
-          <dd>CR ($0D) character to be sent is converted to LF ($0A) before it is actually sent.</dd>
-        </dl>
-      </dd>
-
-      <dt id="TerminalID">Terminal ID</dt>
-      <dd>
-	Terminal ID to be reported to the host when the host requests it.
-	Note that the terminal ID is not identical to the telnet terminal
-	type. To change the telnet terminal type, use the
-	<a href="setup-tcpip.html">[Setup] TCP/IP</a> command.
-      </dd>
-
-      <dt id="LocalEcho">Local echo</dt>
-      <dd>
-	Enables local echoing of characters sent.
-      </dd>
-
-      <dt id="Answerback">Answerback</dt>
-      <dd>
-	The string to be answered back to the host, when the ENQ ($05)
-	character is received. Each non-printable character in the string
-	can be expressed as a "$" and ASCII code in two-character hex number.
-	For example, the string "ABC&lt;CR&gt;&lt;LF&gt;" is expressed as
-	the following:
-	<p class="indent1">
-	  ABC$0D$0A
-	</p>
-      </dd>
-
-      <dt id="AutoWinSwitch">Auto switch (VT&lt;-&gt;TEK)</dt>
-      <dd>
-	Enables auto switching between VT and TEK emulations.
-      </dd>
-
-      <dt id="KanjiReceive">Coding (receive)</dt>
-      <dd>
-	Character code that is received from host(KS5601, UTF-8 and UTF-8m).
-      </dd>
-
-      <dt id="KanjiSend">Coding (transmit)</dt>
-      <dd>
-	Character code that is sent from client(KS5601 and UTF-8).
-      </dd>
-
-      <dt id="locale">locale</dt>
-      <dd>
-	Locale setting.
-	Refer to <a href="../usage/unicode.html">Unicode</a> for details.
-      </dd>
-
-      <dt id="CodePage">CodePage</dt>
-      <dd>
-	Codepage setting.
-	Refer to <a href="../usage/unicode.html">Unicode</a> for details.
-      </dd>
-    </dl>
-  </body>
-</html>

Deleted: trunk/doc/en/html/menu/setup-terminalr.html
===================================================================
--- trunk/doc/en/html/menu/setup-terminalr.html	2017-06-05 12:13:46 UTC (rev 6775)
+++ trunk/doc/en/html/menu/setup-terminalr.html	2017-06-05 14:07:25 UTC (rev 6776)
@@ -1,135 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <title>Terminal ([Setup] menu; Russian mode)</title>
-    <META http-equiv="Content-Style-Type" content="text/css">
-    <link rel="stylesheet" href="../style.css" type="text/css">
-  </head>
-
-  <body>
-    <h1>Terminal ([Setup] menu; Russian mode)</h1>
-
-    <p>
-      This page is described when the <a href="setup-general.html#Language">Language</a> is selected to Russian on the <a href="setup-general.html">Setup - General</a> dialog.
-      Please refer to below page if another language mode is used.
-    </p>
-
-    <ul>
-      <li><a href="setup-terminaljp.html">Japanese mode</a></li>
-      <li><a href="setup-terminal.html">English mode</a></li>
-      <li><a href="setup-terminalk.html">Korean mode</a></li>
-      <li><a href="setup-terminalutf8.html">UTF-8 mode</a></li>
-    </ul>
-
-
-    <h2>"Terminal setup" dialog box</h2>
-    <dl>
-      <dt id="TerminalSize">Terminal size</dt>
-      <dd>
-	The logical size of the terminal (numbers of columns and lines).
-	Note that the window size (real screen size) is not necessarily
-	equal to the terminal size.
-      </dd>
-
-      <dt id="TermIsWin">Term size = win size</dt>
-      <dd>
-	Forces the terminal size to be always equal to the window size.
-      </dd>
-
-      <dt id="AutoWinResize">Auto window resize</dt>
-      <dd>
-	When the terminal size is changed, resizes the window to the
-	terminal size.
-      </dd>
-
-      <dt id="CRReceive">New-line (receive)</dt>
-      <dd>
-        <dl>
-          <dt>CR</dt>
-          <dd>Tera Term doesn't convert it.</dd>
-
-          <dt>CR+LF</dt>
-          <dd>Received CR ($0D) characters are converted to CR+LF ($0D $0A) pairs.<br>
-              e.g.) If "CR LF" is received, it is converted to "CR LF LF."</dd>
-
-          <dt>LF</dt>
-          <dd>Received LF ($0A) characters are converted to CR+LF ($0D $0A) pairs.<br>
-              e.g.) If "CR LF" is received, it is converted to "CR CR LF."</dd>
-
-          <dt>AUTO</dt>
-          <dd>Received CR ($0D) or LF ($0A) character is converted to CR+LF ($0D $0A) pairs.<br>
-              e.g.) If "CR+LF" are received, it is not converted.<br>
-                    If "CR" is received, it is converted to "CR LF."<br>
-                    If "LF" is received, it is converted to "CR LF."</dd>
-        </dl>
-      </dd>
-
-      <dt id="CRSend">New-line (transmit)</dt>
-      <dd>
-        <dl>
-          <dt>CR</dt>
-          <dd>Tera Term doesn't convert it.</dd>
-
-          <dt>CR+LF</dt>
-          <dd>CR ($0D) characters to be sent are converted to CR+LF ($0D $0A) pairs before they are actually sent.</dd>
-        </dl>
-      </dd>
-
-      <dt id="TerminalID">Terminal ID</dt>
-      <dd>
-	Terminal ID to be reported to the host when the host requests it.
-	Note that the terminal ID is not identical to the telnet terminal
-	type. To change the telnet terminal type, use the
-	<a href="setup-tcpip.html">[Setup] TCP/IP</a> command.
-      </dd>
-
-      <dt id="LocalEcho">Local echo</dt>
-      <dd>
-	Enables local echoing of characters sent.
-      </dd>
-
-      <dt id="Answerback">Answerback</dt>
-      <dd>
-	The string to be answered back to the host, when the ENQ ($05)
-	character is received. Each non-printable character in the string
-	can be expressed as a "$" and ASCII code in two-character hex number.
-	For example, the string "ABC&lt;CR&gt;&lt;LF&gt;" is expressed as
-	the following:
-	<p class="indent1">
-	  ABC$0D$0A
-	</p>
-      </dd>
-
-      <dt id="AutoWinSwitch">Auto switch (VT&lt;-&gt;TEK)</dt>
-      <dd>
-	Enables auto switching between VT and TEK emulations.
-      </dd>
-
-      <dt id="RussCharSet">Character set</dt>
-      <dd>
-	<dl>
-	  <dt id="RussHost">Host</dt>
-	  <dd>
-	    Russian character set used in the host computer.
-	    Windows (CP 1251), KOI8-R, CP 866 or ISO 8859-5.
-	  </dd>
-
-	  <dt id="RussClient">Client</dt>
-	  <dd>
-	    Russian character set used in your PC. Windows (CP 1251),
-	    KOI8-R, CP 866 or ISO 8859-5. If you are using Russian version
-	    of Windows, you should select Windows.
-	  </dd>
-
-      <dt id="RussFont">Font</dt>
-      <dd>
-	Character code set of the specified font, Windows (CP 1251),
-	KOI8-R, CP 866 or ISO 8859-5.
-      </dd>
-	</dl>
-      </dd>
-    </dl>
-  </body>
-</html>

Deleted: trunk/doc/en/html/menu/setup-terminalutf8.html
===================================================================
--- trunk/doc/en/html/menu/setup-terminalutf8.html	2017-06-05 12:13:46 UTC (rev 6775)
+++ trunk/doc/en/html/menu/setup-terminalutf8.html	2017-06-05 14:07:25 UTC (rev 6776)
@@ -1,135 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <title>Terminal ([Setup] menu; UTF-8 mode)</title> 
-    <META http-equiv="Content-Style-Type" content="text/css">
-    <link rel="stylesheet" href="../style.css" type="text/css">
-  </head>
-
-  <body>
-    <h1>Terminal ([Setup] menu; UTF-8 mode)</h1>
-
-    <p>
-      This page is described when the <a href="setup-general.html#Language">Language</a> is selected to UTF-8 on the <a href="setup-general.html">Setup - General</a> dialog.
-      Please refer to below page if another language mode is used.
-    </p>
-
-    <ul>
-      <li><a href="setup-terminaljp.html">Japanese mode</a></li>
-      <li><a href="setup-terminalr.html">Russian mode</a></li>
-      <li><a href="setup-terminal.html">English mode</a></li>
-      <li><a href="setup-terminalk.html">Korean mode</a></li>
-    </ul>
-
-    <h2>"Terminal setup" dialog box</h2>
-    <dl>
-      <dt id="TerminalSize">Terminal size</dt>
-      <dd>
-	The logical size of the terminal (numbers of columns and lines).
-	Note that the window size (real screen size) is not necessarily
-	equal to the terminal size.
-      </dd>
-
-      <dt id="TermIsWin">Term size = win size</dt>
-      <dd>
-	Forces the terminal size to be always equal to the window size.
-      </dd>
-
-      <dt id="AutoWinResize">Auto window resize</dt>
-      <dd>
-	When the terminal size is changed, resizes the window to the
-	terminal size.
-      </dd>
-
-      <dt id="CRReceive">New-line (receive)</dt>
-      <dd>
-        <dl>
-          <dt>CR</dt>
-          <dd>Tera Term doesn't convert it.</dd>
-
-          <dt>CR+LF</dt>
-          <dd>Received CR ($0D) character is converted to CR+LF ($0D $0A) pairs.<br>
-              e.g.) If "CR LF" is received, it is converted to "CR LF LF."</dd>
-
-          <dt>LF</dt>
-          <dd>Received LF ($0A) character is converted to CR+LF ($0D $0A) pairs.<br>
-              e.g.) If "CR LF" is received, it is converted to "CR CR LF."</dd>
-
-          <dt>AUTO</dt>
-          <dd>Received CR ($0D) or LF ($0A) character is converted to CR+LF ($0D $0A) pairs.<br>
-              e.g.) If "CR+LF" are received, it is not converted.<br>
-                    If "CR" is received, it is converted to "CR LF."<br>
-                    If "LF" is received, it is converted to "CR LF."</dd>
-        </dl>
-      </dd>
-
-      <dt id="CRSend">New-line (transmit)</dt>
-      <dd>
-        <dl>
-          <dt>CR</dt>
-          <dd>Tera Term doesn't convert it.</dd>
-
-          <dt>CR+LF</dt>
-          <dd>CR ($0D) character to be sent is converted to CR+LF ($0D $0A) pairs before it is actually sent.</dd>
-
-          <dt>LF</dt>
-          <dd>CR ($0D) character to be sent is converted to LF ($0A) before it is actually sent.</dd>
-        </dl>
-      </dd>
-
-      <dt id="TerminalID">Terminal ID</dt>
-      <dd>
-	Terminal ID to be reported to the host when the host requests it.
-	Note that the terminal ID is not identical to the telnet terminal
-	type. To change the telnet terminal type, use the
-	<a href="setup-tcpip.html">[Setup] TCP/IP</a> command.
-      </dd>
-
-      <dt id="LocalEcho">Local echo</dt>
-      <dd>
-	Enables local echoing of characters sent.
-      </dd>
-
-      <dt id="Answerback">Answerback</dt>
-      <dd>
-	The string to be answered back to the host, when the ENQ ($05)
-	character is received. Each non-printable character in the string
-	can be expressed as a "$" and ASCII code in two-character hex number.
-	For example, the string "ABC&lt;CR&gt;&lt;LF&gt;" is expressed as
-	the following:
-	<p class="indent1">
-	  ABC$0D$0A
-	</p>
-      </dd>
-
-      <dt id="AutoWinSwitch">Auto switch (VT&lt;-&gt;TEK)</dt>
-      <dd>
-	Enables auto switching between VT and TEK emulations.
-      </dd>
-
-      <dt id="KanjiReceive">Coding (receive)</dt>
-      <dd>
-	Character code that is received from host(UTF-8 and UTF-8m).
-      </dd>
-
-      <dt id="KanjiSend">Coding (transmit)</dt>
-      <dd>
-	Character code that is sent from client(UTF-8).
-      </dd>
-
-      <dt id="locale">locale</dt>
-      <dd>
-	Locale setting.
-	Refer to <a href="../usage/unicode.html">Unicode</a> for details.
-      </dd>
-
-      <dt id="CodePage">CodePage</dt>
-      <dd>
-	Codepage setting.
-	Refer to <a href="../usage/unicode.html">Unicode</a> for details.
-      </dd>
-    </dl>
-  </body>
-</html>

Modified: trunk/doc/en/teraterm.hhp
===================================================================
--- trunk/doc/en/teraterm.hhp	2017-06-05 12:13:46 UTC (rev 6775)
+++ trunk/doc/en/teraterm.hhp	2017-06-05 14:07:25 UTC (rev 6776)
@@ -31,11 +31,11 @@
 HlpFileChangeDir=html\menu\file-chdir.html
 HlpFilePrint=html\menu\file-print.html
 HlpSetupTerminal=html\menu\setup-terminal.html
-HlpSetupTerminalRuss=html\menu\setup-terminalr.html
+HlpSetupTerminalRuss=html\menu\setup-terminal_ru.html
 HlpSetupWindow=html\menu\setup-window.html
 HlpSetupFont=html\menu\setup-font.html
 HlpSetupKeyboard=html\menu\setup-keyboard.html
-HlpSetupKeyboardRuss=html\menu\setup-keyboardr.html
+HlpSetupKeyboardRuss=html\menu\setup-keyboard_ru.html
 HlpSetupSerialPort=html\menu\setup-serialport.html
 HlpSetupTCPIP=html\menu\setup-tcpip.html
 HlpSetupGeneral=html\menu\setup-general.html

Modified: trunk/doc/ja/html/menu/setup-keyboard.html
===================================================================
--- trunk/doc/ja/html/menu/setup-keyboard.html	2017-06-05 12:13:46 UTC (rev 6775)
+++ trunk/doc/ja/html/menu/setup-keyboard.html	2017-06-05 14:07:25 UTC (rev 6776)
@@ -71,7 +71,7 @@
     </p>
 
     <p>
-      <a href="setup-keyboardr.html">\x83\x8D\x83V\x83A\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a>
+      <a href="setup-keyboard_ru.html">\x83\x8D\x83V\x83A\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a>
     </p>
   </body>
 </html>

Copied: trunk/doc/ja/html/menu/setup-keyboard_ru.html (from rev 6775, trunk/doc/ja/html/menu/setup-keyboardr.html)
===================================================================
--- trunk/doc/ja/html/menu/setup-keyboard_ru.html	                        (rev 0)
+++ trunk/doc/ja/html/menu/setup-keyboard_ru.html	2017-06-05 14:07:25 UTC (rev 6776)
@@ -0,0 +1,82 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+  "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
+    <title>Keyboard ([Setup] \x83\x81\x83j\x83\x85\x81[; \x83\x8D\x83V\x83A\x8C?\x81[\x83h)</title>
+    <META http-equiv="Content-Style-Type" content="text/css">
+    <link rel="stylesheet" href="../style.css" type="text/css">
+  </head>
+
+  <body>
+    <h1>Keyboard ([Setup] \x83\x81\x83j\x83\x85\x81[; \x83\x8D\x83V\x83A\x8C?\x81[\x83h)</h1>
+
+    <h2>"Keyboard setup" \x83_\x83C\x83A\x83\x8D\x83O\x83{\x83b\x83N\x83X</h2>
+    <dl>
+      <dt>Transmit DEL by:</dt>
+      <dd>
+	<dl>
+	  <dt>Backspace key</dt>
+	  <dd>
+	    \x82\xB1\x82?I\x83v\x83V\x83\x87\x83\x93\x82\xAA\x91I\x91\xF0\x82\xB3\x82\xEA\x82\xE9\x82\xC6 backspace \x83L\x81[\x82\xF0\x89\x9F\x82\xB5\x82\xBD\x8E\x9E\x82\xC9 DEL \x95\xB6\x8E\x9A
+	    (ASCII $7F) \x82\xAA\x91\x97\x8Fo\x82\xB3\x82\xEA\x82?\xB7\x81B
+	    \x91I\x91\xF0\x82\xB3\x82\xEA\x82?\xA2\x82\xC6 BS \x95\xB6\x8E\x9A (ASCII $08) \x82\xAA\x91\x97\x8Fo\x82\xB3\x82\xEA\x82?\xB7\x81B<br>
+	    \x82?\xBD\x81A\x82\xB1\x82?I\x83v\x83V\x83\x87\x83\x93\x82\xAA\x91I\x91\xF0\x82\xB3\x82?(\x91I\x91\xF0\x82\xB3\x82\xEA\x82?\xA2)\x8E\x9E\x82ł\xE0
+	    Ctrl+Backspace \x82\xC5 BS (DEL) \x95\xB6\x8E\x9A\x82?o\x82ł\xAB\x82?\xB7\x81B
+	  </dd>
+
+	  <dt>Delete key</dt>
+	  <dd>
+	    \x82\xB1\x82?I\x83v\x83V\x83\x87\x83\x93\x82\xAA\x91I\x91\xF0\x82\xB3\x82\xEA\x82\xE9\x82\xC6 Delete (Del) \x83L\x81[\x82\xF0\x89\x9F\x82\xB5\x82\xBD\x8E\x9E\x82\xC9
+	    DEL \x95\xB6\x8E\x9A\x82\xAA\x91\x97\x8Fo\x82\xB3\x82\xEA\x82?\xB7\x81B
+	    \x82\xB1\x82?I\x83v\x83V\x83\x87\x83\x93\x82\xAA\x91I\x91\xF0\x82\xB3\x82\xEA\x82?\xA2\x8F?\x81ADelete \x83L\x81[\x82?@\x94\\x82\xCD
+	    <a href="../setup/keyboard.html">\x83L\x81[\x83{\x81[\x83h\x90?\xE8\x83t\x83@\x83C\x83\x8B</a>
+	    \x82?\xE6\x82茈\x92?\x82\xEA\x82?\xB7\x81B
+	  </dd>
+	</dl>
+      </dd>
+
+      <dt id="RussKeyb">Keyboard</dt>
+      <dd>
+	\x83\x8D\x83V\x83A\x8C\xEA\x83L\x81[\x83{\x81[\x83h\x83^\x83C\x83v\x82\xF0\x8Ew\x92?\x82?\xB7\x81B\x82\xE0\x82\xB5\x83\x8D\x83V\x83A\x8C\xEA Windows
+	\x82ŃX\x83^\x83\x93\x83_\x81[\x83h\x83L\x81[\x83{\x81[\x83h\x83h\x83\x89\x83C\x83o\x82\xF0\x8Eg\x97p\x82\xB5\x82Ă\xA2\x82\xE9\x82?\xE7\x81AWindows
+	\x82\xF0\x91I\x91\xF0\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+	\x82\xE0\x82\xB5\x82\xA0\x82?\xBD\x82\xAA\x83\x8D\x83V\x83A\x8C\xEA\x82ł?\xA2 Windows \x82\xF0\x8Eg\x97p\x82\xB5\x82Ă\xA2\x82āAKOI8-R
+	\x83R\x81[\x83h\x82?\xAC\x82\xB7\x82\xE9\x83h\x83\x89\x83C\x83o\x82\xF0\x8Eg\x97p\x82\xB5\x82Ă\xA2\x82\xE9\x82?\xE7\x81AKOI8-R
+	\x82\xF0\x91I\x91\xF0\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+      </dd>
+
+      <dt>Meta key</dt>
+      <dd>
+	Alt \x83L\x81[\x82\xF0\x83\x81\x83^\x81E\x83L\x81[ (meta key) \x82?\xB5\x82Ďg\x82\xA2\x82?\xB7\x81B
+	\x97?\x82?AAlt+A \x82\xF0\x89\x9F\x82\xB7\x82?AESC A \x82?o\x82\xB5\x82?\xB7\x81B
+	\x83\x81\x83^\x81E\x83L\x81[\x83\x82\x81[\x83h\x82ł?A\x83V\x83\x87\x81[\x83g\x83J\x83b\x83g\x81E\x83L\x81[\x82??\x82\xF0\x8F\x9C\x82\xA2\x82Ďg\x97p\x82ł\xAB\x82?\xAD\x82?\xE8\x82?\xB7\x81B
+      </dd>
+
+      <dt>Disabled mode:</dt>
+      <dd>
+	<dl>
+	  <dt>Application Keypad</dt>
+	  <dd>
+	    \x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x83L\x81[\x83p\x83b\x83h\x83\x82\x81[\x83h\x82?\xF8\x82?\xB5\x82?\xB7\x81B<br>
+	    \x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x83L\x81[\x83p\x83b\x83h\x83\x82\x81[\x83h\x82?\xF8\x82?\xB7\x82\xE9\x82?A
+	    \x82??\xA9\x82?\x8F\x8Eq\x82ŃA\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x83L\x81[\x83p\x83b\x83h\x83\x82\x81[\x83h\x82??s\x82\xB5\x82Ă\xB5\x82?\xA2
+	    \x90\x94\x92l\x83L\x81[\x83p\x83b\x83h\x82\xAA\x8Eg\x82\xA6\x82?\xAD\x82?\xE9\x82?\xA2\x82\xA4\x83g\x83\x89\x83u\x83\x8B\x82\xF0\x96h\x82\xAE\x8E\x96\x82\xAA\x82ł\xAB\x82?\xB7\x81B
+	    \x82\xB5\x82\xA9\x82\xB5\x81A\x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x83L\x81[\x83p\x83b\x83h\x83\x82\x81[\x83h\x82\xF0\x8Eg\x97p\x82\xB5\x82Ă\xA2\x82\xE9
+	    \x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x82ł?s\x8B?\x82\xAA\x8BN\x82\xAB\x82?\x82\xE0\x82\xB5\x82\xEA\x82?\xB9\x82\xF1\x81B
+	  </dd>
+
+	  <dt>Application Cursor</dt>
+	  <dd>
+	    \x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x83J\x81[\x83\\x83\x8B\x83\x82\x81[\x83h\x82?\xF8\x82?\xB5\x82?\xB7\x81B
+	  </dd>
+	</dl>
+      </dd>
+    </dl>
+
+    <p>
+      <A HREF="../setup/keyboard.html">\x83L\x81[\x83{\x81[\x83h\x90?\xE8\x83t\x83@\x83C\x83\x8B</A>
+      \x82\xF0\x8F\x91\x82\xAB\x82\xA9\x82\xA6\x82邱\x82??\xA9\x97R\x82?L\x81[\x90?\xE8\x82\xF0\x95ύX\x82\xB7\x82邱\x82?\xAA\x82ł\xAB\x82?\xB7\x81B
+    </p>
+  </body>
+</html>

Deleted: trunk/doc/ja/html/menu/setup-keyboardr.html
===================================================================
--- trunk/doc/ja/html/menu/setup-keyboardr.html	2017-06-05 12:13:46 UTC (rev 6775)
+++ trunk/doc/ja/html/menu/setup-keyboardr.html	2017-06-05 14:07:25 UTC (rev 6776)
@@ -1,82 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
-    <title>Keyboard ([Setup] \x83\x81\x83j\x83\x85\x81[; \x83\x8D\x83V\x83A\x8C?\x81[\x83h)</title>
-    <META http-equiv="Content-Style-Type" content="text/css">
-    <link rel="stylesheet" href="../style.css" type="text/css">
-  </head>
-
-  <body>
-    <h1>Keyboard ([Setup] \x83\x81\x83j\x83\x85\x81[; \x83\x8D\x83V\x83A\x8C?\x81[\x83h)</h1>
-
-    <h2>"Keyboard setup" \x83_\x83C\x83A\x83\x8D\x83O\x83{\x83b\x83N\x83X</h2>
-    <dl>
-      <dt>Transmit DEL by:</dt>
-      <dd>
-	<dl>
-	  <dt>Backspace key</dt>
-	  <dd>
-	    \x82\xB1\x82?I\x83v\x83V\x83\x87\x83\x93\x82\xAA\x91I\x91\xF0\x82\xB3\x82\xEA\x82\xE9\x82\xC6 backspace \x83L\x81[\x82\xF0\x89\x9F\x82\xB5\x82\xBD\x8E\x9E\x82\xC9 DEL \x95\xB6\x8E\x9A
-	    (ASCII $7F) \x82\xAA\x91\x97\x8Fo\x82\xB3\x82\xEA\x82?\xB7\x81B
-	    \x91I\x91\xF0\x82\xB3\x82\xEA\x82?\xA2\x82\xC6 BS \x95\xB6\x8E\x9A (ASCII $08) \x82\xAA\x91\x97\x8Fo\x82\xB3\x82\xEA\x82?\xB7\x81B<br>
-	    \x82?\xBD\x81A\x82\xB1\x82?I\x83v\x83V\x83\x87\x83\x93\x82\xAA\x91I\x91\xF0\x82\xB3\x82?(\x91I\x91\xF0\x82\xB3\x82\xEA\x82?\xA2)\x8E\x9E\x82ł\xE0
-	    Ctrl+Backspace \x82\xC5 BS (DEL) \x95\xB6\x8E\x9A\x82?o\x82ł\xAB\x82?\xB7\x81B
-	  </dd>
-
-	  <dt>Delete key</dt>
-	  <dd>
-	    \x82\xB1\x82?I\x83v\x83V\x83\x87\x83\x93\x82\xAA\x91I\x91\xF0\x82\xB3\x82\xEA\x82\xE9\x82\xC6 Delete (Del) \x83L\x81[\x82\xF0\x89\x9F\x82\xB5\x82\xBD\x8E\x9E\x82\xC9
-	    DEL \x95\xB6\x8E\x9A\x82\xAA\x91\x97\x8Fo\x82\xB3\x82\xEA\x82?\xB7\x81B
-	    \x82\xB1\x82?I\x83v\x83V\x83\x87\x83\x93\x82\xAA\x91I\x91\xF0\x82\xB3\x82\xEA\x82?\xA2\x8F?\x81ADelete \x83L\x81[\x82?@\x94\\x82\xCD
-	    <a href="../setup/keyboard.html">\x83L\x81[\x83{\x81[\x83h\x90?\xE8\x83t\x83@\x83C\x83\x8B</a>
-	    \x82?\xE6\x82茈\x92?\x82\xEA\x82?\xB7\x81B
-	  </dd>
-	</dl>
-      </dd>
-
-      <dt id="RussKeyb">Keyboard</dt>
-      <dd>
-	\x83\x8D\x83V\x83A\x8C\xEA\x83L\x81[\x83{\x81[\x83h\x83^\x83C\x83v\x82\xF0\x8Ew\x92?\x82?\xB7\x81B\x82\xE0\x82\xB5\x83\x8D\x83V\x83A\x8C\xEA Windows
-	\x82ŃX\x83^\x83\x93\x83_\x81[\x83h\x83L\x81[\x83{\x81[\x83h\x83h\x83\x89\x83C\x83o\x82\xF0\x8Eg\x97p\x82\xB5\x82Ă\xA2\x82\xE9\x82?\xE7\x81AWindows
-	\x82\xF0\x91I\x91\xF0\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-	\x82\xE0\x82\xB5\x82\xA0\x82?\xBD\x82\xAA\x83\x8D\x83V\x83A\x8C\xEA\x82ł?\xA2 Windows \x82\xF0\x8Eg\x97p\x82\xB5\x82Ă\xA2\x82āAKOI8-R
-	\x83R\x81[\x83h\x82?\xAC\x82\xB7\x82\xE9\x83h\x83\x89\x83C\x83o\x82\xF0\x8Eg\x97p\x82\xB5\x82Ă\xA2\x82\xE9\x82?\xE7\x81AKOI8-R
-	\x82\xF0\x91I\x91\xF0\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-      </dd>
-
-      <dt>Meta key</dt>
-      <dd>
-	Alt \x83L\x81[\x82\xF0\x83\x81\x83^\x81E\x83L\x81[ (meta key) \x82?\xB5\x82Ďg\x82\xA2\x82?\xB7\x81B
-	\x97?\x82?AAlt+A \x82\xF0\x89\x9F\x82\xB7\x82?AESC A \x82?o\x82\xB5\x82?\xB7\x81B
-	\x83\x81\x83^\x81E\x83L\x81[\x83\x82\x81[\x83h\x82ł?A\x83V\x83\x87\x81[\x83g\x83J\x83b\x83g\x81E\x83L\x81[\x82??\x82\xF0\x8F\x9C\x82\xA2\x82Ďg\x97p\x82ł\xAB\x82?\xAD\x82?\xE8\x82?\xB7\x81B
-      </dd>
-
-      <dt>Disabled mode:</dt>
-      <dd>
-	<dl>
-	  <dt>Application Keypad</dt>
-	  <dd>
-	    \x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x83L\x81[\x83p\x83b\x83h\x83\x82\x81[\x83h\x82?\xF8\x82?\xB5\x82?\xB7\x81B<br>
-	    \x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x83L\x81[\x83p\x83b\x83h\x83\x82\x81[\x83h\x82?\xF8\x82?\xB7\x82\xE9\x82?A
-	    \x82??\xA9\x82?\x8F\x8Eq\x82ŃA\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x83L\x81[\x83p\x83b\x83h\x83\x82\x81[\x83h\x82??s\x82\xB5\x82Ă\xB5\x82?\xA2
-	    \x90\x94\x92l\x83L\x81[\x83p\x83b\x83h\x82\xAA\x8Eg\x82\xA6\x82?\xAD\x82?\xE9\x82?\xA2\x82\xA4\x83g\x83\x89\x83u\x83\x8B\x82\xF0\x96h\x82\xAE\x8E\x96\x82\xAA\x82ł\xAB\x82?\xB7\x81B
-	    \x82\xB5\x82\xA9\x82\xB5\x81A\x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x83L\x81[\x83p\x83b\x83h\x83\x82\x81[\x83h\x82\xF0\x8Eg\x97p\x82\xB5\x82Ă\xA2\x82\xE9
-	    \x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x82ł?s\x8B?\x82\xAA\x8BN\x82\xAB\x82?\x82\xE0\x82\xB5\x82\xEA\x82?\xB9\x82\xF1\x81B
-	  </dd>
-
-	  <dt>Application Cursor</dt>
-	  <dd>
-	    \x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x83J\x81[\x83\\x83\x8B\x83\x82\x81[\x83h\x82?\xF8\x82?\xB5\x82?\xB7\x81B
-	  </dd>
-	</dl>
-      </dd>
-    </dl>
-
-    <p>
-      <A HREF="../setup/keyboard.html">\x83L\x81[\x83{\x81[\x83h\x90?\xE8\x83t\x83@\x83C\x83\x8B</A>
-      \x82\xF0\x8F\x91\x82\xAB\x82\xA9\x82\xA6\x82邱\x82??\xA9\x97R\x82?L\x81[\x90?\xE8\x82\xF0\x95ύX\x82\xB7\x82邱\x82?\xAA\x82ł\xAB\x82?\xB7\x81B
-    </p>
-  </body>
-</html>

Modified: trunk/doc/ja/html/menu/setup-terminal.html
===================================================================
--- trunk/doc/ja/html/menu/setup-terminal.html	2017-06-05 12:13:46 UTC (rev 6775)
+++ trunk/doc/ja/html/menu/setup-terminal.html	2017-06-05 14:07:25 UTC (rev 6776)
@@ -17,10 +17,10 @@
     </p>
 
     <ul>
-      <li><a href="setup-terminalen.html">\x89p\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
-      <li><a href="setup-terminalr.html">\x83\x8D\x83V\x83A\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
-      <li><a href="setup-terminalk.html">\x8A?\x91\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
-      <li><a href="setup-terminalutf8.html">UTF-8\x83\x82\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
+      <li><a href="setup-terminal_en.html">\x89p\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
+      <li><a href="setup-terminal_ko.html">\x8A?\x91\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
+      <li><a href="setup-terminal_ru.html">\x83\x8D\x83V\x83A\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
+      <li><a href="setup-terminal_utf8.html">UTF-8\x83\x82\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
     </ul>
 
     <h2>"Terminal setup" \x83_\x83C\x83A\x83\x8D\x83O\x83{\x83b\x83N\x83X</h2>

Copied: trunk/doc/ja/html/menu/setup-terminal_en.html (from rev 6775, trunk/doc/ja/html/menu/setup-terminalen.html)
===================================================================
--- trunk/doc/ja/html/menu/setup-terminal_en.html	                        (rev 0)
+++ trunk/doc/ja/html/menu/setup-terminal_en.html	2017-06-05 14:07:25 UTC (rev 6776)
@@ -0,0 +1,114 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+  "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
+    <title>Terminal ([Setup] \x83\x81\x83j\x83\x85\x81[; \x89p\x8C?\x81[\x83h)</title>
+    <META http-equiv="Content-Style-Type" content="text/css">
+    <link rel="stylesheet" href="../style.css" type="text/css">
+  </head>
+
+  <body>
+    <h1>Terminal ([Setup] \x83\x81\x83j\x83\x85\x81[; \x89p\x8C?\x81[\x83h)</h1>
+
+    <p>
+      \x82\xB1\x82?y\x81[\x83W\x82\xCD <a href="setup-general.html">Setup - General</a> \x82\xC5 <a href="setup-general.html#Language">Language</a> \x82\xC9 English \x82\xF0\x91I\x91\xF0\x82\xB5\x82\xBD\x8E\x9E\x82?\xE0\x96\xBE\x82ł\xB7\x81B
+      \x91\xBC\x82?\xBE\x8C?\x81[\x83h\x8Eg\x97p\x8E\x9E\x82??\xBA\x82?y\x81[\x83W\x82\xF0\x8EQ\x8F?\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+    </p>
+
+    <ul>
+      <li><a href="setup-terminal.html">\x93\xFA\x96{\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
+      <li><a href="setup-terminal_ko.html">\x8A?\x91\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
+      <li><a href="setup-terminal_ru.html">\x83\x8D\x83V\x83A\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
+      <li><a href="setup-terminal_utf8.html">UTF-8\x83\x82\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
+    </ul>
+
+    <h2>"Terminal setup" \x83_\x83C\x83A\x83\x8D\x83O\x83{\x83b\x83N\x83X</h2>
+    <dl>
+      <dt id="TerminalSize">Terminal size</dt>
+      <dd>
+	\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y(\x92[\x96\x96\x89\xE6\x96??_\x97\x9D\x83T\x83C\x83Y)\x81B
+	\x89\xA1 X \x8Fc \x82?\xB6\x8E\x9A\x90\x94\x82?w\x92?\x82?\xB7\x81B
+	\x83E\x83C\x83\x93\x83h\x83E\x83T\x83C\x83Y(\x8E\xC0\x8D??\xE6\x96???\x82\xB3)\x82?K\x82\xB8\x82\xB5\x82\xE0\x93\xAF\x82\xB6\x82ł?\xA0\x82\xE8\x82?\xB9\x82\xF1\x81B
+      </dd>
+
+      <dt id="TermIsWin">Term size = win size</dt>
+      <dd>
+	\x82\xB1\x82?I\x83v\x83V\x83\x87\x83\x93\x82\xF0\x91I\x91\xF0\x82\xB5\x82\xBD\x8F?\x81A\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y\x82?E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82\xF0\x8F\xED\x82?\x99\x82\xB5\x82\xAD\x82\xB5\x82?\xB7\x81B
+      </dd>
+
+      <dt id="AutoWinResize">Auto window resize</dt>
+      <dd>
+	\x82\xB1\x82?I\x83v\x83V\x83\x87\x83\x93\x82\xF0\x91I\x91\xF0\x82\xB5\x82\xBD\x8F?\x81A\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y\x82\xAA\x95ύX\x82\xB3\x82?\x82?\xAB\x82?A
+	\x83E\x83C\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82\xE0\x93\xAF\x82\xB6\x91?\x82\xB3\x82?\xA9\x93\xAE\x93I\x82?ύX\x82\xB3\x82\xEA\x82?\xB7\x81B
+      </dd>
+
+      <dt id="CRReceive">New-line (receive)</dt>
+      <dd>
+        <dl>
+          <dt>CR</dt>
+          <dd>\x89\xBD\x82\xE0\x95ϊ\xB7\x82\xB5\x82?\xB9\x82\xF1\x81B</dd>
+
+          <dt>CR+LF</dt>
+          <dd>\x8E\xF3\x90M\x82\xB3\x82? \x89\xFC\x8Ds\x95\xB6\x8E\x9A CR ($0D) \x82\xF0 CR+LF ($0D $0A)\x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B<br>
+              \x97\xE1) "CR LF" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A"CR LF LF" \x82?ϊ\xB7\x82\xB3\x82\xEA\x82?\xB7\x81B</dd>
+
+          <dt>LF</dt>
+          <dd>\x8E\xF3\x90M\x82\xB3\x82? \x89\xFC\x8Ds\x95\xB6\x8E\x9A LF ($0A) \x82\xF0 CR+LF ($0D $0A)\x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B<br>
+              \x97\xE1) "CR LF" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A"CR CR LF" \x82?ϊ\xB7\x82\xB3\x82\xEA\x82?\xB7\x81B</dd>
+
+          <dt>AUTO</dt>
+          <dd>\x8E\xF3\x90M\x82\xB3\x82? \x89\xFC\x8Ds\x95\xB6\x8E\x9A CR ($0D), \x89\xFC\x8Ds\x95\xB6\x8E\x9A LF ($0A) \x82\xF0 CR+LF ($0D $0A)\x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B<br>
+              \x97\xE1) "CR LF" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A\x95ϊ\xB7\x82\xB5\x82?\xB9\x82\xF1\x81B<br>
+                  "CR" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A"CR LF" \x82?ϊ\xB7\x82\xB3\x82\xEA\x82?\xB7\x81B<br>
+                  "LF" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A"CR LF" \x82?ϊ\xB7\x82\xB3\x82\xEA\x82?\xB7\x81B</dd>
+        </dl>
+      </dd>
+
+      <dt id="CRSend">New-line (transmit)</dt>
+      <dd>
+        <dl>
+          <dt>CR</dt>
+          <dd>\x89\xBD\x82\xE0\x95ϊ\xB7\x82\xB5\x82?\xB9\x82\xF1\x81B</dd>
+
+          <dt>CR+LF</dt>
+          <dd>\x91\x97\x90M\x8E\x9E\x82?\xFC\x8Ds\x95\xB6\x8E\x9A CR ($0D) \x82\xF0 CR+LF ($0D $0A) \x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B</dd>
+
+          <dt>LF</dt>
+          <dd>\x91\x97\x90M\x8E\x9E\x82?\xFC\x8Ds\x95\xB6\x8E\x9A CR ($0D) \x82\xF0 LF ($0A) \x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B</dd>
+        </dl>
+      </dd>
+
+      <dt id="TerminalID">Terminal ID</dt>
+      <dd>
+	\x83z\x83X\x83g\x82??\xB7\x82\xE9 Terminal ID\x81BTerminal ID \x82\xCD telnet \x82\xCC
+	terminal type \x82???\x82?\xB7\x81BTelnet \x82\xCC terminal type \x82\xF0\x95ύX\x82\xB7\x82\xE9\x82?\xCD
+	<a href="setup-tcpip.html">[Setup] TCP/IP</a>
+	\x83R\x83}\x83\x93\x83h\x82\xF0\x8Eg\x97p\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+      </dd>
+
+      <dt id="LocalEcho">Local echo</dt>
+      <dd>
+	\x83L\x81[\x93\xFC\x97?\x99\x82?\xE6\x82著\x8Fo\x82\xB7\x82?\x8E\x9A\x82\xF0\x82\xBB\x82???\xE6\x96??\\x8E\xA6\x82\xB5\x82?\xB7\x81B
+      </dd>
+
+      <dt id="Answerback">Answerback</dt>
+      <dd>
+	\x83z\x83X\x83g\x82\xA9\x82\xE7 ENQ ($05) \x95\xB6\x8E\x9A\x82\xAA\x91\x97\x82\xE7\x82\xEA\x82Ă\xAB\x82\xBD\x8E\x9E\x82?A\x91\x97\x82\xE8\x95?\xB7\x95\xB6\x8E\x9A\x97\xF1\x81B
+	\x95\xB6\x8E\x9A\x97????\xEA\x82\xE9\x95\\x8E\xA6\x95s\x89?\\x82?\xB6\x8E\x9A(\x90\xA7\x8C?\x8E\x9A)\x82?A"$" \x82\xC6 \x82\xBB\x82\xEA\x82??Â\xAD
+	ASCII \x83R\x81[\x83h(2\x8C\x85\x82\xCC16\x90i\x90\x94) \x82ŕ\\x8C\xBB\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+	\x97?\x82?A\x95\xB6\x8E\x9A\x97\xF1 "ABC &lt;CR&gt; &lt;LF&gt;"
+	\x82\xF0\x83A\x83\x93\x83T\x81[\x83o\x83b\x83N\x82\xB7\x82\xE9\x8F?\x81A\x8E\x9F\x82?悤\x82?\xFC\x97?\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+	<p class="indent1">
+	  ABC$0D$0A
+	</p>
+      </dd>
+
+      <dt id="AutoWinSwitch">Auto switch (VT&lt;-&gt;TEK)</dt>
+      <dd>
+	\x83G\x83X\x83P\x81[\x83v\x83V\x81[\x83P\x83\x93\x83X\x82??\xB5\x82āA\x8E\xA9\x93\xAE\x93I\x82\xC9 VT window \x82\xA9\x82\xE7
+	TEK window \x82?\xA7\x8C\xE4\x82\xF0\x88?\xB5\x82?\xB7(\x8Bt\x82\xE0\x93\xAF\x97l)\x81B
+      </dd>
+    </dl>
+  </body>
+</html>

Copied: trunk/doc/ja/html/menu/setup-terminal_ko.html (from rev 6775, trunk/doc/ja/html/menu/setup-terminalk.html)
===================================================================
--- trunk/doc/ja/html/menu/setup-terminal_ko.html	                        (rev 0)
+++ trunk/doc/ja/html/menu/setup-terminal_ko.html	2017-06-05 14:07:25 UTC (rev 6776)
@@ -0,0 +1,136 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+  "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
+    <title>Terminal ([Setup] \x83\x81\x83j\x83\x85\x81[; \x8A?\x91\x8C?\x81[\x83h)</title>
+    <META http-equiv="Content-Style-Type" content="text/css">
+    <link rel="stylesheet" href="../style.css" type="text/css">
+  </head>
+
+  <body>
+    <h1>Terminal ([Setup] \x83\x81\x83j\x83\x85\x81[; \x8A?\x91\x8C?\x81[\x83h)</h1>
+
+    <p>
+      \x82\xB1\x82?y\x81[\x83W\x82\xCD <a href="setup-general.html">Setup - General</a> \x82\xC5 <a href="setup-general.html#Language">Language</a> \x82\xC9 Korean \x82\xF0\x91I\x91\xF0\x82\xB5\x82\xBD\x8E\x9E\x82?\xE0\x96\xBE\x82ł\xB7\x81B
+      \x91\xBC\x82?\xBE\x8C?\x81[\x83h\x8Eg\x97p\x8E\x9E\x82??\xBA\x82?y\x81[\x83W\x82\xF0\x8EQ\x8F?\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+    </p>
+
+    <ul>
+      <li><a href="setup-terminal.html">\x93\xFA\x96{\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
+      <li><a href="setup-terminal_en.html">\x89p\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
+      <li><a href="setup-terminal_ru.html">\x83\x8D\x83V\x83A\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
+      <li><a href="setup-terminal_utf8.html">UTF-8\x83\x82\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
+    </ul>
+
+    <h2>"Terminal setup" \x83_\x83C\x83A\x83\x8D\x83O\x83{\x83b\x83N\x83X</h2>
+    <dl>
+      <dt id="TerminalSize">Terminal size</dt>
+      <dd>
+	\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y(\x92[\x96\x96\x89\xE6\x96??_\x97\x9D\x83T\x83C\x83Y)\x81B
+	\x89\xA1 X \x8Fc \x82?\xB6\x8E\x9A\x90\x94\x82?w\x92?\x82?\xB7\x81B
+	\x83E\x83C\x83\x93\x83h\x83E\x83T\x83C\x83Y(\x8E\xC0\x8D??\xE6\x96???\x82\xB3)\x82?K\x82\xB8\x82\xB5\x82\xE0\x93\xAF\x82\xB6\x82ł?\xA0\x82\xE8\x82?\xB9\x82\xF1\x81B
+      </dd>
+
+      <dt id="TermIsWin">Term size = win size</dt>
+      <dd>
+	\x82\xB1\x82?I\x83v\x83V\x83\x87\x83\x93\x82\xF0\x91I\x91\xF0\x82\xB5\x82\xBD\x8F?\x81A\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y\x82?E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82\xF0\x8F\xED\x82?\x99\x82\xB5\x82\xAD\x82\xB5\x82?\xB7\x81B
+      </dd>
+
+      <dt id="AutoWinResize">Auto window resize</dt>
+      <dd>
+	\x82\xB1\x82?I\x83v\x83V\x83\x87\x83\x93\x82\xF0\x91I\x91\xF0\x82\xB5\x82\xBD\x8F?\x81A\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y\x82\xAA\x95ύX\x82\xB3\x82?\x82?\xAB\x82?A
+	\x83E\x83C\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82\xE0\x93\xAF\x82\xB6\x91?\x82\xB3\x82?\xA9\x93\xAE\x93I\x82?ύX\x82\xB3\x82\xEA\x82?\xB7\x81B
+      </dd>
+
+      <dt id="CRReceive">New-line (receive)</dt>
+      <dd>
+        <dl>
+          <dt>CR</dt>
+          <dd>\x89\xBD\x82\xE0\x95ϊ\xB7\x82\xB5\x82?\xB9\x82\xF1\x81B</dd>
+
+          <dt>CR+LF</dt>
+          <dd>\x8E\xF3\x90M\x82\xB3\x82? \x89\xFC\x8Ds\x95\xB6\x8E\x9A CR ($0D) \x82\xF0 CR+LF ($0D $0A)\x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B<br>
+              \x97\xE1) "CR LF" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A"CR LF LF" \x82?ϊ\xB7\x82\xB3\x82\xEA\x82?\xB7\x81B</dd>
+
+          <dt>LF</dt>
+          <dd>\x8E\xF3\x90M\x82\xB3\x82? \x89\xFC\x8Ds\x95\xB6\x8E\x9A LF ($0A) \x82\xF0 CR+LF ($0D $0A)\x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B<br>
+              \x97\xE1) "CR LF" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A"CR CR LF" \x82?ϊ\xB7\x82\xB3\x82\xEA\x82?\xB7\x81B</dd>
+
+          <dt>AUTO</dt>
+          <dd>\x8E\xF3\x90M\x82\xB3\x82? \x89\xFC\x8Ds\x95\xB6\x8E\x9A CR ($0D), \x89\xFC\x8Ds\x95\xB6\x8E\x9A LF ($0A) \x82\xF0 CR+LF ($0D $0A)\x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B<br>
+              \x97\xE1) "CR LF" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A\x95ϊ\xB7\x82\xB5\x82?\xB9\x82\xF1\x81B<br>
+                  "CR" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A"CR LF" \x82?ϊ\xB7\x82\xB3\x82\xEA\x82?\xB7\x81B<br>
+                  "LF" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A"CR LF" \x82?ϊ\xB7\x82\xB3\x82\xEA\x82?\xB7\x81B</dd>
+        </dl>
+      </dd>
+
+      <dt id="CRSend">New-line (transmit)</dt>
+      <dd>
+        <dl>
+          <dt>CR</dt>
+          <dd>\x89\xBD\x82\xE0\x95ϊ\xB7\x82\xB5\x82?\xB9\x82\xF1\x81B</dd>
+
+          <dt>CR+LF</dt>
+          <dd>\x91\x97\x90M\x8E\x9E\x82?\xFC\x8Ds\x95\xB6\x8E\x9A CR ($0D) \x82\xF0 CR+LF ($0D $0A) \x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B</dd>
+
+          <dt>LF</dt>
+          <dd>\x91\x97\x90M\x8E\x9E\x82?\xFC\x8Ds\x95\xB6\x8E\x9A CR ($0D) \x82\xF0 LF ($0A) \x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B</dd>
+        </dl>
+      </dd>
+
+      <dt id="TerminalID">Terminal ID</dt>
+      <dd>
+	\x83z\x83X\x83g\x82??\xB7\x82\xE9 Terminal ID\x81BTerminal ID \x82\xCD telnet \x82\xCC
+	terminal type \x82???\x82?\xB7\x81BTelnet \x82\xCC terminal type \x82\xF0\x95ύX\x82\xB7\x82\xE9\x82?\xCD
+	<a href="setup-tcpip.html">[Setup] TCP/IP</a>
+	\x83R\x83}\x83\x93\x83h\x82\xF0\x8Eg\x97p\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+      </dd>
+
+      <dt id="LocalEcho">Local echo</dt>
+      <dd>
+	\x83L\x81[\x93\xFC\x97?\x99\x82?\xE6\x82著\x8Fo\x82\xB7\x82?\x8E\x9A\x82\xF0\x82\xBB\x82???\xE6\x96??\\x8E\xA6\x82\xB5\x82?\xB7\x81B
+      </dd>
+
+      <dt id="Answerback">Answerback</dt>
+      <dd>
+	\x83z\x83X\x83g\x82\xA9\x82\xE7 ENQ ($05) \x95\xB6\x8E\x9A\x82\xAA\x91\x97\x82\xE7\x82\xEA\x82Ă\xAB\x82\xBD\x8E\x9E\x82?A\x91\x97\x82\xE8\x95?\xB7\x95\xB6\x8E\x9A\x97\xF1\x81B
+	\x95\xB6\x8E\x9A\x97????\xEA\x82\xE9\x95\\x8E\xA6\x95s\x89?\\x82?\xB6\x8E\x9A(\x90\xA7\x8C?\x8E\x9A)\x82?A"$" \x82\xC6 \x82\xBB\x82\xEA\x82??Â\xAD
+	ASCII \x83R\x81[\x83h(2\x8C\x85\x82\xCC16\x90i\x90\x94) \x82ŕ\\x8C\xBB\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+	\x97?\x82?A\x95\xB6\x8E\x9A\x97\xF1 "ABC &lt;CR&gt; &lt;LF&gt;"
+	\x82\xF0\x83A\x83\x93\x83T\x81[\x83o\x83b\x83N\x82\xB7\x82\xE9\x8F?\x81A\x8E\x9F\x82?悤\x82?\xFC\x97?\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+	<p class="indent1">
+	  ABC$0D$0A
+	</p>
+      </dd>
+
+      <dt id="AutoWinSwitch">Auto switch (VT&lt;-&gt;TEK)</dt>
+      <dd>
+	\x83G\x83X\x83P\x81[\x83v\x83V\x81[\x83P\x83\x93\x83X\x82??\xB5\x82āA\x8E\xA9\x93\xAE\x93I\x82\xC9 VT window \x82\xA9\x82\xE7
+	TEK window \x82?\xA7\x8C\xE4\x82\xF0\x88?\xB5\x82?\xB7(\x8Bt\x82\xE0\x93\xAF\x97l)\x81B
+      </dd>
+
+      <dt id="KanjiReceive">Coding (receive)</dt>
+      <dd>
+	\x83z\x83X\x83g\x82\xA9\x82瑗\x82\xE7\x82\xEA\x82Ă\xAD\x82?\x8E\x9A\x83R\x81[\x83h (KS5601, UTF-8, UTF-8m \x82\xCC3\x8E\xED\x97\xDE)\x81B
+      </dd>
+
+      <dt id="KanjiSend">Coding (transmit)</dt>
+      <dd>
+	\x91\x97\x8Fo\x82\xB7\x82?\x8E\x9A\x83R\x81[\x83h (KS5601, UTF-8 \x82\xCC2\x8E\xED\x97\xDE)\x81B
+      </dd>
+
+      <dt id="locale">locale</dt>
+      <dd>
+	\x83\x8D\x83P\x81[\x83\x8B\x81B
+	\x8F??\xCD<a href="../usage/unicode.html">Unicode\x90?\xE8</a>\x82\xF0\x8EQ\x8F?B
+      </dd>
+
+      <dt id="CodePage">CodePage</dt>
+      <dd>
+	\x83R\x81[\x83h\x83y\x81[\x83W\x81B
+	\x8F??\xCD<a href="../usage/unicode.html">Unicode\x90?\xE8</a>\x82\xF0\x8EQ\x8F?B
+      </dd>
+    </dl>
+  </body>
+</html>

Copied: trunk/doc/ja/html/menu/setup-terminal_ru.html (from rev 6775, trunk/doc/ja/html/menu/setup-terminalr.html)
===================================================================
--- trunk/doc/ja/html/menu/setup-terminal_ru.html	                        (rev 0)
+++ trunk/doc/ja/html/menu/setup-terminal_ru.html	2017-06-05 14:07:25 UTC (rev 6776)
@@ -0,0 +1,139 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+  "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
+    <title>Terminal ([Setup] \x83\x81\x83j\x83\x85\x81[; \x83\x8D\x83V\x83A\x8C?\x81[\x83h)</title>
+    <META http-equiv="Content-Style-Type" content="text/css">
+    <link rel="stylesheet" href="../style.css" type="text/css">
+  </head>
+
+  <body>
+    <h1>Terminal ([Setup] \x83\x81\x83j\x83\x85\x81[; \x83\x8D\x83V\x83A\x8C?\x81[\x83h)</h1>
+
+    <p>
+      \x82\xB1\x82?y\x81[\x83W\x82\xCD <a href="setup-general.html">Setup - General</a> \x82\xC5 <a href="setup-general.html#Language">Language</a> \x82\xC9 Russian \x82\xF0\x91I\x91\xF0\x82\xB5\x82\xBD\x8E\x9E\x82?\xE0\x96\xBE\x82ł\xB7\x81B
+      \x91\xBC\x82?\xBE\x8C?\x81[\x83h\x8Eg\x97p\x8E\x9E\x82??\xBA\x82?y\x81[\x83W\x82\xF0\x8EQ\x8F?\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+    </p>
+
+    <ul>
+      <li><a href="setup-terminal.html">\x93\xFA\x96{\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
+      <li><a href="setup-terminal_en.html">\x89p\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
+      <li><a href="setup-terminal_ko.html">\x8A?\x91\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
+      <li><a href="setup-terminal_utf8.html">UTF-8\x83\x82\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
+    </ul>
+
+    <h2>"Terminal setup" \x83_\x83C\x83A\x83\x8D\x83O\x83{\x83b\x83N\x83X</h2>
+    <dl>
+      <dt id="TerminalSize">Terminal size</dt>
+      <dd>
+	\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y(\x92[\x96\x96\x89\xE6\x96??_\x97\x9D\x83T\x83C\x83Y)\x81B
+	\x89\xA1 X \x8Fc \x82?\xB6\x8E\x9A\x90\x94\x82?w\x92?\x82?\xB7\x81B
+	\x83E\x83C\x83\x93\x83h\x83E\x83T\x83C\x83Y(\x8E\xC0\x8D??\xE6\x96???\x82\xB3)\x82?K\x82\xB8\x82\xB5\x82\xE0\x93\xAF\x82\xB6\x82ł?\xA0\x82\xE8\x82?\xB9\x82\xF1\x81B
+      </dd>
+
+      <dt id="TermIsWin">Term size = win size</dt>
+      <dd>
+	\x82\xB1\x82?I\x83v\x83V\x83\x87\x83\x93\x82\xF0\x91I\x91\xF0\x82\xB5\x82\xBD\x8F?\x81A\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y\x82?E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82\xF0\x8F\xED\x82?\x99\x82\xB5\x82\xAD\x82\xB5\x82?\xB7\x81B
+      </dd>
+
+      <dt id="AutoWinResize">Auto window resize</dt>
+      <dd>
+	\x82\xB1\x82?I\x83v\x83V\x83\x87\x83\x93\x82\xF0\x91I\x91\xF0\x82\xB5\x82\xBD\x8F?\x81A\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y\x82\xAA\x95ύX\x82\xB3\x82?\x82?\xAB\x82?A
+	\x83E\x83C\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82\xE0\x93\xAF\x82\xB6\x91?\x82\xB3\x82?\xA9\x93\xAE\x93I\x82?ύX\x82\xB3\x82\xEA\x82?\xB7\x81B
+      </dd>
+
+      <dt id="CRReceive">New-line (receive)</dt>
+      <dd>
+        <dl>
+          <dt>CR</dt>
+          <dd>\x89\xBD\x82\xE0\x95ϊ\xB7\x82\xB5\x82?\xB9\x82\xF1\x81B</dd>
+
+          <dt>CR+LF</dt>
+          <dd>\x8E\xF3\x90M\x82\xB3\x82? \x89\xFC\x8Ds\x95\xB6\x8E\x9A CR ($0D) \x82\xF0 CR+LF ($0D $0A)\x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B<br>
+              \x97\xE1) "CR LF" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A"CR LF LF" \x82?ϊ\xB7\x82\xB3\x82\xEA\x82?\xB7\x81B</dd>
+
+          <dt>LF</dt>
+          <dd>\x8E\xF3\x90M\x82\xB3\x82? \x89\xFC\x8Ds\x95\xB6\x8E\x9A LF ($0A) \x82\xF0 CR+LF ($0D $0A)\x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B<br>
+              \x97\xE1) "CR LF" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A"CR CR LF" \x82?ϊ\xB7\x82\xB3\x82\xEA\x82?\xB7\x81B</dd>
+
+          <dt>AUTO</dt>
+          <dd>\x8E\xF3\x90M\x82\xB3\x82? \x89\xFC\x8Ds\x95\xB6\x8E\x9A CR ($0D), \x89\xFC\x8Ds\x95\xB6\x8E\x9A LF ($0A) \x82\xF0 CR+LF ($0D $0A)\x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B<br>
+              \x97\xE1) "CR LF" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A\x95ϊ\xB7\x82\xB5\x82?\xB9\x82\xF1\x81B<br>
+                  "CR" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A"CR LF" \x82?ϊ\xB7\x82\xB3\x82\xEA\x82?\xB7\x81B<br>
+                  "LF" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A"CR LF" \x82?ϊ\xB7\x82\xB3\x82\xEA\x82?\xB7\x81B</dd>
+        </dl>
+      </dd>
+
+      <dt id="CRSend">New-line (transmit)</dt>
+      <dd>
+        <dl>
+          <dt>CR</dt>
+          <dd>\x89\xBD\x82\xE0\x95ϊ\xB7\x82\xB5\x82?\xB9\x82\xF1\x81B</dd>
+
+          <dt>CR+LF</dt>
+          <dd>\x91\x97\x90M\x8E\x9E\x82?\xFC\x8Ds\x95\xB6\x8E\x9A CR ($0D) \x82\xF0 CR+LF ($0D $0A) \x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B</dd>
+
+          <dt>LF</dt>
+          <dd>\x91\x97\x90M\x8E\x9E\x82?\xFC\x8Ds\x95\xB6\x8E\x9A CR ($0D) \x82\xF0 LF ($0A) \x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B</dd>
+        </dl>
+      </dd>
+
+      <dt id="TerminalID">Terminal ID</dt>
+      <dd>
+	\x83z\x83X\x83g\x82??\xB7\x82\xE9 Terminal ID\x81BTerminal ID \x82\xCD telnet \x82\xCC
+	terminal type \x82???\x82?\xB7\x81BTelnet \x82\xCC terminal type \x82\xF0\x95ύX\x82\xB7\x82\xE9\x82?\xCD
+	<a href="setup-tcpip.html">[Setup] TCP/IP</a>
+	\x83R\x83}\x83\x93\x83h\x82\xF0\x8Eg\x97p\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+      </dd>
+
+      <dt id="LocalEcho">Local echo</dt>
+      <dd>
+	\x83L\x81[\x93\xFC\x97?\x99\x82?\xE6\x82著\x8Fo\x82\xB7\x82?\x8E\x9A\x82\xF0\x82\xBB\x82???\xE6\x96??\\x8E\xA6\x82\xB5\x82?\xB7\x81B
+      </dd>
+
+      <dt id="Answerback">Answerback</dt>
+      <dd>
+	\x83z\x83X\x83g\x82\xA9\x82\xE7 ENQ ($05) \x95\xB6\x8E\x9A\x82\xAA\x91\x97\x82\xE7\x82\xEA\x82Ă\xAB\x82\xBD\x8E\x9E\x82?A\x91\x97\x82\xE8\x95?\xB7\x95\xB6\x8E\x9A\x97\xF1\x81B
+	\x95\xB6\x8E\x9A\x97????\xEA\x82\xE9\x95\\x8E\xA6\x95s\x89?\\x82?\xB6\x8E\x9A(\x90\xA7\x8C?\x8E\x9A)\x82?A"$" \x82\xC6 \x82\xBB\x82\xEA\x82??Â\xAD
+	ASCII \x83R\x81[\x83h(2\x8C\x85\x82\xCC16\x90i\x90\x94) \x82ŕ\\x8C\xBB\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+	\x97?\x82?A\x95\xB6\x8E\x9A\x97\xF1 "ABC &lt;CR&gt; &lt;LF&gt;"
+	\x82\xF0\x83A\x83\x93\x83T\x81[\x83o\x83b\x83N\x82\xB7\x82\xE9\x8F?\x81A\x8E\x9F\x82?悤\x82?\xFC\x97?\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+	<p class="indent1">
+	  ABC$0D$0A
+	</p>
+      </dd>
+
+      <dt id="AutoWinSwitch">Auto switch (VT&lt;-&gt;TEK)</dt>
+      <dd>
+	\x83G\x83X\x83P\x81[\x83v\x83V\x81[\x83P\x83\x93\x83X\x82??\xB5\x82āA\x8E\xA9\x93\xAE\x93I\x82\xC9 VT window \x82\xA9\x82\xE7
+	TEK window \x82?\xA7\x8C\xE4\x82\xF0\x88?\xB5\x82?\xB7(\x8Bt\x82\xE0\x93\xAF\x97l)\x81B
+      </dd>
+
+      <dt id="RussCharSet">Character set</dt>
+      <dd>
+	<dl>
+	  <dt id="RussHost">Host</dt>
+	  <dd>
+	    \x83z\x83X\x83g\x83R\x83\x93\x83s\x83\x85\x81[\x83^\x82?g\x97p\x82\xB3\x82\xEA\x82Ă\xA2\x82?\x83V\x83A\x8C?\x8E\x9A\x83Z\x83b\x83g\x81B
+	    Windows (CP 1251), KOI8-R, CP 866 or ISO 8859-5 \x82\xA9\x82\xE7\x91I\x91\xF0\x82\xB5\x82?\xB7\x81B
+	  </dd>
+
+	  <dt id="RussClient">Client</dt>
+	  <dd>
+	    \x82\xA0\x82?\xBD\x82\xCC PC \x82?g\x97p\x82\xB3\x82\xEA\x82Ă\xA2\x82?\x83V\x83A\x8C?\x8E\x9A\x83Z\x83b\x83g\x81B
+	    Windows (CP 1251), KOI8-R, CP 866, ISO 8859-5 \x82\xA9\x82\xE7\x91I\x91\xF0\x82\xB5\x82?\xB7\x81B
+	    \x82\xE0\x82\xB5\x82\xA0\x82?\xBD\x82\xAA\x83\x8D\x83V\x83A\x8C\xEA Windows \x82\xF0\x8Eg\x97p\x82\xB5\x82Ă\xA2\x82\xE9\x82?\xE7\x81AWindows
+	    \x82\xF0\x91I\x91\xF0\x82\xB7\x82?\xAB\x82ł\xB7\x81B
+	  </dd>
+
+	  <dt id="RussFont">Font</dt>
+	  <dd>
+	    \x8Ew\x92?\x82?\x83t\x83H\x83\x93\x83g\x82?\xB6\x8E\x9A\x83R\x81[\x83h\x82\xF0\x81AWindows (CP 1251), KOI8-R,
+	    CP 866, ISO 8859-5 \x82?\x86\x82\xA9\x82\xE7\x91I\x91\xF0\x82\xB5\x82?\xB7\x81B
+	  </dd>
+	</dl>
+      </dd>
+    </dl>
+  </body>
+</html>

Copied: trunk/doc/ja/html/menu/setup-terminal_utf8.html (from rev 6775, trunk/doc/ja/html/menu/setup-terminalutf8.html)
===================================================================
--- trunk/doc/ja/html/menu/setup-terminal_utf8.html	                        (rev 0)
+++ trunk/doc/ja/html/menu/setup-terminal_utf8.html	2017-06-05 14:07:25 UTC (rev 6776)
@@ -0,0 +1,136 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+  "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
+    <title>Terminal ([Setup] \x83\x81\x83j\x83\x85\x81[; UTF-8\x83\x82\x81[\x83h)</title>
+    <META http-equiv="Content-Style-Type" content="text/css">
+    <link rel="stylesheet" href="../style.css" type="text/css">
+  </head>
+
+  <body>
+    <h1>Terminal ([Setup] \x83\x81\x83j\x83\x85\x81[; UTF-8\x83\x82\x81[\x83h)</h1>
+
+    <p>
+      \x82\xB1\x82?y\x81[\x83W\x82\xCD <a href="setup-general.html">Setup - General</a> \x82\xC5 <a href="setup-general.html#Language">Language</a> \x82\xC9 UTF-8 \x82\xF0\x91I\x91\xF0\x82\xB5\x82\xBD\x8E\x9E\x82?\xE0\x96\xBE\x82ł\xB7\x81B
+      \x91\xBC\x82?\xBE\x8C?\x81[\x83h\x8Eg\x97p\x8E\x9E\x82??\xBA\x82?y\x81[\x83W\x82\xF0\x8EQ\x8F?\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+    </p>
+
+    <ul>
+      <li><a href="setup-terminal.html">\x93\xFA\x96{\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
+      <li><a href="setup-terminal_en.html">\x89p\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
+      <li><a href="setup-terminal_ko.html">\x8A?\x91\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
+      <li><a href="setup-terminal_ru.html">\x83\x8D\x83V\x83A\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
+    </ul>
+
+    <h2>"Terminal setup" \x83_\x83C\x83A\x83\x8D\x83O\x83{\x83b\x83N\x83X</h2>
+    <dl>
+      <dt id="TerminalSize">Terminal size</dt>
+      <dd>
+	\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y(\x92[\x96\x96\x89\xE6\x96??_\x97\x9D\x83T\x83C\x83Y)\x81B
+	\x89\xA1 X \x8Fc \x82?\xB6\x8E\x9A\x90\x94\x82?w\x92?\x82?\xB7\x81B
+	\x83E\x83C\x83\x93\x83h\x83E\x83T\x83C\x83Y(\x8E\xC0\x8D??\xE6\x96???\x82\xB3)\x82?K\x82\xB8\x82\xB5\x82\xE0\x93\xAF\x82\xB6\x82ł?\xA0\x82\xE8\x82?\xB9\x82\xF1\x81B
+      </dd>
+
+      <dt id="TermIsWin">Term size = win size</dt>
+      <dd>
+	\x82\xB1\x82?I\x83v\x83V\x83\x87\x83\x93\x82\xF0\x91I\x91\xF0\x82\xB5\x82\xBD\x8F?\x81A\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y\x82?E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82\xF0\x8F\xED\x82?\x99\x82\xB5\x82\xAD\x82\xB5\x82?\xB7\x81B
+      </dd>
+
+      <dt id="AutoWinResize">Auto window resize</dt>
+      <dd>
+	\x82\xB1\x82?I\x83v\x83V\x83\x87\x83\x93\x82\xF0\x91I\x91\xF0\x82\xB5\x82\xBD\x8F?\x81A\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y\x82\xAA\x95ύX\x82\xB3\x82?\x82?\xAB\x82?A
+	\x83E\x83C\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82\xE0\x93\xAF\x82\xB6\x91?\x82\xB3\x82?\xA9\x93\xAE\x93I\x82?ύX\x82\xB3\x82\xEA\x82?\xB7\x81B
+      </dd>
+
+      <dt id="CRReceive">New-line (receive)</dt>
+      <dd>
+        <dl>
+          <dt>CR</dt>
+          <dd>\x89\xBD\x82\xE0\x95ϊ\xB7\x82\xB5\x82?\xB9\x82\xF1\x81B</dd>
+
+          <dt>CR+LF</dt>
+          <dd>\x8E\xF3\x90M\x82\xB3\x82? \x89\xFC\x8Ds\x95\xB6\x8E\x9A CR ($0D) \x82\xF0 CR+LF ($0D $0A)\x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B<br>
+              \x97\xE1) "CR LF" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A"CR LF LF" \x82?ϊ\xB7\x82\xB3\x82\xEA\x82?\xB7\x81B</dd>
+
+          <dt>LF</dt>
+          <dd>\x8E\xF3\x90M\x82\xB3\x82? \x89\xFC\x8Ds\x95\xB6\x8E\x9A LF ($0A) \x82\xF0 CR+LF ($0D $0A)\x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B<br>
+              \x97\xE1) "CR LF" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A"CR CR LF" \x82?ϊ\xB7\x82\xB3\x82\xEA\x82?\xB7\x81B</dd>
+
+          <dt>AUTO</dt>
+          <dd>\x8E\xF3\x90M\x82\xB3\x82? \x89\xFC\x8Ds\x95\xB6\x8E\x9A CR ($0D), \x89\xFC\x8Ds\x95\xB6\x8E\x9A LF ($0A) \x82\xF0 CR+LF ($0D $0A)\x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B<br>
+              \x97\xE1) "CR LF" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A\x95ϊ\xB7\x82\xB5\x82?\xB9\x82\xF1\x81B<br>
+                  "CR" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A"CR LF" \x82?ϊ\xB7\x82\xB3\x82\xEA\x82?\xB7\x81B<br>
+                  "LF" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A"CR LF" \x82?ϊ\xB7\x82\xB3\x82\xEA\x82?\xB7\x81B</dd>
+        </dl>
+      </dd>
+
+      <dt id="CRSend">New-line (transmit)</dt>
+      <dd>
+        <dl>
+          <dt>CR</dt>
+          <dd>\x89\xBD\x82\xE0\x95ϊ\xB7\x82\xB5\x82?\xB9\x82\xF1\x81B</dd>
+
+          <dt>CR+LF</dt>
+          <dd>\x91\x97\x90M\x8E\x9E\x82?\xFC\x8Ds\x95\xB6\x8E\x9A CR ($0D) \x82\xF0 CR+LF ($0D $0A) \x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B</dd>
+
+          <dt>LF</dt>
+          <dd>\x91\x97\x90M\x8E\x9E\x82?\xFC\x8Ds\x95\xB6\x8E\x9A CR ($0D) \x82\xF0 LF ($0A) \x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B</dd>
+        </dl>
+      </dd>
+
+      <dt id="TerminalID">Terminal ID</dt>
+      <dd>
+	\x83z\x83X\x83g\x82??\xB7\x82\xE9 Terminal ID\x81BTerminal ID \x82\xCD telnet \x82\xCC
+	terminal type \x82???\x82?\xB7\x81BTelnet \x82\xCC terminal type \x82\xF0\x95ύX\x82\xB7\x82\xE9\x82?\xCD
+	<a href="setup-tcpip.html">[Setup] TCP/IP</a>
+	\x83R\x83}\x83\x93\x83h\x82\xF0\x8Eg\x97p\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+      </dd>
+
+      <dt id="LocalEcho">Local echo</dt>
+      <dd>
+	\x83L\x81[\x93\xFC\x97?\x99\x82?\xE6\x82著\x8Fo\x82\xB7\x82?\x8E\x9A\x82\xF0\x82\xBB\x82???\xE6\x96??\\x8E\xA6\x82\xB5\x82?\xB7\x81B
+      </dd>
+
+      <dt id="Answerback">Answerback</dt>
+      <dd>
+	\x83z\x83X\x83g\x82\xA9\x82\xE7 ENQ ($05) \x95\xB6\x8E\x9A\x82\xAA\x91\x97\x82\xE7\x82\xEA\x82Ă\xAB\x82\xBD\x8E\x9E\x82?A\x91\x97\x82\xE8\x95?\xB7\x95\xB6\x8E\x9A\x97\xF1\x81B
+	\x95\xB6\x8E\x9A\x97????\xEA\x82\xE9\x95\\x8E\xA6\x95s\x89?\\x82?\xB6\x8E\x9A(\x90\xA7\x8C?\x8E\x9A)\x82?A"$" \x82\xC6 \x82\xBB\x82\xEA\x82??Â\xAD
+	ASCII \x83R\x81[\x83h(2\x8C\x85\x82\xCC16\x90i\x90\x94) \x82ŕ\\x8C\xBB\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+	\x97?\x82?A\x95\xB6\x8E\x9A\x97\xF1 "ABC &lt;CR&gt; &lt;LF&gt;"
+	\x82\xF0\x83A\x83\x93\x83T\x81[\x83o\x83b\x83N\x82\xB7\x82\xE9\x8F?\x81A\x8E\x9F\x82?悤\x82?\xFC\x97?\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+	<p class="indent1">
+	  ABC$0D$0A
+	</p>
+      </dd>
+
+      <dt id="AutoWinSwitch">Auto switch (VT&lt;-&gt;TEK)</dt>
+      <dd>
+	\x83G\x83X\x83P\x81[\x83v\x83V\x81[\x83P\x83\x93\x83X\x82??\xB5\x82āA\x8E\xA9\x93\xAE\x93I\x82\xC9 VT window \x82\xA9\x82\xE7
+	TEK window \x82?\xA7\x8C\xE4\x82\xF0\x88?\xB5\x82?\xB7(\x8Bt\x82\xE0\x93\xAF\x97l)\x81B
+      </dd>
+
+      <dt id="KanjiReceive">Coding (receive)</dt>
+      <dd>
+	\x83z\x83X\x83g\x82\xA9\x82瑗\x82\xE7\x82\xEA\x82Ă\xAD\x82?\x8E\x9A\x83R\x81[\x83h (UTF-8, UTF-8m \x82\xCC2\x8E\xED\x97\xDE)\x81B
+      </dd>
+
+      <dt id="KanjiSend">Coding (transmit)</dt>
+      <dd>
+	\x91\x97\x8Fo\x82\xB7\x82?\x8E\x9A\x83R\x81[\x83h (UTF-8 \x82\xCC1\x8E\xED\x97\xDE)\x81B
+      </dd>
+
+      <dt id="locale">locale</dt>
+      <dd>
+	\x83\x8D\x83P\x81[\x83\x8B\x81B
+	\x8F??\xCD<a href="../usage/unicode.html">Unicode\x90?\xE8</a>\x82\xF0\x8EQ\x8F?B
+      </dd>
+
+      <dt id="CodePage">CodePage</dt>
+      <dd>
+	\x83R\x81[\x83h\x83y\x81[\x83W\x81B
+	\x8F??\xCD<a href="../usage/unicode.html">Unicode\x90?\xE8</a>\x82\xF0\x8EQ\x8F?B
+      </dd>
+    </dl>
+  </body>
+</html>

Deleted: trunk/doc/ja/html/menu/setup-terminalen.html
===================================================================
--- trunk/doc/ja/html/menu/setup-terminalen.html	2017-06-05 12:13:46 UTC (rev 6775)
+++ trunk/doc/ja/html/menu/setup-terminalen.html	2017-06-05 14:07:25 UTC (rev 6776)
@@ -1,114 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
-    <title>Terminal ([Setup] \x83\x81\x83j\x83\x85\x81[; \x89p\x8C?\x81[\x83h)</title>
-    <META http-equiv="Content-Style-Type" content="text/css">
-    <link rel="stylesheet" href="../style.css" type="text/css">
-  </head>
-
-  <body>
-    <h1>Terminal ([Setup] \x83\x81\x83j\x83\x85\x81[; \x89p\x8C?\x81[\x83h)</h1>
-
-    <p>
-      \x82\xB1\x82?y\x81[\x83W\x82\xCD <a href="setup-general.html">Setup - General</a> \x82\xC5 <a href="setup-general.html#Language">Language</a> \x82\xC9 English \x82\xF0\x91I\x91\xF0\x82\xB5\x82\xBD\x8E\x9E\x82?\xE0\x96\xBE\x82ł\xB7\x81B
-      \x91\xBC\x82?\xBE\x8C?\x81[\x83h\x8Eg\x97p\x8E\x9E\x82??\xBA\x82?y\x81[\x83W\x82\xF0\x8EQ\x8F?\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-    </p>
-
-    <ul>
-      <li><a href="setup-terminal.html">\x93\xFA\x96{\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
-      <li><a href="setup-terminalr.html">\x83\x8D\x83V\x83A\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
-      <li><a href="setup-terminalk.html">\x8A?\x91\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
-      <li><a href="setup-terminalutf8.html">UTF-8\x83\x82\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
-    </ul>
-
-    <h2>"Terminal setup" \x83_\x83C\x83A\x83\x8D\x83O\x83{\x83b\x83N\x83X</h2>
-    <dl>
-      <dt id="TerminalSize">Terminal size</dt>
-      <dd>
-	\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y(\x92[\x96\x96\x89\xE6\x96??_\x97\x9D\x83T\x83C\x83Y)\x81B
-	\x89\xA1 X \x8Fc \x82?\xB6\x8E\x9A\x90\x94\x82?w\x92?\x82?\xB7\x81B
-	\x83E\x83C\x83\x93\x83h\x83E\x83T\x83C\x83Y(\x8E\xC0\x8D??\xE6\x96???\x82\xB3)\x82?K\x82\xB8\x82\xB5\x82\xE0\x93\xAF\x82\xB6\x82ł?\xA0\x82\xE8\x82?\xB9\x82\xF1\x81B
-      </dd>
-
-      <dt id="TermIsWin">Term size = win size</dt>
-      <dd>
-	\x82\xB1\x82?I\x83v\x83V\x83\x87\x83\x93\x82\xF0\x91I\x91\xF0\x82\xB5\x82\xBD\x8F?\x81A\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y\x82?E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82\xF0\x8F\xED\x82?\x99\x82\xB5\x82\xAD\x82\xB5\x82?\xB7\x81B
-      </dd>
-
-      <dt id="AutoWinResize">Auto window resize</dt>
-      <dd>
-	\x82\xB1\x82?I\x83v\x83V\x83\x87\x83\x93\x82\xF0\x91I\x91\xF0\x82\xB5\x82\xBD\x8F?\x81A\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y\x82\xAA\x95ύX\x82\xB3\x82?\x82?\xAB\x82?A
-	\x83E\x83C\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82\xE0\x93\xAF\x82\xB6\x91?\x82\xB3\x82?\xA9\x93\xAE\x93I\x82?ύX\x82\xB3\x82\xEA\x82?\xB7\x81B
-      </dd>
-
-      <dt id="CRReceive">New-line (receive)</dt>
-      <dd>
-        <dl>
-          <dt>CR</dt>
-          <dd>\x89\xBD\x82\xE0\x95ϊ\xB7\x82\xB5\x82?\xB9\x82\xF1\x81B</dd>
-
-          <dt>CR+LF</dt>
-          <dd>\x8E\xF3\x90M\x82\xB3\x82? \x89\xFC\x8Ds\x95\xB6\x8E\x9A CR ($0D) \x82\xF0 CR+LF ($0D $0A)\x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B<br>
-              \x97\xE1) "CR LF" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A"CR LF LF" \x82?ϊ\xB7\x82\xB3\x82\xEA\x82?\xB7\x81B</dd>
-
-          <dt>LF</dt>
-          <dd>\x8E\xF3\x90M\x82\xB3\x82? \x89\xFC\x8Ds\x95\xB6\x8E\x9A LF ($0A) \x82\xF0 CR+LF ($0D $0A)\x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B<br>
-              \x97\xE1) "CR LF" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A"CR CR LF" \x82?ϊ\xB7\x82\xB3\x82\xEA\x82?\xB7\x81B</dd>
-
-          <dt>AUTO</dt>
-          <dd>\x8E\xF3\x90M\x82\xB3\x82? \x89\xFC\x8Ds\x95\xB6\x8E\x9A CR ($0D), \x89\xFC\x8Ds\x95\xB6\x8E\x9A LF ($0A) \x82\xF0 CR+LF ($0D $0A)\x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B<br>
-              \x97\xE1) "CR LF" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A\x95ϊ\xB7\x82\xB5\x82?\xB9\x82\xF1\x81B<br>
-                  "CR" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A"CR LF" \x82?ϊ\xB7\x82\xB3\x82\xEA\x82?\xB7\x81B<br>
-                  "LF" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A"CR LF" \x82?ϊ\xB7\x82\xB3\x82\xEA\x82?\xB7\x81B</dd>
-        </dl>
-      </dd>
-
-      <dt id="CRSend">New-line (transmit)</dt>
-      <dd>
-        <dl>
-          <dt>CR</dt>
-          <dd>\x89\xBD\x82\xE0\x95ϊ\xB7\x82\xB5\x82?\xB9\x82\xF1\x81B</dd>
-
-          <dt>CR+LF</dt>
-          <dd>\x91\x97\x90M\x8E\x9E\x82?\xFC\x8Ds\x95\xB6\x8E\x9A CR ($0D) \x82\xF0 CR+LF ($0D $0A) \x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B</dd>
-
-          <dt>LF</dt>
-          <dd>\x91\x97\x90M\x8E\x9E\x82?\xFC\x8Ds\x95\xB6\x8E\x9A CR ($0D) \x82\xF0 LF ($0A) \x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B</dd>
-        </dl>
-      </dd>
-
-      <dt id="TerminalID">Terminal ID</dt>
-      <dd>
-	\x83z\x83X\x83g\x82??\xB7\x82\xE9 Terminal ID\x81BTerminal ID \x82\xCD telnet \x82\xCC
-	terminal type \x82???\x82?\xB7\x81BTelnet \x82\xCC terminal type \x82\xF0\x95ύX\x82\xB7\x82\xE9\x82?\xCD
-	<a href="setup-tcpip.html">[Setup] TCP/IP</a>
-	\x83R\x83}\x83\x93\x83h\x82\xF0\x8Eg\x97p\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-      </dd>
-
-      <dt id="LocalEcho">Local echo</dt>
-      <dd>
-	\x83L\x81[\x93\xFC\x97?\x99\x82?\xE6\x82著\x8Fo\x82\xB7\x82?\x8E\x9A\x82\xF0\x82\xBB\x82???\xE6\x96??\\x8E\xA6\x82\xB5\x82?\xB7\x81B
-      </dd>
-
-      <dt id="Answerback">Answerback</dt>
-      <dd>
-	\x83z\x83X\x83g\x82\xA9\x82\xE7 ENQ ($05) \x95\xB6\x8E\x9A\x82\xAA\x91\x97\x82\xE7\x82\xEA\x82Ă\xAB\x82\xBD\x8E\x9E\x82?A\x91\x97\x82\xE8\x95?\xB7\x95\xB6\x8E\x9A\x97\xF1\x81B
-	\x95\xB6\x8E\x9A\x97????\xEA\x82\xE9\x95\\x8E\xA6\x95s\x89?\\x82?\xB6\x8E\x9A(\x90\xA7\x8C?\x8E\x9A)\x82?A"$" \x82\xC6 \x82\xBB\x82\xEA\x82??Â\xAD
-	ASCII \x83R\x81[\x83h(2\x8C\x85\x82\xCC16\x90i\x90\x94) \x82ŕ\\x8C\xBB\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-	\x97?\x82?A\x95\xB6\x8E\x9A\x97\xF1 "ABC &lt;CR&gt; &lt;LF&gt;"
-	\x82\xF0\x83A\x83\x93\x83T\x81[\x83o\x83b\x83N\x82\xB7\x82\xE9\x8F?\x81A\x8E\x9F\x82?悤\x82?\xFC\x97?\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-	<p class="indent1">
-	  ABC$0D$0A
-	</p>
-      </dd>
-
-      <dt id="AutoWinSwitch">Auto switch (VT&lt;-&gt;TEK)</dt>
-      <dd>
-	\x83G\x83X\x83P\x81[\x83v\x83V\x81[\x83P\x83\x93\x83X\x82??\xB5\x82āA\x8E\xA9\x93\xAE\x93I\x82\xC9 VT window \x82\xA9\x82\xE7
-	TEK window \x82?\xA7\x8C\xE4\x82\xF0\x88?\xB5\x82?\xB7(\x8Bt\x82\xE0\x93\xAF\x97l)\x81B
-      </dd>
-    </dl>
-  </body>
-</html>

Deleted: trunk/doc/ja/html/menu/setup-terminalk.html
===================================================================
--- trunk/doc/ja/html/menu/setup-terminalk.html	2017-06-05 12:13:46 UTC (rev 6775)
+++ trunk/doc/ja/html/menu/setup-terminalk.html	2017-06-05 14:07:25 UTC (rev 6776)
@@ -1,136 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
-    <title>Terminal ([Setup] \x83\x81\x83j\x83\x85\x81[; \x8A?\x91\x8C?\x81[\x83h)</title>
-    <META http-equiv="Content-Style-Type" content="text/css">
-    <link rel="stylesheet" href="../style.css" type="text/css">
-  </head>
-
-  <body>
-    <h1>Terminal ([Setup] \x83\x81\x83j\x83\x85\x81[; \x8A?\x91\x8C?\x81[\x83h)</h1>
-
-    <p>
-      \x82\xB1\x82?y\x81[\x83W\x82\xCD <a href="setup-general.html">Setup - General</a> \x82\xC5 <a href="setup-general.html#Language">Language</a> \x82\xC9 Korean \x82\xF0\x91I\x91\xF0\x82\xB5\x82\xBD\x8E\x9E\x82?\xE0\x96\xBE\x82ł\xB7\x81B
-      \x91\xBC\x82?\xBE\x8C?\x81[\x83h\x8Eg\x97p\x8E\x9E\x82??\xBA\x82?y\x81[\x83W\x82\xF0\x8EQ\x8F?\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-    </p>
-
-    <ul>
-      <li><a href="setup-terminalen.html">\x89p\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
-      <li><a href="setup-terminalr.html">\x83\x8D\x83V\x83A\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
-      <li><a href="setup-terminal.html">\x93\xFA\x96{\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
-      <li><a href="setup-terminalutf8.html">UTF-8\x83\x82\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
-    </ul>
-
-    <h2>"Terminal setup" \x83_\x83C\x83A\x83\x8D\x83O\x83{\x83b\x83N\x83X</h2>
-    <dl>
-      <dt id="TerminalSize">Terminal size</dt>
-      <dd>
-	\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y(\x92[\x96\x96\x89\xE6\x96??_\x97\x9D\x83T\x83C\x83Y)\x81B
-	\x89\xA1 X \x8Fc \x82?\xB6\x8E\x9A\x90\x94\x82?w\x92?\x82?\xB7\x81B
-	\x83E\x83C\x83\x93\x83h\x83E\x83T\x83C\x83Y(\x8E\xC0\x8D??\xE6\x96???\x82\xB3)\x82?K\x82\xB8\x82\xB5\x82\xE0\x93\xAF\x82\xB6\x82ł?\xA0\x82\xE8\x82?\xB9\x82\xF1\x81B
-      </dd>
-
-      <dt id="TermIsWin">Term size = win size</dt>
-      <dd>
-	\x82\xB1\x82?I\x83v\x83V\x83\x87\x83\x93\x82\xF0\x91I\x91\xF0\x82\xB5\x82\xBD\x8F?\x81A\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y\x82?E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82\xF0\x8F\xED\x82?\x99\x82\xB5\x82\xAD\x82\xB5\x82?\xB7\x81B
-      </dd>
-
-      <dt id="AutoWinResize">Auto window resize</dt>
-      <dd>
-	\x82\xB1\x82?I\x83v\x83V\x83\x87\x83\x93\x82\xF0\x91I\x91\xF0\x82\xB5\x82\xBD\x8F?\x81A\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y\x82\xAA\x95ύX\x82\xB3\x82?\x82?\xAB\x82?A
-	\x83E\x83C\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82\xE0\x93\xAF\x82\xB6\x91?\x82\xB3\x82?\xA9\x93\xAE\x93I\x82?ύX\x82\xB3\x82\xEA\x82?\xB7\x81B
-      </dd>
-
-      <dt id="CRReceive">New-line (receive)</dt>
-      <dd>
-        <dl>
-          <dt>CR</dt>
-          <dd>\x89\xBD\x82\xE0\x95ϊ\xB7\x82\xB5\x82?\xB9\x82\xF1\x81B</dd>
-
-          <dt>CR+LF</dt>
-          <dd>\x8E\xF3\x90M\x82\xB3\x82? \x89\xFC\x8Ds\x95\xB6\x8E\x9A CR ($0D) \x82\xF0 CR+LF ($0D $0A)\x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B<br>
-              \x97\xE1) "CR LF" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A"CR LF LF" \x82?ϊ\xB7\x82\xB3\x82\xEA\x82?\xB7\x81B</dd>
-
-          <dt>LF</dt>
-          <dd>\x8E\xF3\x90M\x82\xB3\x82? \x89\xFC\x8Ds\x95\xB6\x8E\x9A LF ($0A) \x82\xF0 CR+LF ($0D $0A)\x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B<br>
-              \x97\xE1) "CR LF" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A"CR CR LF" \x82?ϊ\xB7\x82\xB3\x82\xEA\x82?\xB7\x81B</dd>
-
-          <dt>AUTO</dt>
-          <dd>\x8E\xF3\x90M\x82\xB3\x82? \x89\xFC\x8Ds\x95\xB6\x8E\x9A CR ($0D), \x89\xFC\x8Ds\x95\xB6\x8E\x9A LF ($0A) \x82\xF0 CR+LF ($0D $0A)\x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B<br>
-              \x97\xE1) "CR LF" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A\x95ϊ\xB7\x82\xB5\x82?\xB9\x82\xF1\x81B<br>
-                  "CR" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A"CR LF" \x82?ϊ\xB7\x82\xB3\x82\xEA\x82?\xB7\x81B<br>
-                  "LF" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A"CR LF" \x82?ϊ\xB7\x82\xB3\x82\xEA\x82?\xB7\x81B</dd>
-        </dl>
-      </dd>
-
-      <dt id="CRSend">New-line (transmit)</dt>
-      <dd>
-        <dl>
-          <dt>CR</dt>
-          <dd>\x89\xBD\x82\xE0\x95ϊ\xB7\x82\xB5\x82?\xB9\x82\xF1\x81B</dd>
-
-          <dt>CR+LF</dt>
-          <dd>\x91\x97\x90M\x8E\x9E\x82?\xFC\x8Ds\x95\xB6\x8E\x9A CR ($0D) \x82\xF0 CR+LF ($0D $0A) \x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B</dd>
-
-          <dt>LF</dt>
-          <dd>\x91\x97\x90M\x8E\x9E\x82?\xFC\x8Ds\x95\xB6\x8E\x9A CR ($0D) \x82\xF0 LF ($0A) \x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B</dd>
-        </dl>
-      </dd>
-
-      <dt id="TerminalID">Terminal ID</dt>
-      <dd>
-	\x83z\x83X\x83g\x82??\xB7\x82\xE9 Terminal ID\x81BTerminal ID \x82\xCD telnet \x82\xCC
-	terminal type \x82???\x82?\xB7\x81BTelnet \x82\xCC terminal type \x82\xF0\x95ύX\x82\xB7\x82\xE9\x82?\xCD
-	<a href="setup-tcpip.html">[Setup] TCP/IP</a>
-	\x83R\x83}\x83\x93\x83h\x82\xF0\x8Eg\x97p\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-      </dd>
-
-      <dt id="LocalEcho">Local echo</dt>
-      <dd>
-	\x83L\x81[\x93\xFC\x97?\x99\x82?\xE6\x82著\x8Fo\x82\xB7\x82?\x8E\x9A\x82\xF0\x82\xBB\x82???\xE6\x96??\\x8E\xA6\x82\xB5\x82?\xB7\x81B
-      </dd>
-
-      <dt id="Answerback">Answerback</dt>
-      <dd>
-	\x83z\x83X\x83g\x82\xA9\x82\xE7 ENQ ($05) \x95\xB6\x8E\x9A\x82\xAA\x91\x97\x82\xE7\x82\xEA\x82Ă\xAB\x82\xBD\x8E\x9E\x82?A\x91\x97\x82\xE8\x95?\xB7\x95\xB6\x8E\x9A\x97\xF1\x81B
-	\x95\xB6\x8E\x9A\x97????\xEA\x82\xE9\x95\\x8E\xA6\x95s\x89?\\x82?\xB6\x8E\x9A(\x90\xA7\x8C?\x8E\x9A)\x82?A"$" \x82\xC6 \x82\xBB\x82\xEA\x82??Â\xAD
-	ASCII \x83R\x81[\x83h(2\x8C\x85\x82\xCC16\x90i\x90\x94) \x82ŕ\\x8C\xBB\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-	\x97?\x82?A\x95\xB6\x8E\x9A\x97\xF1 "ABC &lt;CR&gt; &lt;LF&gt;"
-	\x82\xF0\x83A\x83\x93\x83T\x81[\x83o\x83b\x83N\x82\xB7\x82\xE9\x8F?\x81A\x8E\x9F\x82?悤\x82?\xFC\x97?\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-	<p class="indent1">
-	  ABC$0D$0A
-	</p>
-      </dd>
-
-      <dt id="AutoWinSwitch">Auto switch (VT&lt;-&gt;TEK)</dt>
-      <dd>
-	\x83G\x83X\x83P\x81[\x83v\x83V\x81[\x83P\x83\x93\x83X\x82??\xB5\x82āA\x8E\xA9\x93\xAE\x93I\x82\xC9 VT window \x82\xA9\x82\xE7
-	TEK window \x82?\xA7\x8C\xE4\x82\xF0\x88?\xB5\x82?\xB7(\x8Bt\x82\xE0\x93\xAF\x97l)\x81B
-      </dd>
-
-      <dt id="KanjiReceive">Coding (receive)</dt>
-      <dd>
-	\x83z\x83X\x83g\x82\xA9\x82瑗\x82\xE7\x82\xEA\x82Ă\xAD\x82?\x8E\x9A\x83R\x81[\x83h (KS5601, UTF-8, UTF-8m \x82\xCC3\x8E\xED\x97\xDE)\x81B
-      </dd>
-
-      <dt id="KanjiSend">Coding (transmit)</dt>
-      <dd>
-	\x91\x97\x8Fo\x82\xB7\x82?\x8E\x9A\x83R\x81[\x83h (KS5601, UTF-8 \x82\xCC2\x8E\xED\x97\xDE)\x81B
-      </dd>
-
-      <dt id="locale">locale</dt>
-      <dd>
-	\x83\x8D\x83P\x81[\x83\x8B\x81B
-	\x8F??\xCD<a href="../usage/unicode.html">Unicode\x90?\xE8</a>\x82\xF0\x8EQ\x8F?B
-      </dd>
-
-      <dt id="CodePage">CodePage</dt>
-      <dd>
-	\x83R\x81[\x83h\x83y\x81[\x83W\x81B
-	\x8F??\xCD<a href="../usage/unicode.html">Unicode\x90?\xE8</a>\x82\xF0\x8EQ\x8F?B
-      </dd>
-    </dl>
-  </body>
-</html>

Deleted: trunk/doc/ja/html/menu/setup-terminalr.html
===================================================================
--- trunk/doc/ja/html/menu/setup-terminalr.html	2017-06-05 12:13:46 UTC (rev 6775)
+++ trunk/doc/ja/html/menu/setup-terminalr.html	2017-06-05 14:07:25 UTC (rev 6776)
@@ -1,139 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
-    <title>Terminal ([Setup] \x83\x81\x83j\x83\x85\x81[; \x83\x8D\x83V\x83A\x8C?\x81[\x83h)</title>
-    <META http-equiv="Content-Style-Type" content="text/css">
-    <link rel="stylesheet" href="../style.css" type="text/css">
-  </head>
-
-  <body>
-    <h1>Terminal ([Setup] \x83\x81\x83j\x83\x85\x81[; \x83\x8D\x83V\x83A\x8C?\x81[\x83h)</h1>
-
-    <p>
-      \x82\xB1\x82?y\x81[\x83W\x82\xCD <a href="setup-general.html">Setup - General</a> \x82\xC5 <a href="setup-general.html#Language">Language</a> \x82\xC9 Russian \x82\xF0\x91I\x91\xF0\x82\xB5\x82\xBD\x8E\x9E\x82?\xE0\x96\xBE\x82ł\xB7\x81B
-      \x91\xBC\x82?\xBE\x8C?\x81[\x83h\x8Eg\x97p\x8E\x9E\x82??\xBA\x82?y\x81[\x83W\x82\xF0\x8EQ\x8F?\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-    </p>
-
-    <ul>
-      <li><a href="setup-terminalen.html">\x89p\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
-      <li><a href="setup-terminal.html">\x93\xFA\x96{\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
-      <li><a href="setup-terminalk.html">\x8A?\x91\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
-      <li><a href="setup-terminalutf8.html">UTF-8\x83\x82\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
-    </ul>
-
-    <h2>"Terminal setup" \x83_\x83C\x83A\x83\x8D\x83O\x83{\x83b\x83N\x83X</h2>
-    <dl>
-      <dt id="TerminalSize">Terminal size</dt>
-      <dd>
-	\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y(\x92[\x96\x96\x89\xE6\x96??_\x97\x9D\x83T\x83C\x83Y)\x81B
-	\x89\xA1 X \x8Fc \x82?\xB6\x8E\x9A\x90\x94\x82?w\x92?\x82?\xB7\x81B
-	\x83E\x83C\x83\x93\x83h\x83E\x83T\x83C\x83Y(\x8E\xC0\x8D??\xE6\x96???\x82\xB3)\x82?K\x82\xB8\x82\xB5\x82\xE0\x93\xAF\x82\xB6\x82ł?\xA0\x82\xE8\x82?\xB9\x82\xF1\x81B
-      </dd>
-
-      <dt id="TermIsWin">Term size = win size</dt>
-      <dd>
-	\x82\xB1\x82?I\x83v\x83V\x83\x87\x83\x93\x82\xF0\x91I\x91\xF0\x82\xB5\x82\xBD\x8F?\x81A\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y\x82?E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82\xF0\x8F\xED\x82?\x99\x82\xB5\x82\xAD\x82\xB5\x82?\xB7\x81B
-      </dd>
-
-      <dt id="AutoWinResize">Auto window resize</dt>
-      <dd>
-	\x82\xB1\x82?I\x83v\x83V\x83\x87\x83\x93\x82\xF0\x91I\x91\xF0\x82\xB5\x82\xBD\x8F?\x81A\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y\x82\xAA\x95ύX\x82\xB3\x82?\x82?\xAB\x82?A
-	\x83E\x83C\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82\xE0\x93\xAF\x82\xB6\x91?\x82\xB3\x82?\xA9\x93\xAE\x93I\x82?ύX\x82\xB3\x82\xEA\x82?\xB7\x81B
-      </dd>
-
-      <dt id="CRReceive">New-line (receive)</dt>
-      <dd>
-        <dl>
-          <dt>CR</dt>
-          <dd>\x89\xBD\x82\xE0\x95ϊ\xB7\x82\xB5\x82?\xB9\x82\xF1\x81B</dd>
-
-          <dt>CR+LF</dt>
-          <dd>\x8E\xF3\x90M\x82\xB3\x82? \x89\xFC\x8Ds\x95\xB6\x8E\x9A CR ($0D) \x82\xF0 CR+LF ($0D $0A)\x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B<br>
-              \x97\xE1) "CR LF" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A"CR LF LF" \x82?ϊ\xB7\x82\xB3\x82\xEA\x82?\xB7\x81B</dd>
-
-          <dt>LF</dt>
-          <dd>\x8E\xF3\x90M\x82\xB3\x82? \x89\xFC\x8Ds\x95\xB6\x8E\x9A LF ($0A) \x82\xF0 CR+LF ($0D $0A)\x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B<br>
-              \x97\xE1) "CR LF" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A"CR CR LF" \x82?ϊ\xB7\x82\xB3\x82\xEA\x82?\xB7\x81B</dd>
-
-          <dt>AUTO</dt>
-          <dd>\x8E\xF3\x90M\x82\xB3\x82? \x89\xFC\x8Ds\x95\xB6\x8E\x9A CR ($0D), \x89\xFC\x8Ds\x95\xB6\x8E\x9A LF ($0A) \x82\xF0 CR+LF ($0D $0A)\x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B<br>
-              \x97\xE1) "CR LF" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A\x95ϊ\xB7\x82\xB5\x82?\xB9\x82\xF1\x81B<br>
-                  "CR" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A"CR LF" \x82?ϊ\xB7\x82\xB3\x82\xEA\x82?\xB7\x81B<br>
-                  "LF" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A"CR LF" \x82?ϊ\xB7\x82\xB3\x82\xEA\x82?\xB7\x81B</dd>
-        </dl>
-      </dd>
-
-      <dt id="CRSend">New-line (transmit)</dt>
-      <dd>
-        <dl>
-          <dt>CR</dt>
-          <dd>\x89\xBD\x82\xE0\x95ϊ\xB7\x82\xB5\x82?\xB9\x82\xF1\x81B</dd>
-
-          <dt>CR+LF</dt>
-          <dd>\x91\x97\x90M\x8E\x9E\x82?\xFC\x8Ds\x95\xB6\x8E\x9A CR ($0D) \x82\xF0 CR+LF ($0D $0A) \x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B</dd>
-
-          <dt>LF</dt>
-          <dd>\x91\x97\x90M\x8E\x9E\x82?\xFC\x8Ds\x95\xB6\x8E\x9A CR ($0D) \x82\xF0 LF ($0A) \x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B</dd>
-        </dl>
-      </dd>
-
-      <dt id="TerminalID">Terminal ID</dt>
-      <dd>
-	\x83z\x83X\x83g\x82??\xB7\x82\xE9 Terminal ID\x81BTerminal ID \x82\xCD telnet \x82\xCC
-	terminal type \x82???\x82?\xB7\x81BTelnet \x82\xCC terminal type \x82\xF0\x95ύX\x82\xB7\x82\xE9\x82?\xCD
-	<a href="setup-tcpip.html">[Setup] TCP/IP</a>
-	\x83R\x83}\x83\x93\x83h\x82\xF0\x8Eg\x97p\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-      </dd>
-
-      <dt id="LocalEcho">Local echo</dt>
-      <dd>
-	\x83L\x81[\x93\xFC\x97?\x99\x82?\xE6\x82著\x8Fo\x82\xB7\x82?\x8E\x9A\x82\xF0\x82\xBB\x82???\xE6\x96??\\x8E\xA6\x82\xB5\x82?\xB7\x81B
-      </dd>
-
-      <dt id="Answerback">Answerback</dt>
-      <dd>
-	\x83z\x83X\x83g\x82\xA9\x82\xE7 ENQ ($05) \x95\xB6\x8E\x9A\x82\xAA\x91\x97\x82\xE7\x82\xEA\x82Ă\xAB\x82\xBD\x8E\x9E\x82?A\x91\x97\x82\xE8\x95?\xB7\x95\xB6\x8E\x9A\x97\xF1\x81B
-	\x95\xB6\x8E\x9A\x97????\xEA\x82\xE9\x95\\x8E\xA6\x95s\x89?\\x82?\xB6\x8E\x9A(\x90\xA7\x8C?\x8E\x9A)\x82?A"$" \x82\xC6 \x82\xBB\x82\xEA\x82??Â\xAD
-	ASCII \x83R\x81[\x83h(2\x8C\x85\x82\xCC16\x90i\x90\x94) \x82ŕ\\x8C\xBB\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-	\x97?\x82?A\x95\xB6\x8E\x9A\x97\xF1 "ABC &lt;CR&gt; &lt;LF&gt;"
-	\x82\xF0\x83A\x83\x93\x83T\x81[\x83o\x83b\x83N\x82\xB7\x82\xE9\x8F?\x81A\x8E\x9F\x82?悤\x82?\xFC\x97?\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-	<p class="indent1">
-	  ABC$0D$0A
-	</p>
-      </dd>
-
-      <dt id="AutoWinSwitch">Auto switch (VT&lt;-&gt;TEK)</dt>
-      <dd>
-	\x83G\x83X\x83P\x81[\x83v\x83V\x81[\x83P\x83\x93\x83X\x82??\xB5\x82āA\x8E\xA9\x93\xAE\x93I\x82\xC9 VT window \x82\xA9\x82\xE7
-	TEK window \x82?\xA7\x8C\xE4\x82\xF0\x88?\xB5\x82?\xB7(\x8Bt\x82\xE0\x93\xAF\x97l)\x81B
-      </dd>
-
-      <dt id="RussCharSet">Character set</dt>
-      <dd>
-	<dl>
-	  <dt id="RussHost">Host</dt>
-	  <dd>
-	    \x83z\x83X\x83g\x83R\x83\x93\x83s\x83\x85\x81[\x83^\x82?g\x97p\x82\xB3\x82\xEA\x82Ă\xA2\x82?\x83V\x83A\x8C?\x8E\x9A\x83Z\x83b\x83g\x81B
-	    Windows (CP 1251), KOI8-R, CP 866 or ISO 8859-5 \x82\xA9\x82\xE7\x91I\x91\xF0\x82\xB5\x82?\xB7\x81B
-	  </dd>
-
-	  <dt id="RussClient">Client</dt>
-	  <dd>
-	    \x82\xA0\x82?\xBD\x82\xCC PC \x82?g\x97p\x82\xB3\x82\xEA\x82Ă\xA2\x82?\x83V\x83A\x8C?\x8E\x9A\x83Z\x83b\x83g\x81B
-	    Windows (CP 1251), KOI8-R, CP 866, ISO 8859-5 \x82\xA9\x82\xE7\x91I\x91\xF0\x82\xB5\x82?\xB7\x81B
-	    \x82\xE0\x82\xB5\x82\xA0\x82?\xBD\x82\xAA\x83\x8D\x83V\x83A\x8C\xEA Windows \x82\xF0\x8Eg\x97p\x82\xB5\x82Ă\xA2\x82\xE9\x82?\xE7\x81AWindows
-	    \x82\xF0\x91I\x91\xF0\x82\xB7\x82?\xAB\x82ł\xB7\x81B
-	  </dd>
-
-	  <dt id="RussFont">Font</dt>
-	  <dd>
-	    \x8Ew\x92?\x82?\x83t\x83H\x83\x93\x83g\x82?\xB6\x8E\x9A\x83R\x81[\x83h\x82\xF0\x81AWindows (CP 1251), KOI8-R,
-	    CP 866, ISO 8859-5 \x82?\x86\x82\xA9\x82\xE7\x91I\x91\xF0\x82\xB5\x82?\xB7\x81B
-	  </dd>
-	</dl>
-      </dd>
-    </dl>
-  </body>
-</html>

Deleted: trunk/doc/ja/html/menu/setup-terminalutf8.html
===================================================================
--- trunk/doc/ja/html/menu/setup-terminalutf8.html	2017-06-05 12:13:46 UTC (rev 6775)
+++ trunk/doc/ja/html/menu/setup-terminalutf8.html	2017-06-05 14:07:25 UTC (rev 6776)
@@ -1,136 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
-    <title>Terminal ([Setup] \x83\x81\x83j\x83\x85\x81[; UTF-8\x83\x82\x81[\x83h)</title>
-    <META http-equiv="Content-Style-Type" content="text/css">
-    <link rel="stylesheet" href="../style.css" type="text/css">
-  </head>
-
-  <body>
-    <h1>Terminal ([Setup] \x83\x81\x83j\x83\x85\x81[; UTF-8\x83\x82\x81[\x83h)</h1>
-
-    <p>
-      \x82\xB1\x82?y\x81[\x83W\x82\xCD <a href="setup-general.html">Setup - General</a> \x82\xC5 <a href="setup-general.html#Language">Language</a> \x82\xC9 UTF-8 \x82\xF0\x91I\x91\xF0\x82\xB5\x82\xBD\x8E\x9E\x82?\xE0\x96\xBE\x82ł\xB7\x81B
-      \x91\xBC\x82?\xBE\x8C?\x81[\x83h\x8Eg\x97p\x8E\x9E\x82??\xBA\x82?y\x81[\x83W\x82\xF0\x8EQ\x8F?\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-    </p>
-
-    <ul>
-      <li><a href="setup-terminalen.html">\x89p\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
-      <li><a href="setup-terminalr.html">\x83\x8D\x83V\x83A\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
-      <li><a href="setup-terminalk.html">\x8A?\x91\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
-      <li><a href="setup-terminal.html">\x93\xFA\x96{\x8C?\x81[\x83h\x82?w\x83\x8B\x83v</a></li>
-    </ul>
-
-    <h2>"Terminal setup" \x83_\x83C\x83A\x83\x8D\x83O\x83{\x83b\x83N\x83X</h2>
-    <dl>
-      <dt id="TerminalSize">Terminal size</dt>
-      <dd>
-	\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y(\x92[\x96\x96\x89\xE6\x96??_\x97\x9D\x83T\x83C\x83Y)\x81B
-	\x89\xA1 X \x8Fc \x82?\xB6\x8E\x9A\x90\x94\x82?w\x92?\x82?\xB7\x81B
-	\x83E\x83C\x83\x93\x83h\x83E\x83T\x83C\x83Y(\x8E\xC0\x8D??\xE6\x96???\x82\xB3)\x82?K\x82\xB8\x82\xB5\x82\xE0\x93\xAF\x82\xB6\x82ł?\xA0\x82\xE8\x82?\xB9\x82\xF1\x81B
-      </dd>
-
-      <dt id="TermIsWin">Term size = win size</dt>
-      <dd>
-	\x82\xB1\x82?I\x83v\x83V\x83\x87\x83\x93\x82\xF0\x91I\x91\xF0\x82\xB5\x82\xBD\x8F?\x81A\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y\x82?E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82\xF0\x8F\xED\x82?\x99\x82\xB5\x82\xAD\x82\xB5\x82?\xB7\x81B
-      </dd>
-
-      <dt id="AutoWinResize">Auto window resize</dt>
-      <dd>
-	\x82\xB1\x82?I\x83v\x83V\x83\x87\x83\x93\x82\xF0\x91I\x91\xF0\x82\xB5\x82\xBD\x8F?\x81A\x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y\x82\xAA\x95ύX\x82\xB3\x82?\x82?\xAB\x82?A
-	\x83E\x83C\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82\xE0\x93\xAF\x82\xB6\x91?\x82\xB3\x82?\xA9\x93\xAE\x93I\x82?ύX\x82\xB3\x82\xEA\x82?\xB7\x81B
-      </dd>
-
-      <dt id="CRReceive">New-line (receive)</dt>
-      <dd>
-        <dl>
-          <dt>CR</dt>
-          <dd>\x89\xBD\x82\xE0\x95ϊ\xB7\x82\xB5\x82?\xB9\x82\xF1\x81B</dd>
-
-          <dt>CR+LF</dt>
-          <dd>\x8E\xF3\x90M\x82\xB3\x82? \x89\xFC\x8Ds\x95\xB6\x8E\x9A CR ($0D) \x82\xF0 CR+LF ($0D $0A)\x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B<br>
-              \x97\xE1) "CR LF" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A"CR LF LF" \x82?ϊ\xB7\x82\xB3\x82\xEA\x82?\xB7\x81B</dd>
-
-          <dt>LF</dt>
-          <dd>\x8E\xF3\x90M\x82\xB3\x82? \x89\xFC\x8Ds\x95\xB6\x8E\x9A LF ($0A) \x82\xF0 CR+LF ($0D $0A)\x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B<br>
-              \x97\xE1) "CR LF" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A"CR CR LF" \x82?ϊ\xB7\x82\xB3\x82\xEA\x82?\xB7\x81B</dd>
-
-          <dt>AUTO</dt>
-          <dd>\x8E\xF3\x90M\x82\xB3\x82? \x89\xFC\x8Ds\x95\xB6\x8E\x9A CR ($0D), \x89\xFC\x8Ds\x95\xB6\x8E\x9A LF ($0A) \x82\xF0 CR+LF ($0D $0A)\x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B<br>
-              \x97\xE1) "CR LF" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A\x95ϊ\xB7\x82\xB5\x82?\xB9\x82\xF1\x81B<br>
-                  "CR" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A"CR LF" \x82?ϊ\xB7\x82\xB3\x82\xEA\x82?\xB7\x81B<br>
-                  "LF" \x82\xAA\x8E\xF3\x90M\x82\xB3\x82?\x8F?\x81A"CR LF" \x82?ϊ\xB7\x82\xB3\x82\xEA\x82?\xB7\x81B</dd>
-        </dl>
-      </dd>
-
-      <dt id="CRSend">New-line (transmit)</dt>
-      <dd>
-        <dl>
-          <dt>CR</dt>
-          <dd>\x89\xBD\x82\xE0\x95ϊ\xB7\x82\xB5\x82?\xB9\x82\xF1\x81B</dd>
-
-          <dt>CR+LF</dt>
-          <dd>\x91\x97\x90M\x8E\x9E\x82?\xFC\x8Ds\x95\xB6\x8E\x9A CR ($0D) \x82\xF0 CR+LF ($0D $0A) \x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B</dd>
-
-          <dt>LF</dt>
-          <dd>\x91\x97\x90M\x8E\x9E\x82?\xFC\x8Ds\x95\xB6\x8E\x9A CR ($0D) \x82\xF0 LF ($0A) \x82?ϊ\xB7\x82\xB5\x82?\xB7\x81B</dd>
-        </dl>
-      </dd>
-
-      <dt id="TerminalID">Terminal ID</dt>
-      <dd>
-	\x83z\x83X\x83g\x82??\xB7\x82\xE9 Terminal ID\x81BTerminal ID \x82\xCD telnet \x82\xCC
-	terminal type \x82???\x82?\xB7\x81BTelnet \x82\xCC terminal type \x82\xF0\x95ύX\x82\xB7\x82\xE9\x82?\xCD
-	<a href="setup-tcpip.html">[Setup] TCP/IP</a>
-	\x83R\x83}\x83\x93\x83h\x82\xF0\x8Eg\x97p\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-      </dd>
-
-      <dt id="LocalEcho">Local echo</dt>
-      <dd>
-	\x83L\x81[\x93\xFC\x97?\x99\x82?\xE6\x82著\x8Fo\x82\xB7\x82?\x8E\x9A\x82\xF0\x82\xBB\x82???\xE6\x96??\\x8E\xA6\x82\xB5\x82?\xB7\x81B
-      </dd>
-
-      <dt id="Answerback">Answerback</dt>
-      <dd>
-	\x83z\x83X\x83g\x82\xA9\x82\xE7 ENQ ($05) \x95\xB6\x8E\x9A\x82\xAA\x91\x97\x82\xE7\x82\xEA\x82Ă\xAB\x82\xBD\x8E\x9E\x82?A\x91\x97\x82\xE8\x95?\xB7\x95\xB6\x8E\x9A\x97\xF1\x81B
-	\x95\xB6\x8E\x9A\x97????\xEA\x82\xE9\x95\\x8E\xA6\x95s\x89?\\x82?\xB6\x8E\x9A(\x90\xA7\x8C?\x8E\x9A)\x82?A"$" \x82\xC6 \x82\xBB\x82\xEA\x82??Â\xAD
-	ASCII \x83R\x81[\x83h(2\x8C\x85\x82\xCC16\x90i\x90\x94) \x82ŕ\\x8C\xBB\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-	\x97?\x82?A\x95\xB6\x8E\x9A\x97\xF1 "ABC &lt;CR&gt; &lt;LF&gt;"
-	\x82\xF0\x83A\x83\x93\x83T\x81[\x83o\x83b\x83N\x82\xB7\x82\xE9\x8F?\x81A\x8E\x9F\x82?悤\x82?\xFC\x97?\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-	<p class="indent1">
-	  ABC$0D$0A
-	</p>
-      </dd>
-
-      <dt id="AutoWinSwitch">Auto switch (VT&lt;-&gt;TEK)</dt>
-      <dd>
-	\x83G\x83X\x83P\x81[\x83v\x83V\x81[\x83P\x83\x93\x83X\x82??\xB5\x82āA\x8E\xA9\x93\xAE\x93I\x82\xC9 VT window \x82\xA9\x82\xE7
-	TEK window \x82?\xA7\x8C\xE4\x82\xF0\x88?\xB5\x82?\xB7(\x8Bt\x82\xE0\x93\xAF\x97l)\x81B
-      </dd>
-
-      <dt id="KanjiReceive">Coding (receive)</dt>
-      <dd>
-	\x83z\x83X\x83g\x82\xA9\x82瑗\x82\xE7\x82\xEA\x82Ă\xAD\x82?\x8E\x9A\x83R\x81[\x83h (UTF-8, UTF-8m \x82\xCC2\x8E\xED\x97\xDE)\x81B
-      </dd>
-
-      <dt id="KanjiSend">Coding (transmit)</dt>
-      <dd>
-	\x91\x97\x8Fo\x82\xB7\x82?\x8E\x9A\x83R\x81[\x83h (UTF-8 \x82\xCC1\x8E\xED\x97\xDE)\x81B
-      </dd>
-
-      <dt id="locale">locale</dt>
-      <dd>
-	\x83\x8D\x83P\x81[\x83\x8B\x81B
-	\x8F??\xCD<a href="../usage/unicode.html">Unicode\x90?\xE8</a>\x82\xF0\x8EQ\x8F?B
-      </dd>
-
-      <dt id="CodePage">CodePage</dt>
-      <dd>
-	\x83R\x81[\x83h\x83y\x81[\x83W\x81B
-	\x8F??\xCD<a href="../usage/unicode.html">Unicode\x90?\xE8</a>\x82\xF0\x8EQ\x8F?B
-      </dd>
-    </dl>
-  </body>
-</html>

Modified: trunk/doc/ja/teraterm.hhp
===================================================================
--- trunk/doc/ja/teraterm.hhp	2017-06-05 12:13:46 UTC (rev 6775)
+++ trunk/doc/ja/teraterm.hhp	2017-06-05 14:07:25 UTC (rev 6776)
@@ -31,11 +31,11 @@
 HlpFileChangeDir=html\menu\file-chdir.html
 HlpFilePrint=html\menu\file-print.html
 HlpSetupTerminal=html\menu\setup-terminal.html
-HlpSetupTerminalRuss=html\menu\setup-terminalr.html
+HlpSetupTerminalRuss=html\menu\setup-terminal_ru.html
 HlpSetupWindow=html\menu\setup-window.html
 HlpSetupFont=html\menu\setup-font.html
 HlpSetupKeyboard=html\menu\setup-keyboard.html
-HlpSetupKeyboardRuss=html\menu\setup-keyboardr.html
+HlpSetupKeyboardRuss=html\menu\setup-keyboard_ru.html
 HlpSetupSerialPort=html\menu\setup-serialport.html
 HlpSetupTCPIP=html\menu\setup-tcpip.html
 HlpSetupGeneral=html\menu\setup-general.html

From svnnotify ＠ sourceforge.jp  Tue Jun  6 17:39:04 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 06 Jun 2017 17:39:04 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY3NzhdICDjg4fjg5Djg4PjgrDjg63jgrA=?=
 =?utf-8?b?44Gu5pel5pmC5b2i5byP44KSIFJGQzMzODkg5b2i5byP44Gr5aSJ5pu044CC?=
 =?utf-8?q?_=5BTtssh2-devel_3298=5D?=
Message-ID: <1496738344.313217.107406.nullmailer@users.sourceforge.jp>

Revision: 6778
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6778
Author:   doda
Date:     2017-06-06 17:39:03 +0900 (Tue, 06 Jun 2017)
Log Message:
-----------
デバッグログの日時形式を RFC3389 形式に変更。 [Ttssh2-devel 3298]

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/ttxssh.c

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c	2017-06-05 14:07:29 UTC (rev 6777)
+++ trunk/ttssh2/ttxssh/ttxssh.c	2017-06-06 08:39:03 UTC (rev 6778)
@@ -931,7 +931,7 @@
 		             _S_IREAD | _S_IWRITE);
 
 		if (file >= 0) {
-			char *strtime = mctimelocal("%Y-%m-%dT%H:%M:%S,%NZ", TRUE);
+			char *strtime = mctimelocal("%Y-%m-%d %H:%M:%S.%NZ", TRUE);
 			DWORD processid;
 			char tmp[26];
 

From svnnotify ＠ sourceforge.jp  Tue Jun  6 17:39:15 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 06 Jun 2017 17:39:15 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY3NzldICDjg63jgrDlh7rlipvlvLfljJYg?=
 =?utf-8?b?KCDjgqjjg7zjgrjjgqfjg7Pjg4jou6LpgIHplqLpgKMgKQ==?=
Message-ID: <1496738355.787963.107523.nullmailer@users.sourceforge.jp>

Revision: 6779
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6779
Author:   doda
Date:     2017-06-06 17:39:15 +0900 (Tue, 06 Jun 2017)
Log Message:
-----------
ログ出力強化 (エージェント転送関連)

・エラーをデバッグログに記録するようにした
・不正な(大きすぎる)エージェント要求を通知するようにした

Modified Paths:
--------------
    trunk/installer/release/lang/English.lng
    trunk/installer/release/lang/French.lng
    trunk/installer/release/lang/German.lng
    trunk/installer/release/lang/Japanese.lng
    trunk/installer/release/lang/Korean.lng
    trunk/installer/release/lang/Russian.lng
    trunk/installer/release/lang/Simplified Chinese.lng
    trunk/installer/release/lang/Traditional Chinese.lng
    trunk/ttssh2/ttxssh/ssh.c

-------------- next part --------------
Modified: trunk/installer/release/lang/English.lng
===================================================================
--- trunk/installer/release/lang/English.lng	2017-06-06 08:39:03 UTC (rev 6778)
+++ trunk/installer/release/lang/English.lng	2017-06-06 08:39:15 UTC (rev 6779)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2017-05-12)
+; Updated by TeraTerm Project (2017-06-06)
 
 [Tera Term]
 DLG_SYSTEM_FONT=System,14,0
@@ -858,6 +858,8 @@
 MSG_SSH_GEX_SIZE_SMALLER=Received group size is smaller than the requested minimal size.\nrequested: %d, received: %d\nAre you sure that you want to accept received group?
 MSG_SSH_GEX_SIZE_LARGER=Received group size is larger than the requested maximal size.\nrequested: %d, received: %d\nAre you sure that you want to accept received group?
 MSG_SSH_SUBSYSTEM_REQUEST_ERROR=subsystem request failed. (%s)
+MSG_SSH_AGENTERROR_TITLE=Bad agent request
+MSG_SSH_AGENTERROR_TOOLARGE=Agent request size is too large, ignore it.
 
 ; ttxssh.c
 MSG_UNKNOWN_OPTION_ERROR=Unrecognized command-line option: %s

Modified: trunk/installer/release/lang/French.lng
===================================================================
--- trunk/installer/release/lang/French.lng	2017-06-06 08:39:03 UTC (rev 6778)
+++ trunk/installer/release/lang/French.lng	2017-06-06 08:39:15 UTC (rev 6779)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2017-05-12)
+; Updated by TeraTerm Project (2017-06-06)
 ; Last translated (French language) by Francois MOCQ (2010-07-21)
 
 [Tera Term]
@@ -859,6 +859,8 @@
 MSG_SSH_GEX_SIZE_SMALLER=Received group size is smaller than the requested minimal size.\nrequested: %d, received: %d\nAre you sure that you want to accept received group?
 MSG_SSH_GEX_SIZE_LARGER=Received group size is larger than the requested maximal size.\nrequested: %d, received: %d\nAre you sure that you want to accept received group?
 MSG_SSH_SUBSYSTEM_REQUEST_ERROR=subsystem request failed. (%s)
+MSG_SSH_AGENTERROR_TITLE=Bad agent request
+MSG_SSH_AGENTERROR_TOOLARGE=Agent request size is too large, ignore it.
 
 ; ttxssh.c
 MSG_UNKNOWN_OPTION_ERROR=Option inconnue sur la ligne de commande: %s

Modified: trunk/installer/release/lang/German.lng
===================================================================
--- trunk/installer/release/lang/German.lng	2017-06-06 08:39:03 UTC (rev 6778)
+++ trunk/installer/release/lang/German.lng	2017-06-06 08:39:15 UTC (rev 6779)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2017-05-12)
+; Updated by TeraTerm Project (2017-06-06)
 ; Last translated (German language) by Frederik Schwarzer (2010-05-17)
 
 [Tera Term]
@@ -859,6 +859,8 @@
 MSG_SSH_GEX_SIZE_SMALLER=Received group size is smaller than the requested minimal size.\nrequested: %d, received: %d\nAre you sure that you want to accept received group?
 MSG_SSH_GEX_SIZE_LARGER=Received group size is larger than the requested maximal size.\nrequested: %d, received: %d\nAre you sure that you want to accept received group?
 MSG_SSH_SUBSYSTEM_REQUEST_ERROR=subsystem request failed. (%s)
+MSG_SSH_AGENTERROR_TITLE=Bad agent request
+MSG_SSH_AGENTERROR_TOOLARGE=Agent request size is too large, ignore it.
 
 ; ttxssh.c
 MSG_UNKNOWN_OPTION_ERROR=Unbekannte Befehlszeilen-Option: %s

Modified: trunk/installer/release/lang/Japanese.lng
===================================================================
--- trunk/installer/release/lang/Japanese.lng	2017-06-06 08:39:03 UTC (rev 6778)
+++ trunk/installer/release/lang/Japanese.lng	2017-06-06 08:39:15 UTC (rev 6779)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2017-05-12)
+; Updated by TeraTerm Project (2017-06-06)
 
 [Tera Term]
 DLG_SYSTEM_FONT=\x82l\x82r \x82o\x83S\x83V\x83b\x83N,12,128
@@ -858,6 +858,8 @@
 MSG_SSH_GEX_SIZE_SMALLER=\x8E\xF3\x90M\x82\xB5\x82\xBD\x83O\x83\x8B\x81[\x83v\x83T\x83C\x83Y\x82\xAA\x97v\x8B\x81\x82\xB5\x82\xBD\x8D?\xAC\x83T\x83C\x83Y\x82\xE6\x82?\x82\xB3\x82\xA2\x82ł\xB7. \n\x97v\x8B\x81\x82\xB5\x82\xBD\x83T\x83C\x83Y: %d, \x8E\xF3\x90M\x82\xB5\x82\xBD\x83T\x83C\x83Y: %d\n\x8E\xF3\x90M\x82\xB5\x82\xBD\x83O\x83\x8B\x81[\x83v\x82\xF0\x8E?\xFC\x82\xEA\x82?\xB7\x82\xA9\x81H
 MSG_SSH_GEX_SIZE_LARGER=\x8E\xF3\x90M\x82\xB5\x82\xBD\x83O\x83\x8B\x81[\x83v\x83T\x83C\x83Y\x82\xAA\x97v\x8B\x81\x82\xB5\x82\xBD\x8Dő\xE5\x83T\x83C\x83Y\x82\xE6\x82\xE8\x91?\x82\xA2\x82ł\xB7. \n\x97v\x8B\x81\x82\xB5\x82\xBD\x83T\x83C\x83Y: %d, \x8E\xF3\x90M\x82\xB5\x82\xBD\x83T\x83C\x83Y: %d\n\x8E\xF3\x90M\x82\xB5\x82\xBD\x83O\x83\x8B\x81[\x83v\x82\xF0\x8E?\xFC\x82\xEA\x82?\xB7\x82\xA9\x81H
 MSG_SSH_SUBSYSTEM_REQUEST_ERROR=\x83T\x83u\x83V\x83X\x83e\x83\x80\x82?v\x8B\x81\x82\xAA\x8E\xB8\x94s\x82\xB5\x82?\xB5\x82\xBD. (%s)
+MSG_SSH_AGENTERROR_TITLE=\x95s\x90\xB3\x82?G\x81[\x83W\x83F\x83\x93\x83g\x97v\x8B\x81
+MSG_SSH_AGENTERROR_TOOLARGE=\x83G\x81[\x83W\x83F\x83\x93\x83g\x97v\x8B\x81\x82?\x81\x83b\x83Z\x81[\x83W\x82\xAA\x91?\x82\xB7\x82\xAC\x82\xE9\x82?Ŗ\xB3\x8E\x8B\x82\xB5\x82?\xB7.
 
 ; ttxssh.c
 MSG_UNKNOWN_OPTION_ERROR=\x96\xB3\x8C\xF8\x82?R\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93\x83I\x83v\x83V\x83\x87\x83\x93: %s

Modified: trunk/installer/release/lang/Korean.lng
===================================================================
--- trunk/installer/release/lang/Korean.lng	2017-06-06 08:39:03 UTC (rev 6778)
+++ trunk/installer/release/lang/Korean.lng	2017-06-06 08:39:15 UTC (rev 6779)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2017-05-12)
+; Updated by TeraTerm Project (2017-06-06)
 ; Last translated (Korean language) by Daehong Kim (2013-07-25)
 
 [Tera Term]
@@ -859,6 +859,8 @@
 MSG_SSH_GEX_SIZE_SMALLER=Received group size is smaller than the requested minimal size.\nrequested: %d, received: %d\nAre you sure that you want to accept received group?
 MSG_SSH_GEX_SIZE_LARGER=Received group size is larger than the requested maximal size.\nrequested: %d, received: %d\nAre you sure that you want to accept received group?
 MSG_SSH_SUBSYSTEM_REQUEST_ERROR=subsystem request failed. (%s)
+MSG_SSH_AGENTERROR_TITLE=Bad agent request
+MSG_SSH_AGENTERROR_TOOLARGE=Agent request size is too large, ignore it.
 
 ; ttxssh.c
 MSG_UNKNOWN_OPTION_ERROR=\xC0νĵ\xC7\xC1\xF6 \xBE?\xC2 \xB8\xED\xB7\xC9\xC7\xE0 \xBF?\xC7: %s

Modified: trunk/installer/release/lang/Russian.lng
===================================================================
--- trunk/installer/release/lang/Russian.lng	2017-06-06 08:39:03 UTC (rev 6778)
+++ trunk/installer/release/lang/Russian.lng	2017-06-06 08:39:15 UTC (rev 6779)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2017-05-12)
+; Updated by TeraTerm Project (2017-06-06)
 ; Last translated (Russian language) by Ryumik Sergey (2015-03-14)
 
 [Tera Term]
@@ -859,6 +859,8 @@
 MSG_SSH_GEX_SIZE_SMALLER=Received group size is smaller than the requested minimal size.\nrequested: %d, received: %d\nAre you sure that you want to accept received group?
 MSG_SSH_GEX_SIZE_LARGER=Received group size is larger than the requested maximal size.\nrequested: %d, received: %d\nAre you sure that you want to accept received group?
 MSG_SSH_SUBSYSTEM_REQUEST_ERROR=subsystem request failed. (%s)
+MSG_SSH_AGENTERROR_TITLE=Bad agent request
+MSG_SSH_AGENTERROR_TOOLARGE=Agent request size is too large, ignore it.
 
 ; ttxssh.c
 MSG_UNKNOWN_OPTION_ERROR=\xCD\xE5\xE2\xE5\xF0\xED\xFB\xE9 \xEF\xE0\xF0\xE0\xEC\xE5\xF2\xF0 \xE2 \xEA\xEE\xEC\xE0\xED\xE4\xED\xEE\xE9 \xF1\xF2\xF0\xEE\xEA\xE5: %s

Modified: trunk/installer/release/lang/Simplified Chinese.lng
===================================================================
--- trunk/installer/release/lang/Simplified Chinese.lng	2017-06-06 08:39:03 UTC (rev 6778)
+++ trunk/installer/release/lang/Simplified Chinese.lng	2017-06-06 08:39:15 UTC (rev 6779)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2017-05-12)
+; Updated by TeraTerm Project (2017-06-06)
 ; Last translated (Simplified Chinese language) by LiShaohui (2017-04-11)
 
 [Tera Term]
@@ -859,6 +859,8 @@
 MSG_SSH_GEX_SIZE_SMALLER=\xBD\xD3\xCA?\xBD\xB5\xC4\xD7\xE9\xB4\xF3СС\xD3\xDA\xC7\xEB\xC7\xF3\xB5\xC4\xD7\xEEС?\xA1\xA3\n\xC7\xEB\xC7\xF3\xA3\xBA%d\xA3\xAC\xCA?\xBD\xA3\xBA%d\n?\xB6\xA8?\xBD\xD3\xCA\xDC\xCA?\xBD\xB5\xC4\xD7\xE9\xC2\xF0\xA3\xBF
 MSG_SSH_GEX_SIZE_LARGER=\xBD\xD3\xCA?\xBD\xB5\xC4\xD7\xE9\xB4\xF3С\xB4\xF3\xD3\xDA\xC7\xEB\xC7\xF3\xB5\xC4\xD7\xEE\xB4\xF3?\xA1\xA3\n\xC7\xEB\xC7\xF3\xA3\xBA%d\xA3\xAC\xCA?\xBD\xA3\xBA%d\n?\xB6\xA8?\xBD\xD3\xCA\xDC\xCA?\xBD\xB5\xC4\xD7\xE9\xC2\xF0\xA3\xBF
 MSG_SSH_SUBSYSTEM_REQUEST_ERROR=subsystem request failed. (%s)
+MSG_SSH_AGENTERROR_TITLE=Bad agent request
+MSG_SSH_AGENTERROR_TOOLARGE=Agent request size is too large, ignore it.
 
 ; ttxssh.c
 MSG_UNKNOWN_OPTION_ERROR=\xCE\xDEЧ\xB5\xC4\xC3\xFC\xC1\xEE\xD0\xD0?\xCF?%s

Modified: trunk/installer/release/lang/Traditional Chinese.lng
===================================================================
--- trunk/installer/release/lang/Traditional Chinese.lng	2017-06-06 08:39:03 UTC (rev 6778)
+++ trunk/installer/release/lang/Traditional Chinese.lng	2017-06-06 08:39:15 UTC (rev 6779)
@@ -1,4 +1,4 @@
-; Updated by TeraTerm Project (2017-05-12)
+; Updated by TeraTerm Project (2017-06-06)
 ; Last translated (Traditional Chinese language) by kikiqqp (2014-09-20)
 
 [Tera Term]
@@ -859,6 +859,8 @@
 MSG_SSH_GEX_SIZE_SMALLER=Received group size is smaller than the requested minimal size.\nrequested: %d, received: %d\nAre you sure that you want to accept received group?
 MSG_SSH_GEX_SIZE_LARGER=Received group size is larger than the requested maximal size.\nrequested: %d, received: %d\nAre you sure that you want to accept received group?
 MSG_SSH_SUBSYSTEM_REQUEST_ERROR=subsystem request failed. (%s)
+MSG_SSH_AGENTERROR_TITLE=Bad agent request
+MSG_SSH_AGENTERROR_TOOLARGE=Agent request size is too large, ignore it.
 
 ; ttxssh.c
 MSG_UNKNOWN_OPTION_ERROR=\xB5L\xAEĪ\xBA\xA9R\xA5O\xA6\xE6\xBF?\xA1G%s

Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2017-06-06 08:39:03 UTC (rev 6778)
+++ trunk/ttssh2/ttxssh/ssh.c	2017-06-06 08:39:15 UTC (rev 6779)
@@ -32,6 +32,7 @@
 #include "resource.h"
 #include "libputty.h"
 #include "key.h"
+#include "ttcommon.h"
 
 #include <openssl/bn.h>
 #include <openssl/evp.h>
@@ -9147,6 +9148,18 @@
 	if (agent_msg->len == 0) {
 		req_len = get_uint32_MSBfirst(data);
 		if (req_len > AGENT_MAX_MSGLEN - 4) {
+			logprintf(pvar, LOG_LEVEL_NOTICE,
+				__FUNCTION__ ": Agent Forwarding Error: server request is too large. "
+				"size=%u, allowd max=%u.", req_len, AGENT_MAX_MSGLEN-4);
+			if (pvar->session_settings.ForwardAgentNotify) {
+				char title[MAX_UIMSG];
+				UTIL_get_lang_msg("MSG_SSH_AGENTERROR_TITLE", pvar, "Bad agent request");
+				strncpy_s(title, sizeof(title), pvar->ts->UIMsg, _TRUNCATE);
+				UTIL_get_lang_msg("MSG_SSH_AGENTERROR_TOOLARGE", pvar,
+					"Agent request size is too large, ignore it.");
+				NotifyInfoMessage(pvar->cv, pvar->ts->UIMsg, title);
+			}
+
 			goto error;
 		}
 
@@ -9167,6 +9180,7 @@
 
 	agent_query(data, *agent_request_len, &response, &resplen, NULL, NULL);
 	if (response == NULL || resplen < 5) {
+		logprintf(pvar, LOG_LEVEL_NOTICE, __FUNCTION__ "Agent Forwarding Error: agent_query is failed.");
 		goto error;
 	}
 

From svnnotify ＠ sourceforge.jp  Wed Jun  7 18:25:30 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 07 Jun 2017 18:25:30 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY3ODBdICBoZWxwaWQg44GM5LuY44GE44Gm?=
 =?utf-8?b?44GE44Gq44GE44Oa44O844K455So44GuIGlkIOOCkui/veWKoA==?=
Message-ID: <1496827530.075333.7276.nullmailer@users.sourceforge.jp>

Revision: 6780
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6780
Author:   doda
Date:     2017-06-07 18:25:29 +0900 (Wed, 07 Jun 2017)
Log Message:
-----------
helpid が付いていないページ用の id を追加

Modified Paths:
--------------
    trunk/doc/en/teraterm.hhp
    trunk/doc/ja/teraterm.hhp
    trunk/teraterm/common/helpid.h

-------------- next part --------------
Modified: trunk/doc/en/teraterm.hhp
===================================================================
--- trunk/doc/en/teraterm.hhp	2017-06-06 08:39:15 UTC (rev 6779)
+++ trunk/doc/en/teraterm.hhp	2017-06-07 09:25:29 UTC (rev 6780)
@@ -61,6 +61,9 @@
 HlpAboutRequests=html\about\requests.html
 HlpAboutContacts=html\about\contacts.html
 HlpAboutWriter=html\about\writer.html
+HlpAboutCtrlseq=html\about\ctrlseq.html
+HlpAboutDifference=html\about\difference.html
+HlpAboutForeword=html\about\foreword.html
 HlpUsageKeyboard=html\usage\keyboard.html
 HlpUsageMouse=html\usage\mouse.html
 HlpUsageShortcut=html\usage\shortcut.html
@@ -76,20 +79,37 @@
 HlpUsageTipsXmodem=html\usage\tips\xmodem.html
 HlpUsageTipsZmodem=html\usage\tips\zmodem.html
 HlpUsageTipsBplus=html\usage\tips\b-plus.html
+HlpUsageTipsForward=html\usage\tips\forwarding-files.html
 HlpUsageTipsNotport23=html\usage\tips\not_port23.html
+HlpUsageTipsDoubleclick=html\usage\tips\double-click.html
+HlpUsageTipsAppkeypad=html\usage\tips\appkeypad.html
+HlpUsageTipsNamedpipe=html\usage\tips\namedpipe.html
+HlpUsageTipsTelnetprotocol=html\usage\tips\telnet_protocol.html
+HlpUsageTipsVim=html\usage\tips\vim.html
+HlpUsageTipsVirtualstore=html\usage\tips\virtual_store.html
 HlpUsageUnicode=html\usage\unicode.html
 HlpUsageTransparent=html\usage\transparent.html
+HlpUsageTtmenuTtmenu=html\usage\TTMenu\TTMenu.html
+HlpUsageRecurringcommand=html\usage\recurringcommand.html
+HlpUsageResizemenu=html\usage\resizemenu.html
+HlpUsageTtyrec=html\usage\ttyrec.html
 HlpMenuFile=html\menu\file.html
 HlpMenuFileNew=html\menu\file-new.html
 HlpMenuFileLog=html\menu\file-log.html
 HlpMenuFileSendfile=html\menu\file-sendfile.html
 HlpMenuFileTransfer=html\menu\file-transfer.html
+HlpMenuFileTransferKermit=html\menu\file-transfer-kermit.html
 HlpMenuFileTransferKermitGet=html\menu\file-transfer.html
 HlpMenuFileTransferKermitSend=html\menu\file-transfer.html
+HlpMenuFileTransferXmodem=html\menu\file-transfer-xmodem.html
 HlpMenuFileTransferXmodemReceive=html\menu\file-transfer.html
 HlpMenuFileTransferXmodemSend=html\menu\file-transfer.html
+HlpMenuFileTransferYmodem=html\menu\file-transfer-ymodem.html
+HlpMenuFileTransferZmodem=html\menu\file-transfer-zmodem.html
 HlpMenuFileTransferZmodemSend=html\menu\file-transfer.html
+HlpMenuFileTransferBplus=html\menu\file-transfer-bplus.html
 HlpMenuFileTransferBplusSend=html\menu\file-transfer.html
+HlpMenuFileTransferQuickvan=html\menu\file-transfer-qv.html
 HlpMenuFileTransferQuickvanSend=html\menu\file-transfer.html
 HlpMenuFileChdir=html\menu\file-chdir.html
 HlpMenuFilePrint=html\menu\file-print.html
@@ -112,9 +132,11 @@
 HlpMenuSetupDir=html\menu\setup-directory.html
 HlpMenuSetupKeymap=html\menu\setup-loadkeymap.html
 HlpMenuControl=html\menu\control.html
+HlpMenuControlBroadcast=html\menu\control-broadcast.html
 HlpMenuWindow=html\menu\window.html
 HlpMenuWindowWindow=html\menu\window-window.html
 HlpMenuHelp=html\menu\help.html
+HlpMenuResize=html\menu\resize.html
 HlpMenutekFile=html\menutek\file.html
 HlpMenutekFilePrint=html\menutek\file-print.html
 HlpMenutekEdit=html\menutek\edit.html
@@ -130,6 +152,7 @@
 HlpCmdlineTtssh=html\commandline\ttssh.html
 HlpCmdlineCygterm=html\commandline\cygterm.html
 HlpCmdlineTtproxy=html\commandline\ttproxy.html
+HlpCmdlineTtyplay=html\commandline\ttxttyplay.html
 HlpSetupTeraterm=html\setup\teraterm.html
 HlpSetupTeratermTerm=html\setup\teraterm-term.html
 HlpSetupTeratermWin=html\setup\teraterm-win.html
@@ -140,6 +163,8 @@
 HlpSetupKbd=html\setup\keyboard.html
 HlpSetupSshknownhosts=html\setup\knownfiles.html
 HlpSetupCygterm=html\setup\cygterm.html
+HlpSetupLang=html\setup\lng.html
+HlpSetupTeratermIni=html\setup\teraterm-ini.html
 HlpRefKeycode=html\reference\keycode.txt
 HlpRefRe=html\reference\RE.txt
 HlpRefOpenssl=html\reference\OpenSSL-LICENSE.txt
@@ -359,6 +384,7 @@
 HlpMacroAppendixesNegative=html\macro\appendixes\negative.html
 HlpMacroAppendixesAscii=html\macro\appendixes\ascii.html
 HlpMacroAppendixesRegex=html\reference\RE.txt
+HlpMacroAppendixesDisconnect=html\macro\appendixes\disconnecttiming.html
 HlpUninstall=html\uninstall.html
 
 [MAP]

Modified: trunk/doc/ja/teraterm.hhp
===================================================================
--- trunk/doc/ja/teraterm.hhp	2017-06-06 08:39:15 UTC (rev 6779)
+++ trunk/doc/ja/teraterm.hhp	2017-06-07 09:25:29 UTC (rev 6780)
@@ -62,6 +62,9 @@
 HlpAboutContacts=html\about\contacts.html
 HlpAboutJargons=html\about\jargons.html
 HlpAboutWriter=html\about\writer.html
+HlpAboutCtrlseq=html\about\ctrlseq.html
+HlpAboutDifference=html\about\difference.html
+HlpAboutForeword=html\about\foreword.html
 HlpUsageKeyboard=html\usage\keyboard.html
 HlpUsageMouse=html\usage\mouse.html
 HlpUsageShortcut=html\usage\shortcut.html
@@ -87,19 +90,36 @@
 HlpUsageTipsDoubleclick=html\usage\tips\double-click.html
 HlpUsageTipsNotc1char=html\usage\tips\not-c1-char.html
 HlpUsageTipsIncorrectkout=html\usage\tips\incorrect-kanjiout.html
+HlpUsageTipsAppkeypad=html\usage\tips\appkeypad.html
+HlpUsageTipsIme=html\usage\tips\ime.html
+HlpUsageTipsNamedpipe=html\usage\tips\namedpipe.html
+HlpUsageTipsTelnetprotocol=html\usage\tips\telnet_protocol.html
+HlpUsageTipsVim=html\usage\tips\vim.html
+HlpUsageTipsVirtualstore=html\usage\tips\virtual_store.html
 HlpUsageUnicode=html\usage\unicode.html
 HlpUsageTransparent=html\usage\transparent.html
+HlpUsageTtmenuTtmenu=html\usage\TTMenu\TTMenu.html
+HlpUsageKcodechange=html\usage\kcodechange.html
+HlpUsageRecurringcommand=html\usage\recurringcommand.html
+HlpUsageResizemenu=html\usage\resizemenu.html
+HlpUsageTtyrec=html\usage\ttyrec.html
 HlpMenuFile=html\menu\file.html
 HlpMenuFileNew=html\menu\file-new.html
 HlpMenuFileLog=html\menu\file-log.html
 HlpMenuFileSendfile=html\menu\file-sendfile.html
 HlpMenuFileTransfer=html\menu\file-transfer.html
+HlpMenuFileTransferKermit=html\menu\file-transfer-kermit.html
 HlpMenuFileTransferKermitGet=html\menu\file-transfer.html
 HlpMenuFileTransferKermitSend=html\menu\file-transfer.html
+HlpMenuFileTransferXmodem=html\menu\file-transfer-xmodem.html
 HlpMenuFileTransferXmodemReceive=html\menu\file-transfer.html
 HlpMenuFileTransferXmodemSend=html\menu\file-transfer.html
+HlpMenuFileTransferYmodem=html\menu\file-transfer-ymodem.html
+HlpMenuFileTransferZmodem=html\menu\file-transfer-zmodem.html
 HlpMenuFileTransferZmodemSend=html\menu\file-transfer.html
+HlpMenuFileTransferBplus=html\menu\file-transfer-bplus.html
 HlpMenuFileTransferBplusSend=html\menu\file-transfer.html
+HlpMenuFileTransferQuickvan=html\menu\file-transfer-qv.html
 HlpMenuFileTransferQuickvanSend=html\menu\file-transfer.html
 HlpMenuFileChdir=html\menu\file-chdir.html
 HlpMenuFilePrint=html\menu\file-print.html
@@ -122,9 +142,11 @@
 HlpMenuSetupDir=html\menu\setup-directory.html
 HlpMenuSetupKeymap=html\menu\setup-loadkeymap.html
 HlpMenuControl=html\menu\control.html
+HlpMenuControlBroadcast=html\menu\control-broadcast.html
 HlpMenuWindow=html\menu\window.html
 HlpMenuWindowWindow=html\menu\window-window.html
 HlpMenuHelp=html\menu\help.html
+HlpMenuResize=html\menu\resize.html
 HlpMenutekFile=html\menutek\file.html
 HlpMenutekFilePrint=html\menutek\file-print.html
 HlpMenutekEdit=html\menutek\edit.html
@@ -140,6 +162,7 @@
 HlpCmdlineTtssh=html\commandline\ttssh.html
 HlpCmdlineCygterm=html\commandline\cygterm.html
 HlpCmdlineTtproxy=html\commandline\ttproxy.html
+HlpCmdlineTtyplay=html\commandline\ttxttyplay.html
 HlpSetupTeraterm=html\setup\teraterm.html
 HlpSetupTeratermTerm=html\setup\teraterm-term.html
 HlpSetupTeratermWin=html\setup\teraterm-win.html
@@ -150,6 +173,8 @@
 HlpSetupKbd=html\setup\keyboard.html
 HlpSetupSshknownhosts=html\setup\knownfiles.html
 HlpSetupCygterm=html\setup\cygterm.html
+HlpSetupLang=html\setup\lng.html
+HlpSetupTeratermIni=html\setup\teraterm-ini.html
 HlpRefKeycode=html\reference\keycode.txt
 HlpRefRe=html\reference\RE.txt
 HlpRefOpenssl=html\reference\OpenSSL-LICENSE.txt
@@ -369,6 +394,7 @@
 HlpMacroAppendixesNegative=html\macro\appendixes\negative.html
 HlpMacroAppendixesAscii=html\macro\appendixes\ascii.html
 HlpMacroAppendixesRegex=html\reference\RE.txt
+HlpMacroAppendixesDisconnect=html\macro\appendixes\disconnecttiming.html
 HlpUninstall=html\uninstall.html
 
 [MAP]

Modified: trunk/teraterm/common/helpid.h
===================================================================
--- trunk/teraterm/common/helpid.h	2017-06-06 08:39:15 UTC (rev 6779)
+++ trunk/teraterm/common/helpid.h	2017-06-07 09:25:29 UTC (rev 6780)
@@ -54,6 +54,9 @@
 #define HlpAboutContacts        20008
 #define HlpAboutJargons         20009
 #define HlpAboutWriter          20010
+#define HlpAboutCtrlseq         20011
+#define HlpAboutDifference      20012
+#define HlpAboutForeword        20013
 
 #define HlpUsageKeyboard                30100
 #define HlpUsageMouse                   30200
@@ -80,8 +83,19 @@
 #define HlpUsageTipsDoubleclick         30815
 #define HlpUsageTipsNotc1char           30816
 #define HlpUsageTipsIncorrectkout       30817
+#define HlpUsageTipsAppkeypad           30818
+#define HlpUsageTipsIme                 30819
+#define HlpUsageTipsNamedpipe           30820
+#define HlpUsageTipsTelnetprotocol      30821
+#define HlpUsageTipsVim                 30822
+#define HlpUsageTipsVirtualstore        30823
 #define HlpUsageUnicode                 30900
 #define HlpUsageTransparent             31000
+#define HlpUsageTtmenuTtmenu            31100
+#define HlpUsageKcodechange             31200
+#define HlpUsageRecurringcommand        31300
+#define HlpUsageResizemenu              31400
+#define HlpUsageTtyrec                  31500
 
 #define HlpMenuFile                         41000
 #define HlpMenuFileNew                      41100
@@ -88,12 +102,18 @@
 #define HlpMenuFileLog                      41200
 #define HlpMenuFileSendfile                 41300
 #define HlpMenuFileTransfer                 41400
+#define HlpMenuFileTransferKermit           41410
 #define HlpMenuFileTransferKermitGet        41411
 #define HlpMenuFileTransferKermitSend       41412
+#define HlpMenuFileTransferXmodem           41420
 #define HlpMenuFileTransferXmodemReceive    41421
 #define HlpMenuFileTransferXmodemSend       41422
+#define HlpMenuFileTransferYmodem           41460
+#define HlpMenuFileTransferZmodem           41430
 #define HlpMenuFileTransferZmodemSend       41431
+#define HlpMenuFileTransferBplus            41440
 #define HlpMenuFileTransferBplusSend        41441
+#define HlpMenuFileTransferQuickvan         41450
 #define HlpMenuFileTransferQuickvanSend     41451
 #define HlpMenuFileChdir                    41500
 #define HlpMenuFilePrint                    41600
@@ -116,9 +136,11 @@
 #define HlpMenuSetupDir                     43016
 #define HlpMenuSetupKeymap                  43015
 #define HlpMenuControl                      44000
+#define HlpMenuControlBroadcast             44001
 #define HlpMenuWindow                       45000
 #define HlpMenuWindowWindow                 45001
 #define HlpMenuHelp                         46000
+#define HlpMenuResize                       47000
 
 #define HlpMenutekFile          50000
 #define HlpMenutekFilePrint     50001
@@ -136,6 +158,7 @@
 #define HlpCmdlineTtssh     60003
 #define HlpCmdlineCygterm   60004
 #define HlpCmdlineTtproxy   60005
+#define HlpCmdlineTtyplay   60006
 
 #define HlpSetupTeraterm        71000
 #define HlpSetupTeratermTerm    71001
@@ -144,9 +167,11 @@
 #define HlpSetupTeratermTrans   71004
 #define HlpSetupTeratermPrint   71005
 #define HlpSetupTeratermMisc    71006
+#define HlpSetupTeratermIni     71007
 #define HlpSetupKbd             71000
 #define HlpSetupSshknownhosts   72000
 #define HlpSetupCygterm         73000
+#define HlpSetupLang            74000
 
 #define HlpRefKeycode   80001
 #define HlpRefRe        80002
@@ -363,11 +388,12 @@
 #define HlpMacroCommandZmodemrecv       92108
 #define HlpMacroCommandZmodemsend       92109
 
-#define HlpMacroAppendixes          93000
-#define HlpMacroAppendixesError     93001
-#define HlpMacroAppendixesNewline   93002
-#define HlpMacroAppendixesNegative  93003
-#define HlpMacroAppendixesAscii     93004
-#define HlpMacroAppendixesRegex     93005
+#define HlpMacroAppendixes              93000
+#define HlpMacroAppendixesError         93001
+#define HlpMacroAppendixesNewline       93002
+#define HlpMacroAppendixesNegative      93003
+#define HlpMacroAppendixesAscii         93004
+#define HlpMacroAppendixesRegex         93005
+#define HlpMacroAppendixesDisconnect    93006
 
 #define HlpUninstall    100000

From svnnotify ＠ sourceforge.jp  Wed Jun  7 18:25:33 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 07 Jun 2017 18:25:33 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY3ODFdICDpgY7ljrvjgavooYzjgo/jgow=?=
 =?utf-8?b?44Gf5aSJ5pu044KS44Ot44K344Ki6Kqe44Oi44O844OJ44Gn44Gu6Kqs5piO?=
 =?utf-8?b?44Gr5Y+N5pig?=
Message-ID: <1496827533.994993.7338.nullmailer@users.sourceforge.jp>

Revision: 6781
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6781
Author:   doda
Date:     2017-06-07 18:25:33 +0900 (Wed, 07 Jun 2017)
Log Message:
-----------
過去に行われた変更をロシア語モードでの説明に反映

Modified Paths:
--------------
    trunk/doc/en/html/menu/setup-keyboard_ru.html
    trunk/doc/en/html/menu/setup-terminal.html
    trunk/doc/en/html/menu/setup-terminal_ru.html
    trunk/doc/ja/html/menu/setup-keyboard_ru.html

-------------- next part --------------
Modified: trunk/doc/en/html/menu/setup-keyboard_ru.html
===================================================================
--- trunk/doc/en/html/menu/setup-keyboard_ru.html	2017-06-07 09:25:29 UTC (rev 6780)
+++ trunk/doc/en/html/menu/setup-keyboard_ru.html	2017-06-07 09:25:33 UTC (rev 6781)
@@ -16,7 +16,7 @@
       <dt>Transmit DEL by:</dt>
       <dd>
 	<dl>
-	  <dt>Backspace key</dt>
+	  <dt id="BSKey">Backspace key</dt>
 	  <dd>
 	    If this option is checked, pressing the backspace key sends
 	    the DEL character (ASCII 0x7F). If not checked, the BS character
@@ -25,7 +25,7 @@
 	    Ctrl+backspace key.
 	  </dd>
 
-	  <dt>Delete key</dt>
+	  <dt id="DeleteKey">Delete key</dt>
 	  <dd>
 	    If this option is checked, pressing the Delete key sends the
 	    DEL character. If not checked, the function assigned for the
@@ -43,17 +43,18 @@
 	generates KOI8-R code, select KOI8-R.
       </dd>
 
-      <dt>Meta key</dt>
+      <dt id="MetaKey">Meta key</dt>
       <dd>
 	Enables the meta-key mode. The Alt key is used as the meta key.
 	For example, the sequence ESC A is sent by pressing the Alt+A key.
-	Shortcut keys which use the Alt key (such as Alt+C) are disabled.
+	Shortcut keys which use the Alt key (such as Alt+C) are disabled.<br>
+	Please set the "left" value to input the character with AltGr key and the Meta key is enabled. However, this value can be enabled with Windows NT 4.0 later.
       </dd>
 
       <dt>Disabled mode:</dt>
       <dd>
 	<dl>
-	  <dt>Application Keypad</dt>
+	  <dt id="DisableAppKeypad">Application Keypad</dt>
 	  <dd>
 	    This option disables Application Keypad mode.<br>
 	    If this option is selected, you can prevent a problem of a
@@ -63,7 +64,7 @@
 	    may encounter other problems when this option is selected.
 	  </dd>
 
-	  <dt>Application Cursor</dt>
+	  <dt id="DisableAppCursor">Application Cursor</dt>
 	  <dd>
 	    This option disables Application Cursor mode.
 	  </dd>

Modified: trunk/doc/en/html/menu/setup-terminal.html
===================================================================
--- trunk/doc/en/html/menu/setup-terminal.html	2017-06-07 09:25:29 UTC (rev 6780)
+++ trunk/doc/en/html/menu/setup-terminal.html	2017-06-07 09:25:33 UTC (rev 6781)
@@ -37,7 +37,7 @@
 	Forces the terminal size to be always equal to the window size.
       </dd>
 
-      <dt>Auto window resize</dt>
+      <dt id="AutoWinResize">Auto window resize</dt>
       <dd>
 	When the terminal size is changed, resizes the window to the
 	terminal size.
@@ -79,7 +79,7 @@
         </dl>
       </dd>
 
-      <dt><a name="TerminalID">Terminal ID</a></dt>
+      <dt id="TerminalID">Terminal ID</dt>
       <dd>
 	Terminal ID to be reported to the host when the host requests it.
 	Note that the terminal ID is not identical to the telnet terminal
@@ -92,7 +92,7 @@
 	Enables local echoing of characters sent.
       </dd>
 
-      <dt><a name="Answerback">Answerback</a></dt>
+      <dt id="Answerback">Answerback</dt>
       <dd>
 	The string to be answered back to the host, when the ENQ ($05)
 	character is received. Each non-printable character in the string
@@ -109,6 +109,5 @@
 	Enables auto switching between VT and TEK emulations.
       </dd>
     </dl>
-
   </body>
 </html>

Modified: trunk/doc/en/html/menu/setup-terminal_ru.html
===================================================================
--- trunk/doc/en/html/menu/setup-terminal_ru.html	2017-06-07 09:25:29 UTC (rev 6780)
+++ trunk/doc/en/html/menu/setup-terminal_ru.html	2017-06-07 09:25:33 UTC (rev 6781)
@@ -23,7 +23,6 @@
       <li><a href="setup-terminal_utf8.html">UTF-8 mode</a></li>
     </ul>
 
-
     <h2>"Terminal setup" dialog box</h2>
     <dl>
       <dt id="TerminalSize">Terminal size</dt>
@@ -51,11 +50,11 @@
           <dd>Tera Term doesn't convert it.</dd>
 
           <dt>CR+LF</dt>
-          <dd>Received CR ($0D) characters are converted to CR+LF ($0D $0A) pairs.<br>
+          <dd>Received CR ($0D) character is converted to CR+LF ($0D $0A) pairs.<br>
               e.g.) If "CR LF" is received, it is converted to "CR LF LF."</dd>
 
           <dt>LF</dt>
-          <dd>Received LF ($0A) characters are converted to CR+LF ($0D $0A) pairs.<br>
+          <dd>Received LF ($0A) character is converted to CR+LF ($0D $0A) pairs.<br>
               e.g.) If "CR LF" is received, it is converted to "CR CR LF."</dd>
 
           <dt>AUTO</dt>
@@ -73,7 +72,7 @@
           <dd>Tera Term doesn't convert it.</dd>
 
           <dt>CR+LF</dt>
-          <dd>CR ($0D) characters to be sent are converted to CR+LF ($0D $0A) pairs before they are actually sent.</dd>
+          <dd>CR ($0D) character to be sent is converted to CR+LF ($0D $0A) pairs before it is actually sent.</dd>
         </dl>
       </dd>
 

Modified: trunk/doc/ja/html/menu/setup-keyboard_ru.html
===================================================================
--- trunk/doc/ja/html/menu/setup-keyboard_ru.html	2017-06-07 09:25:29 UTC (rev 6780)
+++ trunk/doc/ja/html/menu/setup-keyboard_ru.html	2017-06-07 09:25:33 UTC (rev 6781)
@@ -16,7 +16,7 @@
       <dt>Transmit DEL by:</dt>
       <dd>
 	<dl>
-	  <dt>Backspace key</dt>
+	  <dt id="BSKey">Backspace key</dt>
 	  <dd>
 	    \x82\xB1\x82?I\x83v\x83V\x83\x87\x83\x93\x82\xAA\x91I\x91\xF0\x82\xB3\x82\xEA\x82\xE9\x82\xC6 backspace \x83L\x81[\x82\xF0\x89\x9F\x82\xB5\x82\xBD\x8E\x9E\x82\xC9 DEL \x95\xB6\x8E\x9A
 	    (ASCII $7F) \x82\xAA\x91\x97\x8Fo\x82\xB3\x82\xEA\x82?\xB7\x81B
@@ -25,7 +25,7 @@
 	    Ctrl+Backspace \x82\xC5 BS (DEL) \x95\xB6\x8E\x9A\x82?o\x82ł\xAB\x82?\xB7\x81B
 	  </dd>
 
-	  <dt>Delete key</dt>
+	  <dt id="DeleteKey">Delete key</dt>
 	  <dd>
 	    \x82\xB1\x82?I\x83v\x83V\x83\x87\x83\x93\x82\xAA\x91I\x91\xF0\x82\xB3\x82\xEA\x82\xE9\x82\xC6 Delete (Del) \x83L\x81[\x82\xF0\x89\x9F\x82\xB5\x82\xBD\x8E\x9E\x82\xC9
 	    DEL \x95\xB6\x8E\x9A\x82\xAA\x91\x97\x8Fo\x82\xB3\x82\xEA\x82?\xB7\x81B
@@ -46,17 +46,18 @@
 	\x82\xF0\x91I\x91\xF0\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
       </dd>
 
-      <dt>Meta key</dt>
+      <dt id="MetaKey">Meta key</dt>
       <dd>
 	Alt \x83L\x81[\x82\xF0\x83\x81\x83^\x81E\x83L\x81[ (meta key) \x82?\xB5\x82Ďg\x82\xA2\x82?\xB7\x81B
 	\x97?\x82?AAlt+A \x82\xF0\x89\x9F\x82\xB7\x82?AESC A \x82?o\x82\xB5\x82?\xB7\x81B
-	\x83\x81\x83^\x81E\x83L\x81[\x83\x82\x81[\x83h\x82ł?A\x83V\x83\x87\x81[\x83g\x83J\x83b\x83g\x81E\x83L\x81[\x82??\x82\xF0\x8F\x9C\x82\xA2\x82Ďg\x97p\x82ł\xAB\x82?\xAD\x82?\xE8\x82?\xB7\x81B
+	\x83\x81\x83^\x81E\x83L\x81[\x83\x82\x81[\x83h\x82ł?A\x83V\x83\x87\x81[\x83g\x83J\x83b\x83g\x81E\x83L\x81[\x82??\x82\xF0\x8F\x9C\x82\xA2\x82Ďg\x97p\x82ł\xAB\x82?\xAD\x82?\xE8\x82?\xB7\x81B<br >
+	\x83\x81\x83^\x81E\x83L\x81[\x82\xF0\x97L\x8C\xF8\x82?\xB5\x82?\xC2 AltGr \x83L\x81[\x82??g\x82?\x87\x82?\x82ŕ\xB6\x8E\x9A\x82\xF0\x93\xFC\x97?\xF0\x82\xB5\x82\xBD\x82\xA2\x8F?\x82?A\x90?\xE8\x92l\x82\xF0 left \x82?\xB5\x82?\xB7\x81B\x81\xA6NT 4.0 \x88?~\x82??Ή\x9E
       </dd>
 
       <dt>Disabled mode:</dt>
       <dd>
 	<dl>
-	  <dt>Application Keypad</dt>
+	  <dt id="DisableAppKeypad">Application Keypad</dt>
 	  <dd>
 	    \x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x83L\x81[\x83p\x83b\x83h\x83\x82\x81[\x83h\x82?\xF8\x82?\xB5\x82?\xB7\x81B<br>
 	    \x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x83L\x81[\x83p\x83b\x83h\x83\x82\x81[\x83h\x82?\xF8\x82?\xB7\x82\xE9\x82?A
@@ -66,7 +67,7 @@
 	    \x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x82ł?s\x8B?\x82\xAA\x8BN\x82\xAB\x82?\x82\xE0\x82\xB5\x82\xEA\x82?\xB9\x82\xF1\x81B
 	  </dd>
 
-	  <dt>Application Cursor</dt>
+	  <dt id="DisableAppCursor">Application Cursor</dt>
 	  <dd>
 	    \x83A\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x83J\x81[\x83\\x83\x8B\x83\x82\x81[\x83h\x82?\xF8\x82?\xB5\x82?\xB7\x81B
 	  </dd>

From svnnotify ＠ sourceforge.jp  Fri Jun  9 19:04:24 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 09 Jun 2017 19:04:24 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY3ODJdICDjgrPjg6Hjg7Pjg4jjgpLmraM=?=
 =?utf-8?b?44GX44GE5L2N572u44Gr56e75YuV?=
Message-ID: <1497002664.451597.69691.nullmailer@users.sourceforge.jp>

Revision: 6782
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6782
Author:   doda
Date:     2017-06-09 19:04:23 +0900 (Fri, 09 Jun 2017)
Log Message:
-----------
コメントを正しい位置に移動

Modified Paths:
--------------
    trunk/teraterm/teraterm/vtwin.cpp

-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2017-06-07 09:25:33 UTC (rev 6781)
+++ trunk/teraterm/teraterm/vtwin.cpp	2017-06-09 10:04:23 UTC (rev 6782)
@@ -231,10 +231,6 @@
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
-/////////////////////////////////////////////////////////////////////////////
-// CVTWindow constructor
-
-
 static BOOL MySetLayeredWindowAttributes(HWND hwnd, COLORREF crKey, BYTE bAlpha, DWORD dwFlags)
 {
 	typedef BOOL (WINAPI *func)(HWND,COLORREF,BYTE,DWORD);
@@ -634,6 +630,9 @@
 	return (ret);
 }
 
+/////////////////////////////////////////////////////////////////////////////
+// CVTWindow constructor
+
 CVTWindow::CVTWindow()
 {
 	WNDCLASS wc;

From svnnotify ＠ sourceforge.jp  Fri Jun  9 19:04:30 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 09 Jun 2017 19:04:30 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY3ODRdICBUZXJtaW5hbFNpemUg44Gu5YCk?=
 =?utf-8?b?44Gu44OB44Kn44OD44Kv44KS5by35YyW44GX44Gf44CC?=
Message-ID: <1497002670.056529.69867.nullmailer@users.sourceforge.jp>

Revision: 6784
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6784
Author:   doda
Date:     2017-06-09 19:04:29 +0900 (Fri, 09 Jun 2017)
Log Message:
-----------
TerminalSize の値のチェックを強化した。

・TerminalSize の最大値をチェックするようにした。
・TerminalSize で 0 を許さないようにした
・TerminalSize で値が小さすぎる場合は 80(幅) または 24(高さ) を使うようにした。

TerminalSize=0,0 とかなっていると無限ループになって VT ウィンドウが
表示されなかったけれど、これってバグ扱いにすべき?

Modified Paths:
--------------
    trunk/teraterm/ttpset/ttset.c

-------------- next part --------------
Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c	2017-06-09 10:04:27 UTC (rev 6783)
+++ trunk/teraterm/ttpset/ttset.c	2017-06-09 10:04:29 UTC (rev 6784)
@@ -575,10 +575,14 @@
 	                        Temp, sizeof(Temp), FName);
 	GetNthNum(Temp, 1, &ts->TerminalWidth);
 	GetNthNum(Temp, 2, &ts->TerminalHeight);
-	if (ts->TerminalWidth < 0)
-		ts->TerminalWidth = 1;
-	if (ts->TerminalHeight < 0)
-		ts->TerminalHeight = 1;
+	if (ts->TerminalWidth <= 0)
+		ts->TerminalWidth = 80;
+	else if (ts->TerminalWidth > TermWidthMax)
+		ts->TerminalWidth = TermWidthMax;
+	if (ts->TerminalHeight <= 0)
+		ts->TerminalHeight = 24;
+	else if (ts->TerminalHeight > TermHeightMax)
+		ts->TerminalHeight = TermHeightMax;
 
 	/* Terminal size = Window size */
 	ts->TermIsWin = GetOnOff(Section, "TermIsWin", FName, FALSE);

From svnnotify ＠ sourceforge.jp  Fri Jun  9 19:04:27 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 09 Jun 2017 19:04:27 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY3ODNdIExvYWRUVFNFVCgpICDjgYzlpLE=?=
 =?utf-8?b?5pWX44GX44Gf5pmC44GrIGFib3J0ICgpICDjgZnjgovjgojjgYbjgavjgZc=?=
 =?utf-8?b?44Gf44CC?=
Message-ID: <1497002667.497488.69768.nullmailer@users.sourceforge.jp>

Revision: 6783
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6783
Author:   doda
Date:     2017-06-09 19:04:27 +0900 (Fri, 09 Jun 2017)
Log Message:
-----------
LoadTTSET() が失敗した時に abort() するようにした。

以下の理由で VT ウィンドウが表示される前に無限ループとなるのを防ぐ為。

LoadTTSET() が失敗
⇒ 設定が読み込まれない
⇒ ts.TerminalWidth, ts.TerminalHeight が 0 となる
⇒ buffer.c:InitBuffer() で NumOfColumns, NumOfLines が 0 となる
⇒ buffer.c:ChangeBuffer() で BufferSize が 0 となる
⇒ buffer.c:GetLinePtr() の以下のループが無限ループとなる

	while (Ptr>=BufferSize) {
		Ptr = Ptr - BufferSize;
	}

本来ならば buffer.c の中で NumOfColumns, NumOfLines, BufferSize が
0 になるのを防ぐべきなんだろうけれど、ttpset.dll が読み込めない時点で
まともに動くのが期待できないので abort() しておく。

Modified Paths:
--------------
    trunk/teraterm/teraterm/vtwin.cpp

-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2017-06-09 10:04:23 UTC (rev 6782)
+++ trunk/teraterm/teraterm/vtwin.cpp	2017-06-09 10:04:27 UTC (rev 6783)
@@ -688,6 +688,9 @@
 			if (tempkm!=NULL) free(tempkm);
 #endif
 		}
+		else {
+			abort();
+		}
 
 	} else {
 		// 2\x82???~\x82?v\x83\x8D\x83Z\x83X\x82?\xA8\x82\xA2\x82Ă\xE0\x81A\x83f\x83B\x83X\x83N\x82\xA9\x82\xE7 TERATERM.INI \x82\xF0\x93??B(2004.11.4 yutaka)
@@ -712,7 +715,9 @@
 			}
 #endif
 		}
-
+		else {
+			abort();
+		}
 	}
 
 	/* Parse command line parameters*/

From svnnotify ＠ sourceforge.jp  Fri Jun  9 19:04:39 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 09 Jun 2017 19:04:39 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY3ODddICDmhI/lm7PjgZfjgabjgYTjgao=?=
 =?utf-8?b?44GE5YuV5L2c44Gn44GC44KL44Gf44KB44CB44Kz44Oh44Oz44OI44KS6L+9?=
 =?utf-8?b?5Yqg?=
Message-ID: <1497002679.186768.70053.nullmailer@users.sourceforge.jp>

Revision: 6787
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6787
Author:   doda
Date:     2017-06-09 19:04:39 +0900 (Fri, 09 Jun 2017)
Log Message:
-----------
意図していない動作であるため、コメントを追加

メッセージの国際化には設定を読み込む必要があるが、TTX で設定の読み込みを
フックする為にそれより前に LoadLibrary() する必要があるという矛盾した状態。
UILanguageFile だけ先に読んでおく?

Modified Paths:
--------------
    trunk/teraterm/teraterm/ttplug.c

-------------- next part --------------
Modified: trunk/teraterm/teraterm/ttplug.c
===================================================================
--- trunk/teraterm/teraterm/ttplug.c	2017-06-09 10:04:36 UTC (rev 6786)
+++ trunk/teraterm/teraterm/ttplug.c	2017-06-09 10:04:39 UTC (rev 6787)
@@ -67,6 +67,8 @@
   }
 
   err = GetLastError();
+  // \x8C\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B\x82?\xE6\x82郁\x83b\x83Z\x81[\x83W\x82?\x91\x8D?\xBB\x82\xF0\x8Ds\x82\xC1\x82Ă\xA2\x82邪\x81A\x82\xB1\x82?\x9E\x93_\x82ł??肪
+  // \x82?\xBE\x93??\x9E\x82?\xEA\x82Ă\xA2\x82?\xA2\x88?A\x83\x81\x83b\x83Z\x81[\x83W\x82\xAA\x89p\x8C\xEA\x82?????\xE9\x81B\x97v\x8C\x9F\x93\xA2\x81B
   get_lang_msg("MSG_TT_ERROR", uimsg, sizeof(uimsg), "Tera Term: Error", ts.UILanguageFile);
   get_lang_msg("MSG_LOAD_EXT_ERROR", ts.UIMsg, sizeof(ts.UIMsg), "Cannot load extension %s (%d)", ts.UILanguageFile);
   _snprintf_s(buf, sizeof(buf), _TRUNCATE, ts.UIMsg, fileName, err);

From svnnotify ＠ sourceforge.jp  Fri Jun  9 19:04:32 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 09 Jun 2017 19:04:32 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY3ODVdICBJbml0QnVmZmVyIOWBtOOBpw==?=
 =?utf-8?b?44KCIHRzLlRlcm1pbmFsV2lkdGggLCAgdHMuVGVybWluYWxIZWlnaHQg44Gu?=
 =?utf-8?b?5YCk44Gu44OB44Kn44OD44Kv44KS6KGM44GG44KI44GG44Gr44GX44Gf44CC?=
Message-ID: <1497002672.777030.69916.nullmailer@users.sourceforge.jp>

Revision: 6785
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6785
Author:   doda
Date:     2017-06-09 19:04:32 +0900 (Fri, 09 Jun 2017)
Log Message:
-----------
InitBuffer 側でも ts.TerminalWidth, ts.TerminalHeight の値のチェックを行うようにした。

ts.TerminalWidth, ts.TerminalHeight の値が不正になるパスは全部潰してあるはずだけど念の為。

Modified Paths:
--------------
    trunk/teraterm/teraterm/buffer.c

-------------- next part --------------
Modified: trunk/teraterm/teraterm/buffer.c
===================================================================
--- trunk/teraterm/teraterm/buffer.c	2017-06-09 10:04:29 UTC (rev 6784)
+++ trunk/teraterm/teraterm/buffer.c	2017-06-09 10:04:32 UTC (rev 6785)
@@ -275,6 +275,16 @@
 	NumOfColumns = ts.TerminalWidth;
 	NumOfLines = ts.TerminalHeight;
 
+	if (NumOfColumns <= 0)
+		NumOfColumns = 80;
+	else if (NumOfColumns > TermWidthMax)
+		NumOfColumns = TermWidthMax;
+
+	if (NumOfLines <= 0)
+		NumOfLines = 24;
+	else if (NumOfLines > TermHeightMax)
+		NumOfLines = TermHeightMax;
+
 	/* setup window */
 	if (ts.EnableScrollBuff>0) {
 		if (ts.ScrollBuffSize < NumOfLines) {

From svnnotify ＠ sourceforge.jp  Fri Jun  9 19:04:41 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 09 Jun 2017 19:04:41 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY3ODhdICDlpInmlbDjga7liJ3mnJ/ljJY=?=
 =?utf-8?b?44GZ44KL5aC05omA44KS44KI44KK5pyb44G+44GX44GE5omA44G456e75YuV?=
Message-ID: <1497002681.800215.70130.nullmailer@users.sourceforge.jp>

Revision: 6788
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6788
Author:   doda
Date:     2017-06-09 19:04:41 +0900 (Fri, 09 Jun 2017)
Log Message:
-----------
変数の初期化する場所をより望ましい所へ移動

Modified Paths:
--------------
    trunk/teraterm/teraterm/commlib.c
    trunk/teraterm/teraterm/vtwin.cpp

-------------- next part --------------
Modified: trunk/teraterm/teraterm/commlib.c
===================================================================
--- trunk/teraterm/teraterm/commlib.c	2017-06-09 10:04:39 UTC (rev 6787)
+++ trunk/teraterm/teraterm/commlib.c	2017-06-09 10:04:41 UTC (rev 6788)
@@ -122,6 +122,9 @@
 /* message flag */
 	cv->NoMsg = 0;
 
+	cv->isSSH = 0;
+	cv->TitleRemote[0] = '\0';
+
 	cv->NotifyIcon = NULL;
 }
 

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2017-06-09 10:04:39 UTC (rev 6787)
+++ trunk/teraterm/teraterm/vtwin.cpp	2017-06-09 10:04:41 UTC (rev 6788)
@@ -737,10 +737,6 @@
 	InitKeyboard();
 	SetKeyMap();
 
-	// \x83R\x83}\x83\x93\x83h\x83\x89\x83C\x83\x93\x82ł\xE0\x90?\xE8\x83t\x83@\x83C\x83\x8B\x82ł\xE0\x95ύX\x82\xB5\x82?\xA2\x82?ł\xB1\x82\xB1\x82?\x89\x8A\xFA\x89\xBB (2008.1.25 maya)
-	cv.isSSH = 0;
-	cv.TitleRemote[0] = '\0';
-
 	/* window status */
 	AdjustSize = TRUE;
 	Minimized = FALSE;

From svnnotify ＠ sourceforge.jp  Fri Jun  9 19:04:36 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 09 Jun 2017 19:04:36 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY3ODZdICDnq6/mnKvoqK3lrprjg4DjgqQ=?=
 =?utf-8?b?44Ki44Ot44Kw44Gn44CB56uv5pyr44K144Kk44K644GMIDAg44Gg44Gj44Gf?=
 =?utf-8?b?5aC05ZCI44Gv5aSJ5pu044GX44Gq44GE44KI44GG44Gr44GX44Gf44CC?=
Message-ID: <1497002676.648876.69998.nullmailer@users.sourceforge.jp>

Revision: 6786
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6786
Author:   doda
Date:     2017-06-09 19:04:36 +0900 (Fri, 09 Jun 2017)
Log Message:
-----------
端末設定ダイアログで、端末サイズが 0 だった場合は変更しないようにした。

0 を入力したか、BS 等で値を削除した時が該当。
おそらく入力ミスだと考えられるので、1 にするよりは妥当だと思う。

Modified Paths:
--------------
    trunk/teraterm/ttpdlg/ttdlg.c

-------------- next part --------------
Modified: trunk/teraterm/ttpdlg/ttdlg.c
===================================================================
--- trunk/teraterm/ttpdlg/ttdlg.c	2017-06-09 10:04:32 UTC (rev 6785)
+++ trunk/teraterm/ttpdlg/ttdlg.c	2017-06-09 10:04:36 UTC (rev 6786)
@@ -355,21 +355,29 @@
 					ts = (PTTSet)GetWindowLong(Dialog,DWL_USER);
 
 					if ( ts!=NULL ) {
-						ts->TerminalWidth = GetDlgItemInt(Dialog,IDC_TERMWIDTH,NULL,FALSE);
-						if ( ts->TerminalWidth<1 ) {
-							ts->TerminalWidth = 1;
-						}
-						else if ( ts->TerminalWidth>TermWidthMax ) {
+						int width, height;
+
+						width = GetDlgItemInt(Dialog, IDC_TERMWIDTH, NULL, FALSE);
+						if (width > TermWidthMax) {
 							ts->TerminalWidth = TermWidthMax;
 						}
+						else if (width > 0) {
+							ts->TerminalWidth = width;
+						}
+						else { // 0 \x88?\xBA\x82??\x82?ύX\x82\xB5\x82?\xA2
+							;
+						}
 
-						ts->TerminalHeight = GetDlgItemInt(Dialog,IDC_TERMHEIGHT,NULL,FALSE);
-						if ( ts->TerminalHeight<1 ) {
-							ts->TerminalHeight = 1;
-						}
-						else if ( ts->TerminalHeight>TermHeightMax ) {
+						height = GetDlgItemInt(Dialog, IDC_TERMHEIGHT, NULL, FALSE);
+						if (height > TermHeightMax) {
 							ts->TerminalHeight = TermHeightMax;
 						}
+						else if (height > 0) {
+							ts->TerminalHeight = height;
+						}
+						else { // 0 \x88?\xBA\x82??\x82?ύX\x82\xB5\x82?\xA2
+							;
+						}
 
 						GetRB(Dialog,&ts->TermIsWin,IDC_TERMISWIN,IDC_TERMISWIN);
 						GetRB(Dialog,&ts->AutoWinResize,IDC_TERMRESIZE,IDC_TERMRESIZE);

From svnnotify ＠ sourceforge.jp  Fri Jun  9 22:04:29 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 09 Jun 2017 22:04:29 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY3ODldICB0dG1tYWluLmNwcCDjgYwgU291?=
 =?utf-8?b?cmNlIEZpbGVzIChDKSAg44Gr57Sb44KM6L6844KT44Gn44GE44Gf44Gu44Gn?=
 =?utf-8?b?44CB5q2j44GX44GE5L2N572u44Gr56e75YuV44CC?=
Message-ID: <1497013469.453065.67181.nullmailer@users.sourceforge.jp>

Revision: 6789
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6789
Author:   doda
Date:     2017-06-09 22:04:29 +0900 (Fri, 09 Jun 2017)
Log Message:
-----------
ttmmain.cpp が Source Files (C) に紛れ込んでいたので、正しい位置に移動。

VS2005 以外では未確認。

Modified Paths:
--------------
    trunk/teraterm/ttpmacro/ttpmacro.v10.vcxproj
    trunk/teraterm/ttpmacro/ttpmacro.v10.vcxproj.filters
    trunk/teraterm/ttpmacro/ttpmacro.v11.vcxproj
    trunk/teraterm/ttpmacro/ttpmacro.v11.vcxproj.filters
    trunk/teraterm/ttpmacro/ttpmacro.v12.vcxproj
    trunk/teraterm/ttpmacro/ttpmacro.v12.vcxproj.filters
    trunk/teraterm/ttpmacro/ttpmacro.v14.vcxproj
    trunk/teraterm/ttpmacro/ttpmacro.v14.vcxproj.filters
    trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj
    trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters
    trunk/teraterm/ttpmacro/ttpmacro.v9.vcproj
    trunk/teraterm/ttpmacro/ttpmacro.vcproj

-------------- next part --------------
Modified: trunk/teraterm/ttpmacro/ttpmacro.v10.vcxproj
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.v10.vcxproj	2017-06-09 10:04:41 UTC (rev 6788)
+++ trunk/teraterm/ttpmacro/ttpmacro.v10.vcxproj	2017-06-09 13:04:29 UTC (rev 6789)
@@ -132,6 +132,7 @@
     <ClCompile Include="..\common\stdafx.cpp" />
     <ClCompile Include="ttmacro.cpp" />
     <ClCompile Include="ttmdlg.cpp" />
+    <ClCompile Include="ttmmain.cpp" />
     <ClCompile Include="..\common\i18n.c" />
     <ClCompile Include="ttl.c" />
     <ClCompile Include="..\common\ttlib.c" />
@@ -139,7 +140,6 @@
     <ClCompile Include="ttmdde.c" />
     <ClCompile Include="ttmenc.c" />
     <ClCompile Include="ttmlib.c" />
-    <ClCompile Include="ttmmain.cpp" />
     <ClCompile Include="ttmparse.c" />
     <ClCompile Include="wait4all.c" />
   </ItemGroup>

Modified: trunk/teraterm/ttpmacro/ttpmacro.v10.vcxproj.filters
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.v10.vcxproj.filters	2017-06-09 10:04:41 UTC (rev 6788)
+++ trunk/teraterm/ttpmacro/ttpmacro.v10.vcxproj.filters	2017-06-09 13:04:29 UTC (rev 6789)
@@ -43,6 +43,9 @@
     <ClCompile Include="ttmdlg.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="ttmmain.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\common\i18n.c">
       <Filter>Source Files %28C%29</Filter>
     </ClCompile>
@@ -64,9 +67,6 @@
     <ClCompile Include="ttmlib.c">
       <Filter>Source Files %28C%29</Filter>
     </ClCompile>
-    <ClCompile Include="ttmmain.cpp">
-      <Filter>Source Files %28C%29</Filter>
-    </ClCompile>
     <ClCompile Include="ttmparse.c">
       <Filter>Source Files %28C%29</Filter>
     </ClCompile>
@@ -140,4 +140,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

Modified: trunk/teraterm/ttpmacro/ttpmacro.v11.vcxproj
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.v11.vcxproj	2017-06-09 10:04:41 UTC (rev 6788)
+++ trunk/teraterm/ttpmacro/ttpmacro.v11.vcxproj	2017-06-09 13:04:29 UTC (rev 6789)
@@ -132,6 +132,7 @@
     <ClCompile Include="..\common\stdafx.cpp" />
     <ClCompile Include="ttmacro.cpp" />
     <ClCompile Include="ttmdlg.cpp" />
+    <ClCompile Include="ttmmain.cpp" />
     <ClCompile Include="..\common\i18n.c" />
     <ClCompile Include="ttl.c" />
     <ClCompile Include="..\common\ttlib.c" />
@@ -139,7 +140,6 @@
     <ClCompile Include="ttmdde.c" />
     <ClCompile Include="ttmenc.c" />
     <ClCompile Include="ttmlib.c" />
-    <ClCompile Include="ttmmain.cpp" />
     <ClCompile Include="ttmparse.c" />
     <ClCompile Include="wait4all.c" />
   </ItemGroup>

Modified: trunk/teraterm/ttpmacro/ttpmacro.v11.vcxproj.filters
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.v11.vcxproj.filters	2017-06-09 10:04:41 UTC (rev 6788)
+++ trunk/teraterm/ttpmacro/ttpmacro.v11.vcxproj.filters	2017-06-09 13:04:29 UTC (rev 6789)
@@ -43,6 +43,9 @@
     <ClCompile Include="ttmdlg.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="ttmmain.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\common\i18n.c">
       <Filter>Source Files %28C%29</Filter>
     </ClCompile>
@@ -64,9 +67,6 @@
     <ClCompile Include="ttmlib.c">
       <Filter>Source Files %28C%29</Filter>
     </ClCompile>
-    <ClCompile Include="ttmmain.cpp">
-      <Filter>Source Files %28C%29</Filter>
-    </ClCompile>
     <ClCompile Include="ttmparse.c">
       <Filter>Source Files %28C%29</Filter>
     </ClCompile>
@@ -140,4 +140,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

Modified: trunk/teraterm/ttpmacro/ttpmacro.v12.vcxproj
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.v12.vcxproj	2017-06-09 10:04:41 UTC (rev 6788)
+++ trunk/teraterm/ttpmacro/ttpmacro.v12.vcxproj	2017-06-09 13:04:29 UTC (rev 6789)
@@ -136,12 +136,12 @@
     <ClCompile Include="statdlg.cpp" />
     <ClCompile Include="ttl.c" />
     <ClCompile Include="ttmacro.cpp" />
+    <ClCompile Include="ttmmain.cpp" />
     <ClCompile Include="ttmbuff.c" />
     <ClCompile Include="ttmdde.c" />
     <ClCompile Include="ttmdlg.cpp" />
     <ClCompile Include="ttmenc.c" />
     <ClCompile Include="ttmlib.c" />
-    <ClCompile Include="ttmmain.cpp" />
     <ClCompile Include="ttmparse.c" />
     <ClCompile Include="wait4all.c" />
   </ItemGroup>

Modified: trunk/teraterm/ttpmacro/ttpmacro.v12.vcxproj.filters
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.v12.vcxproj.filters	2017-06-09 10:04:41 UTC (rev 6788)
+++ trunk/teraterm/ttpmacro/ttpmacro.v12.vcxproj.filters	2017-06-09 13:04:29 UTC (rev 6789)
@@ -43,6 +43,9 @@
     <ClCompile Include="ttmdlg.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="ttmmain.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\common\i18n.c">
       <Filter>Source Files %28C%29</Filter>
     </ClCompile>
@@ -64,9 +67,6 @@
     <ClCompile Include="ttmlib.c">
       <Filter>Source Files %28C%29</Filter>
     </ClCompile>
-    <ClCompile Include="ttmmain.cpp">
-      <Filter>Source Files %28C%29</Filter>
-    </ClCompile>
     <ClCompile Include="ttmparse.c">
       <Filter>Source Files %28C%29</Filter>
     </ClCompile>
@@ -140,4 +140,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

Modified: trunk/teraterm/ttpmacro/ttpmacro.v14.vcxproj
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.v14.vcxproj	2017-06-09 10:04:41 UTC (rev 6788)
+++ trunk/teraterm/ttpmacro/ttpmacro.v14.vcxproj	2017-06-09 13:04:29 UTC (rev 6789)
@@ -136,12 +136,12 @@
     <ClCompile Include="statdlg.cpp" />
     <ClCompile Include="ttl.c" />
     <ClCompile Include="ttmacro.cpp" />
+    <ClCompile Include="ttmmain.cpp" />
     <ClCompile Include="ttmbuff.c" />
     <ClCompile Include="ttmdde.c" />
     <ClCompile Include="ttmdlg.cpp" />
     <ClCompile Include="ttmenc.c" />
     <ClCompile Include="ttmlib.c" />
-    <ClCompile Include="ttmmain.cpp" />
     <ClCompile Include="ttmparse.c" />
     <ClCompile Include="wait4all.c" />
   </ItemGroup>

Modified: trunk/teraterm/ttpmacro/ttpmacro.v14.vcxproj.filters
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.v14.vcxproj.filters	2017-06-09 10:04:41 UTC (rev 6788)
+++ trunk/teraterm/ttpmacro/ttpmacro.v14.vcxproj.filters	2017-06-09 13:04:29 UTC (rev 6789)
@@ -43,6 +43,9 @@
     <ClCompile Include="ttmdlg.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="ttmmain.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\common\i18n.c">
       <Filter>Source Files %28C%29</Filter>
     </ClCompile>
@@ -64,9 +67,6 @@
     <ClCompile Include="ttmlib.c">
       <Filter>Source Files %28C%29</Filter>
     </ClCompile>
-    <ClCompile Include="ttmmain.cpp">
-      <Filter>Source Files %28C%29</Filter>
-    </ClCompile>
     <ClCompile Include="ttmparse.c">
       <Filter>Source Files %28C%29</Filter>
     </ClCompile>
@@ -140,4 +140,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

Modified: trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj	2017-06-09 10:04:41 UTC (rev 6788)
+++ trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj	2017-06-09 13:04:29 UTC (rev 6789)
@@ -137,12 +137,12 @@
     <ClCompile Include="statdlg.cpp" />
     <ClCompile Include="ttl.c" />
     <ClCompile Include="ttmacro.cpp" />
+    <ClCompile Include="ttmmain.cpp" />
     <ClCompile Include="ttmbuff.c" />
     <ClCompile Include="ttmdde.c" />
     <ClCompile Include="ttmdlg.cpp" />
     <ClCompile Include="ttmenc.c" />
     <ClCompile Include="ttmlib.c" />
-    <ClCompile Include="ttmmain.cpp" />
     <ClCompile Include="ttmparse.c" />
     <ClCompile Include="wait4all.c" />
   </ItemGroup>

Modified: trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters	2017-06-09 10:04:41 UTC (rev 6788)
+++ trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters	2017-06-09 13:04:29 UTC (rev 6789)
@@ -43,6 +43,9 @@
     <ClCompile Include="ttmdlg.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="ttmmain.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\common\i18n.c">
       <Filter>Source Files %28C%29</Filter>
     </ClCompile>
@@ -64,9 +67,6 @@
     <ClCompile Include="ttmlib.c">
       <Filter>Source Files %28C%29</Filter>
     </ClCompile>
-    <ClCompile Include="ttmmain.cpp">
-      <Filter>Source Files %28C%29</Filter>
-    </ClCompile>
     <ClCompile Include="ttmparse.c">
       <Filter>Source Files %28C%29</Filter>
     </ClCompile>
@@ -140,4 +140,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

Modified: trunk/teraterm/ttpmacro/ttpmacro.v9.vcproj
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.v9.vcproj	2017-06-09 10:04:41 UTC (rev 6788)
+++ trunk/teraterm/ttpmacro/ttpmacro.v9.vcproj	2017-06-09 13:04:29 UTC (rev 6789)
@@ -234,6 +234,10 @@
 				RelativePath="ttmdlg.cpp"
 				>
 			</File>
+			<File
+				RelativePath="ttmmain.cpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -376,10 +380,6 @@
 				>
 			</File>
 			<File
-				RelativePath="ttmmain.cpp"
-				>
-			</File>
-			<File
 				RelativePath="ttmparse.c"
 				>
 			</File>

Modified: trunk/teraterm/ttpmacro/ttpmacro.vcproj
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.vcproj	2017-06-09 10:04:41 UTC (rev 6788)
+++ trunk/teraterm/ttpmacro/ttpmacro.vcproj	2017-06-09 13:04:29 UTC (rev 6789)
@@ -235,6 +235,10 @@
 				RelativePath="ttmdlg.cpp"
 				>
 			</File>
+			<File
+				RelativePath="ttmmain.cpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -381,10 +385,6 @@
 				>
 			</File>
 			<File
-				RelativePath="ttmmain.cpp"
-				>
-			</File>
-			<File
 				RelativePath="ttmparse.c"
 				>
 			</File>

From svnnotify ＠ sourceforge.jp  Fri Jun  9 23:32:28 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 09 Jun 2017 23:32:28 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY3OTBdIFN0YXJ0VGVyYVRlcm0oKSAg44Gu?=
 =?utf-8?b?5a6f6KGM44K/44Kk44Of44Oz44Kw44KSIFRUWEluaXQgKCkgIOOBruWJjQ==?=
 =?utf-8?b?44Gr56e75YuV44CC?=
Message-ID: <1497018748.771492.49984.nullmailer@users.sourceforge.jp>

Revision: 6790
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6790
Author:   doda
Date:     2017-06-09 23:32:28 +0900 (Fri, 09 Jun 2017)
Log Message:
-----------
StartTeraTerm() の実行タイミングを TTXInit() の前に移動。

以下の二つの理由の為。

・TTX のロードを安全なディレクトリで行う (DLL Hijacking 対策)
・TTX のロード時点で ts.HomeDir が設定されているようにする

Modified Paths:
--------------
    trunk/teraterm/teraterm/vtwin.cpp

-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2017-06-09 13:04:29 UTC (rev 6789)
+++ trunk/teraterm/teraterm/vtwin.cpp	2017-06-09 14:32:28 UTC (rev 6790)
@@ -648,6 +648,7 @@
 	PKeyMap tempkm;
 #endif
 	int fuLoad = LR_DEFAULTCOLOR;
+	BOOL isFirstInstance;
 
 #ifdef _DEBUG
   ::_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
@@ -656,13 +657,14 @@
 	// \x97\xE1\x8AO\x83n\x83\x93\x83h\x83\x89\x82?t\x83b\x83N (2007.9.30 yutaka)
 	SetUnhandledExceptionFilter(ApplicationFaultHandler);
 
+	CommInit(&cv);
+	isFirstInstance = StartTeraTerm(&ts);
+
 	TTXInit(&ts, &cv); /* TTPLUG */
 
-	CommInit(&cv);
-
 	MsgDlgHelp = RegisterWindowMessage(HELPMSGSTRING);
 
-	if (StartTeraTerm(&ts)) {
+	if (isFirstInstance) {
 		/* first instance */
 		if (LoadTTSET()) {
 			/* read setup info from "teraterm.ini" */

From svnnotify ＠ sourceforge.jp  Fri Jun  9 23:32:34 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 09 Jun 2017 23:32:34 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY3OTJdICBUZXJhIFRlcm0g5pys5L2T6Zai?=
 =?utf-8?b?6YCjIERMTCDjgpLjg5Xjg6vjg5HjgrnjgacgTG9hZExpYnJhcnkgKCkgIA==?=
 =?utf-8?b?44GZ44KL44KI44GG44Gr44GX44Gf44CC?=
Message-ID: <1497018754.594893.50097.nullmailer@users.sourceforge.jp>

Revision: 6792
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6792
Author:   doda
Date:     2017-06-09 23:32:34 +0900 (Fri, 09 Jun 2017)
Log Message:
-----------
Tera Term 本体関連 DLL をフルパスで LoadLibrary() するようにした。

Modified Paths:
--------------
    trunk/teraterm/teraterm/filesys.cpp
    trunk/teraterm/teraterm/teklib.c
    trunk/teraterm/teraterm/ttdialog.c
    trunk/teraterm/teraterm/ttsetup.c
    trunk/teraterm/teraterm/ttwinman.c
    trunk/teraterm/teraterm/ttwinman.h

-------------- next part --------------
Modified: trunk/teraterm/teraterm/filesys.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys.cpp	2017-06-09 14:32:31 UTC (rev 6791)
+++ trunk/teraterm/teraterm/filesys.cpp	2017-06-09 14:32:34 UTC (rev 6792)
@@ -119,7 +119,7 @@
 	else
 		TTFILECount = 0;
 
-	HTTFILE = LoadLibrary("TTPFILE.DLL");
+	HTTFILE = LoadHomeDLL("TTPFILE.DLL");
 	if (HTTFILE == NULL)
 		return FALSE;
 

Modified: trunk/teraterm/teraterm/teklib.c
===================================================================
--- trunk/teraterm/teraterm/teklib.c	2017-06-09 14:32:31 UTC (rev 6791)
+++ trunk/teraterm/teraterm/teklib.c	2017-06-09 14:32:34 UTC (rev 6792)
@@ -7,6 +7,7 @@
 #include "teraterm.h"
 #include "tttypes.h"
 #include "tektypes.h"
+#include "ttwinman.h"
 
 #include "teklib.h"
 
@@ -58,7 +59,7 @@
   BOOL Err;
 
   if (HTTTEK != NULL) return TRUE;
-  HTTTEK = LoadLibrary("TTPTEK.DLL");
+  HTTTEK = LoadHomeDLL("TTPTEK.DLL");
   if (HTTTEK == NULL) return FALSE;
 
   Err = FALSE;

Modified: trunk/teraterm/teraterm/ttdialog.c
===================================================================
--- trunk/teraterm/teraterm/ttdialog.c	2017-06-09 14:32:31 UTC (rev 6791)
+++ trunk/teraterm/teraterm/ttdialog.c	2017-06-09 14:32:34 UTC (rev 6792)
@@ -44,7 +44,7 @@
 	if (HTTDLG == NULL) {
 		TTDLGUseCount = 0;
 
-		HTTDLG = LoadLibrary("TTPDLG.DLL");
+		HTTDLG = LoadHomeDLL("TTPDLG.DLL");
 		if (HTTDLG==NULL) return FALSE;
 
 		TTDLGSetUILanguageFile(ts.UILanguageFile);

Modified: trunk/teraterm/teraterm/ttsetup.c
===================================================================
--- trunk/teraterm/teraterm/ttsetup.c	2017-06-09 14:32:31 UTC (rev 6791)
+++ trunk/teraterm/teraterm/ttsetup.c	2017-06-09 14:32:34 UTC (rev 6792)
@@ -9,6 +9,8 @@
 #include "ttsetup.h"
 #include "ttplug.h" /* TTPLUG */
 
+#include "ttwinman.h"
+
 PReadIniFile ReadIniFile;
 PWriteIniFile WriteIniFile;
 PReadKeyboardCnf ReadKeyboardCnf;
@@ -34,7 +36,7 @@
   BOOL Err;
 
   if (HTTSET != NULL) return TRUE;
-  HTTSET = LoadLibrary("TTPSET.DLL");
+  HTTSET = LoadHomeDLL("TTPSET.DLL");
   if (HTTSET == NULL) return FALSE;
 
   Err = FALSE;

Modified: trunk/teraterm/teraterm/ttwinman.c
===================================================================
--- trunk/teraterm/teraterm/ttwinman.c	2017-06-09 14:32:31 UTC (rev 6791)
+++ trunk/teraterm/teraterm/ttwinman.c	2017-06-09 14:32:34 UTC (rev 6792)
@@ -275,3 +275,10 @@
   if (H2!=0)
     PostMessage(H2,WM_USER_CHANGETBAR,0,0);
 }
+
+HMODULE LoadHomeDLL(const char *DLLname)
+{
+	char DLLpath[MAX_PATH];
+	_snprintf_s(DLLpath, sizeof(DLLpath), _TRUNCATE, "%s\\%s", ts.HomeDir, DLLname);
+	return LoadLibrary(DLLpath);
+}

Modified: trunk/teraterm/teraterm/ttwinman.h
===================================================================
--- trunk/teraterm/teraterm/ttwinman.h	2017-06-09 14:32:31 UTC (rev 6791)
+++ trunk/teraterm/teraterm/ttwinman.h	2017-06-09 14:32:34 UTC (rev 6792)
@@ -13,6 +13,7 @@
 void ChangeTitle();
 void SwitchMenu();
 void SwitchTitleBar();
+HMODULE LoadHomeDLL(const char *DLLname);
 
 extern HWND HVTWin;
 extern HWND HTEKWin;

From svnnotify ＠ sourceforge.jp  Fri Jun  9 23:32:31 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 09 Jun 2017 23:32:31 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY3OTFdICBUVFgg44KS44OV44Or44OR44K5?=
 =?utf-8?b?44GnIExvYWRMaWJyYXJ5ICgpICDjgZnjgovjgojjgYbjgavjgZfjgZ/jgII=?=
Message-ID: <1497018751.704437.50040.nullmailer@users.sourceforge.jp>

Revision: 6791
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6791
Author:   doda
Date:     2017-06-09 23:32:31 +0900 (Fri, 09 Jun 2017)
Log Message:
-----------
TTX をフルパスで LoadLibrary() するようにした。

Modified Paths:
--------------
    trunk/teraterm/teraterm/ttplug.c

-------------- next part --------------
Modified: trunk/teraterm/teraterm/ttplug.c
===================================================================
--- trunk/teraterm/teraterm/ttplug.c	2017-06-09 14:32:28 UTC (rev 6790)
+++ trunk/teraterm/teraterm/ttplug.c	2017-06-09 14:32:31 UTC (rev 6791)
@@ -83,27 +83,17 @@
   //if (getenv("TERATERM_EXTENSIONS") != NULL) {
   if (1) {
     char buf[1024];
-    int index;
     struct _finddata_t searchData;
     long searchHandle;
 
-    if (GetModuleFileName(hInst, buf, sizeof(buf)) == 0) {
-      return;
-    }
-    for (index = strlen(buf) - 1;
-    index >= 0 && buf[index] != '\\' && buf[index] != ':' && buf[index] != '/';
-      index--) {
-    }
-    index++;
-    strncpy_s(buf + index, sizeof(buf) - index, "TTX*.DLL", _TRUNCATE);
+    _snprintf_s(buf, sizeof(buf), _TRUNCATE, "%s\\TTX*.DLL", ts->HomeDir);
 
-    searchHandle = _findfirst(buf,&searchData);
+    searchHandle = _findfirst(buf, &searchData);
     if (searchHandle != -1L) {
-      loadExtension(&extensionList, searchData.name);
-
-      while (_findnext(searchHandle, &searchData)==0) {
-	loadExtension(&extensionList, searchData.name);
-      }
+      do {
+	_snprintf_s(buf, sizeof(buf), _TRUNCATE, "%s\\%s", ts->HomeDir, searchData.name);
+	loadExtension(&extensionList, buf);
+      } while (_findnext(searchHandle, &searchData)==0);
       _findclose(searchHandle);
     }
 

From svnnotify ＠ sourceforge.jp  Fri Jun  9 23:32:37 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 09 Jun 2017 23:32:37 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B6793=5D_SetDllDirectory=28=29=2C_Set?=
 =?utf-8?b?RGVmYXVsdERsbERpcmVjdG9yaWVzKCkgIOOBjOS9v+OBiOOCi+WgtOWQiA==?=
 =?utf-8?b?44Gv5ZG844G244KI44GG44Gr44GX44Gf44CC?=
Message-ID: <1497018757.837217.50176.nullmailer@users.sourceforge.jp>

Revision: 6793
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6793
Author:   doda
Date:     2017-06-09 23:32:37 +0900 (Fri, 09 Jun 2017)
Log Message:
-----------
SetDllDirectory(), SetDefaultDllDirectories() が使える場合は呼ぶようにした。

DLL Hijacking 対策。
現行 OS 向け。古い OS では効果ないけれど。

DLL 検索パスからプログラムディレクトリを外したが、それでもプログラムディレクトリはセキュアである必要がある。
なぜなら、TTXなんちゃら.DLL という DLL を作成されたら……

Modified Paths:
--------------
    trunk/teraterm/keycode/keycode.c
    trunk/teraterm/teraterm/teraterm.cpp
    trunk/teraterm/ttpmacro/ttmacro.cpp
    trunk/ttpmenu/ttpmenu.cpp

-------------- next part --------------
Modified: trunk/teraterm/keycode/keycode.c
===================================================================
--- trunk/teraterm/keycode/keycode.c	2017-06-09 14:32:34 UTC (rev 6792)
+++ trunk/teraterm/keycode/keycode.c	2017-06-09 14:32:37 UTC (rev 6793)
@@ -27,12 +27,30 @@
                    LPSTR lpszCmdLine,
                    int nCmdShow)
 {
+	typedef BOOL (WINAPI *pSetDllDir)(LPCSTR);
+	typedef BOOL (WINAPI *pSetDefDllDir)(DWORD);
+
 	WNDCLASS wc;
 	MSG msg;
 	HWND hWnd;
+	HMODULE module;
+	pSetDllDir setDllDir;
+	pSetDefDllDir setDefDllDir;
 
 	DoCover_IsDebuggerPresent();
 
+	if ((module = GetModuleHandle("kernel32.dll")) != NULL) {
+		if ((setDefDllDir = (pSetDefDllDir)GetProcAddress(module, "SetDefaultDllDirectories")) != NULL) {
+			// SetDefaultDllDirectories() が使える場合は、検索パスを %WINDOWS%\system32 のみに設定する
+			(*setDefDllDir)((DWORD)0x00000800); // LOAD_LIBRARY_SEARCH_SYSTEM32
+		}
+		else if ((setDllDir = (pSetDllDir)GetProcAddress(module, "SetDllDirectoryA")) != NULL) {
+			// SetDefaultDllDirectories() が使えなくても、SetDllDirectory() が使える場合は
+			// カレントディレクトリだけでも検索パスからはずしておく。
+			(*setDllDir)("");
+		}
+	}
+
 	if(!hPrevInstance) {
 		wc.style = CS_OWNDC | CS_VREDRAW | CS_HREDRAW;
 		wc.lpfnWndProc = MainWndProc;

Modified: trunk/teraterm/teraterm/teraterm.cpp
===================================================================
--- trunk/teraterm/teraterm/teraterm.cpp	2017-06-09 14:32:34 UTC (rev 6792)
+++ trunk/teraterm/teraterm/teraterm.cpp	2017-06-09 14:32:37 UTC (rev 6793)
@@ -38,6 +38,24 @@
 
 CTeraApp::CTeraApp()
 {
+	typedef BOOL (WINAPI *pSetDllDir)(LPCSTR);
+	typedef BOOL (WINAPI *pSetDefDllDir)(DWORD);
+
+	HMODULE module;
+	pSetDllDir setDllDir;
+	pSetDefDllDir setDefDllDir;
+
+	if ((module = GetModuleHandle("kernel32.dll")) != NULL) {
+		if ((setDefDllDir = (pSetDefDllDir)GetProcAddress(module, "SetDefaultDllDirectories")) != NULL) {
+			// SetDefaultDllDirectories() \x82\xAA\x8Eg\x82\xA6\x82\xE9\x8F?\x82?A\x8C\x9F\x8D\xF5\x83p\x83X\x82\xF0 %WINDOWS%\system32 \x82?????\x82\xE9
+			(*setDefDllDir)((DWORD)0x00000800); // LOAD_LIBRARY_SEARCH_SYSTEM32
+		}
+		else if ((setDllDir = (pSetDllDir)GetProcAddress(module, "SetDllDirectoryA")) != NULL) {
+			// SetDefaultDllDirectories() \x82\xAA\x8Eg\x82\xA6\x82?\xAD\x82Ă\xE0\x81ASetDllDirectory() \x82\xAA\x8Eg\x82\xA6\x82\xE9\x8F?\x82\xCD
+			// \x83J\x83\x8C\x83\x93\x83g\x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82\xBE\x82\xAF\x82ł\xE0\x8C\x9F\x8D\xF5\x83p\x83X\x82\xA9\x82\xE7\x82?\xB8\x82\xB5\x82Ă\xA8\x82\xAD\x81B
+			(*setDllDir)("");
+		}
+	}
 }
 
 // CTeraApp instance

Modified: trunk/teraterm/ttpmacro/ttmacro.cpp
===================================================================
--- trunk/teraterm/ttpmacro/ttmacro.cpp	2017-06-09 14:32:34 UTC (rev 6792)
+++ trunk/teraterm/ttpmacro/ttmacro.cpp	2017-06-09 14:32:37 UTC (rev 6793)
@@ -35,6 +35,24 @@
 
 CCtrlApp::CCtrlApp()
 {
+	typedef BOOL (WINAPI *pSetDllDir)(LPCSTR);
+	typedef BOOL (WINAPI *pSetDefDllDir)(DWORD);
+
+	HMODULE module;
+	pSetDllDir setDllDir;
+	pSetDefDllDir setDefDllDir;
+
+	if ((module = GetModuleHandle("kernel32.dll")) != NULL) {
+		if ((setDefDllDir = (pSetDefDllDir)GetProcAddress(module, "SetDefaultDllDirectories")) != NULL) {
+			// SetDefaultDllDirectories() が使える場合は、検索パスを %WINDOWS%\system32 のみに設定する
+			(*setDefDllDir)((DWORD)0x00000800); // LOAD_LIBRARY_SEARCH_SYSTEM32
+		}
+		else if ((setDllDir = (pSetDllDir)GetProcAddress(module, "SetDllDirectoryA")) != NULL) {
+			// SetDefaultDllDirectories() が使えなくても、SetDllDirectory() が使える場合は
+			// カレントディレクトリだけでも検索パスからはずしておく。
+			(*setDllDir)("");
+		}
+	}
 }
 
 /////////////////////////////////////////////////////////////////////////////

Modified: trunk/ttpmenu/ttpmenu.cpp
===================================================================
--- trunk/ttpmenu/ttpmenu.cpp	2017-06-09 14:32:34 UTC (rev 6792)
+++ trunk/ttpmenu/ttpmenu.cpp	2017-06-09 14:32:37 UTC (rev 6793)
@@ -2632,6 +2632,9 @@
    ======1=========2=========3=========4=========5=========6=========7======= */
 int WINAPI WinMain(HINSTANCE hI, HINSTANCE, LPSTR nCmdLine, int nCmdShow)
 {
+	typedef BOOL (WINAPI *pSetDllDir)(LPCSTR);
+	typedef BOOL (WINAPI *pSetDefDllDir)(DWORD);
+
 	MSG			msg;
 	HWND		hWnd;
 	WNDCLASS	winClass;
@@ -2638,7 +2641,22 @@
 	char		uimsg[MAX_UIMSG];
 	DWORD		dwErr;
 	int			fuLoad = LR_DEFAULTCOLOR;
+	HMODULE		module;
+	pSetDllDir	setDllDir;
+	pSetDefDllDir	setDefDllDir;
 
+	if ((module = GetModuleHandle("kernel32.dll")) != NULL) {
+		if ((setDefDllDir = (pSetDefDllDir)GetProcAddress(module, "SetDefaultDllDirectories")) != NULL) {
+			// SetDefaultDllDirectories() \x82\xAA\x8Eg\x82\xA6\x82\xE9\x8F?\x82?A\x8C\x9F\x8D\xF5\x83p\x83X\x82\xF0 %WINDOWS%\system32 \x82?????\x82\xE9
+			(*setDefDllDir)((DWORD)0x00000800); // LOAD_LIBRARY_SEARCH_SYSTEM32
+		}
+		else if ((setDllDir = (pSetDllDir)GetProcAddress(module, "SetDllDirectoryA")) != NULL) {
+			// SetDefaultDllDirectories() \x82\xAA\x8Eg\x82\xA6\x82?\xAD\x82Ă\xE0\x81ASetDllDirectory() \x82\xAA\x8Eg\x82\xA6\x82\xE9\x8F?\x82\xCD
+			// \x83J\x83\x8C\x83\x93\x83g\x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82\xBE\x82\xAF\x82ł\xE0\x8C\x9F\x8D\xF5\x83p\x83X\x82\xA9\x82\xE7\x82?\xB8\x82\xB5\x82Ă\xA8\x82\xAD\x81B
+			(*setDllDir)("");
+		}
+	}
+
 	checkIniFile();		//INI\x83t\x83@\x83C\x83\x8B/\x83\x8C\x83W\x83X\x83g\x83\x8A\x90?\xD6
 
 	GetUILanguageFile(UILanguageFile, sizeof(UILanguageFile));

From svnnotify ＠ sourceforge.jp  Sat Jun 10 09:12:44 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sat, 10 Jun 2017 09:12:44 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY3OTRdICDmloflrZfjgrPjg7zjg4njgpIg?=
 =?utf-8?b?VVRGLTgg44GL44KJIFNoaWZ0X0pJUyDjgavmiLvjgZk=?=
Message-ID: <1497053564.568572.46927.nullmailer@users.sourceforge.jp>

Revision: 6794
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6794
Author:   maya
Date:     2017-06-10 09:12:44 +0900 (Sat, 10 Jun 2017)
Log Message:
-----------
文字コードを UTF-8 から Shift_JIS に戻す

Modified Paths:
--------------
    trunk/teraterm/keycode/keycode.c
    trunk/teraterm/ttpmacro/ttmacro.cpp

-------------- next part --------------
Modified: trunk/teraterm/keycode/keycode.c
===================================================================
--- trunk/teraterm/keycode/keycode.c	2017-06-09 14:32:37 UTC (rev 6793)
+++ trunk/teraterm/keycode/keycode.c	2017-06-10 00:12:44 UTC (rev 6794)
@@ -41,12 +41,12 @@
 
 	if ((module = GetModuleHandle("kernel32.dll")) != NULL) {
 		if ((setDefDllDir = (pSetDefDllDir)GetProcAddress(module, "SetDefaultDllDirectories")) != NULL) {
-			// SetDefaultDllDirectories() が使える場合は、検索パスを %WINDOWS%\system32 のみに設定する
+			// SetDefaultDllDirectories() \x82\xAA\x8Eg\x82\xA6\x82\xE9\x8F?\x82?A\x8C\x9F\x8D\xF5\x83p\x83X\x82\xF0 %WINDOWS%\system32 \x82?????\x82\xE9
 			(*setDefDllDir)((DWORD)0x00000800); // LOAD_LIBRARY_SEARCH_SYSTEM32
 		}
 		else if ((setDllDir = (pSetDllDir)GetProcAddress(module, "SetDllDirectoryA")) != NULL) {
-			// SetDefaultDllDirectories() が使えなくても、SetDllDirectory() が使える場合は
-			// カレントディレクトリだけでも検索パスからはずしておく。
+			// SetDefaultDllDirectories() \x82\xAA\x8Eg\x82\xA6\x82?\xAD\x82Ă\xE0\x81ASetDllDirectory() \x82\xAA\x8Eg\x82\xA6\x82\xE9\x8F?\x82\xCD
+			// \x83J\x83\x8C\x83\x93\x83g\x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82\xBE\x82\xAF\x82ł\xE0\x8C\x9F\x8D\xF5\x83p\x83X\x82\xA9\x82\xE7\x82?\xB8\x82\xB5\x82Ă\xA8\x82\xAD\x81B
 			(*setDllDir)("");
 		}
 	}

Modified: trunk/teraterm/ttpmacro/ttmacro.cpp
===================================================================
--- trunk/teraterm/ttpmacro/ttmacro.cpp	2017-06-09 14:32:37 UTC (rev 6793)
+++ trunk/teraterm/ttpmacro/ttmacro.cpp	2017-06-10 00:12:44 UTC (rev 6794)
@@ -44,12 +44,12 @@
 
 	if ((module = GetModuleHandle("kernel32.dll")) != NULL) {
 		if ((setDefDllDir = (pSetDefDllDir)GetProcAddress(module, "SetDefaultDllDirectories")) != NULL) {
-			// SetDefaultDllDirectories() が使える場合は、検索パスを %WINDOWS%\system32 のみに設定する
+			// SetDefaultDllDirectories() \x82\xAA\x8Eg\x82\xA6\x82\xE9\x8F?\x82?A\x8C\x9F\x8D\xF5\x83p\x83X\x82\xF0 %WINDOWS%\system32 \x82?????\x82\xE9
 			(*setDefDllDir)((DWORD)0x00000800); // LOAD_LIBRARY_SEARCH_SYSTEM32
 		}
 		else if ((setDllDir = (pSetDllDir)GetProcAddress(module, "SetDllDirectoryA")) != NULL) {
-			// SetDefaultDllDirectories() が使えなくても、SetDllDirectory() が使える場合は
-			// カレントディレクトリだけでも検索パスからはずしておく。
+			// SetDefaultDllDirectories() \x82\xAA\x8Eg\x82\xA6\x82?\xAD\x82Ă\xE0\x81ASetDllDirectory() \x82\xAA\x8Eg\x82\xA6\x82\xE9\x8F?\x82\xCD
+			// \x83J\x83\x8C\x83\x93\x83g\x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82\xBE\x82\xAF\x82ł\xE0\x8C\x9F\x8D\xF5\x83p\x83X\x82\xA9\x82\xE7\x82?\xB8\x82\xB5\x82Ă\xA8\x82\xAD\x81B
 			(*setDllDir)("");
 		}
 	}

From svnnotify ＠ sourceforge.jp  Sat Jun 10 12:05:43 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sat, 10 Jun 2017 12:05:43 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B6795=5D__LogTimestampFormat_?=
 =?utf-8?b?44KSIFJGQyAzMzM5IOOBo+OBveOBj+OBquOCi+OCiOOBhuS/ruatow==?=
Message-ID: <1497063943.353882.91819.nullmailer@users.sourceforge.jp>

Revision: 6795
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6795
Author:   maya
Date:     2017-06-10 12:05:42 +0900 (Sat, 10 Jun 2017)
Log Message:
-----------
LogTimestampFormat を RFC 3339 っぽくなるよう修正

Modified Paths:
--------------
    trunk/installer/release/TERATERM.INI
    trunk/teraterm/ttpset/ttset.c

-------------- next part --------------
Modified: trunk/installer/release/TERATERM.INI
===================================================================
--- trunk/installer/release/TERATERM.INI	2017-06-10 00:12:44 UTC (rev 6794)
+++ trunk/installer/release/TERATERM.INI	2017-06-10 03:05:42 UTC (rev 6795)
@@ -539,9 +539,9 @@
 LockTUID=on
 
 ; Timestamp format of Log each line
-;   %a %b %e %H:%M:%S.%N %Y ... Sun Jun  4 21:12:40.123 JST 2017
-;   %Y/%m/%d %H:%M:%S.%N    ... 2017/06/04 21:12:40.123
-LogTimestampFormat=%a %b %e %H:%M:%S.%N %Y
+;   %Y-%m-%d %H:%M:%S.%N    ... 2017-06-04 21:12:40.123
+;   %a %b %e %H:%M:%S.%N %Y ... Sun Jun  4 21:12:40.123 2017
+LogTimestampFormat=%Y-%m-%d %H:%M:%S.%N
 
 ; Use UTC/GMT time for Log each line timestamp
 LogTimestampUTC=off

Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c	2017-06-10 00:12:44 UTC (rev 6794)
+++ trunk/teraterm/ttpset/ttset.c	2017-06-10 03:05:42 UTC (rev 6795)
@@ -1057,7 +1057,7 @@
 	ts->LogAllBuffIncludedInFirst = GetOnOff(Section, "LogIncludeScreenBuffer", FName, FALSE);
 
 	/* Timestamp format of Log each line */
-	GetPrivateProfileString(Section, "LogTimestampFormat", "%a %b %e %H:%M:%S.%N %Y",
+	GetPrivateProfileString(Section, "LogTimestampFormat", "%Y-%m-%d %H:%M:%S.%N",
 	                        ts->LogTimestampFormat, sizeof(ts->LogTimestampFormat),
 	                        FName);
 

From svnnotify ＠ sourceforge.jp  Sun Jun 11 08:20:57 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sun, 11 Jun 2017 08:20:57 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY3OTZdICByNjc5NSDkuI3otrPliIY=?=
Message-ID: <1497136857.238693.76453.nullmailer@users.sourceforge.jp>

Revision: 6796
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6796
Author:   maya
Date:     2017-06-11 08:20:56 +0900 (Sun, 11 Jun 2017)
Log Message:
-----------
r6795 不足分

Revision Links:
--------------
    http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6795

Modified Paths:
--------------
    trunk/doc/en/html/setup/teraterm-ini.html
    trunk/doc/en/html/setup/teraterm-misc.html
    trunk/doc/ja/html/setup/teraterm-ini.html
    trunk/doc/ja/html/setup/teraterm-misc.html

-------------- next part --------------
Modified: trunk/doc/en/html/setup/teraterm-ini.html
===================================================================
--- trunk/doc/en/html/setup/teraterm-ini.html	2017-06-10 03:05:42 UTC (rev 6795)
+++ trunk/doc/en/html/setup/teraterm-ini.html	2017-06-10 23:20:56 UTC (rev 6796)
@@ -831,7 +831,7 @@
 	</tr>
 	<tr>
 		<td id="LogTimestampFormat"><a href="teraterm-misc.html#LogTimestampFormat">LogTimestampFormat</a></td>
-		<td style="width:250px;">%a %b %e %H:%M:%S.%N %Y</td>
+		<td style="width:250px;">%Y-%m-%d %H:%M:%S.%N</td>
 		<td style="width:250px;">&lt;-</td>
 		<td></td>
 	</tr>

Modified: trunk/doc/en/html/setup/teraterm-misc.html
===================================================================
--- trunk/doc/en/html/setup/teraterm-misc.html	2017-06-10 03:05:42 UTC (rev 6795)
+++ trunk/doc/en/html/setup/teraterm-misc.html	2017-06-10 23:20:56 UTC (rev 6796)
@@ -377,14 +377,14 @@
 
 <pre>
 Example:
-; 2017/06/04 21:12:40.123
-LogTimestampFormat=%Y/%m/%d %H:%M:%S.%N
+; Sun Jun  4 21:12:40.123 2017
+LogTimestampFormat=%a %b %e %H:%M:%S.%N %Y
 </pre>
 
 <pre>
 Default:
-; Sun Jun  4 21:12:40.123 JST 2017
-LogTimestampFormat=%a %b %e %H:%M:%S.%N %Y
+; 2017-06-04 21:12:40.123
+LogTimestampFormat=%Y-%m-%d %H:%M:%S.%N
 </pre>
 
 

Modified: trunk/doc/ja/html/setup/teraterm-ini.html
===================================================================
--- trunk/doc/ja/html/setup/teraterm-ini.html	2017-06-10 03:05:42 UTC (rev 6795)
+++ trunk/doc/ja/html/setup/teraterm-ini.html	2017-06-10 23:20:56 UTC (rev 6796)
@@ -831,7 +831,7 @@
 	</tr>
 	<tr>
 		<td id="LogTimestampFormat"><a href="teraterm-misc.html#LogTimestampFormat">LogTimestampFormat</a></td>
-		<td style="width:250px;">%a %b %e %H:%M:%S.%N %Y</td>
+		<td style="width:250px;">%Y-%m-%d %H:%M:%S.%N</td>
 		<td style="width:250px;">&lt;-</td>
 		<td></td>
 	</tr>

Modified: trunk/doc/ja/html/setup/teraterm-misc.html
===================================================================
--- trunk/doc/ja/html/setup/teraterm-misc.html	2017-06-10 03:05:42 UTC (rev 6795)
+++ trunk/doc/ja/html/setup/teraterm-misc.html	2017-06-10 23:20:56 UTC (rev 6796)
@@ -397,14 +397,14 @@
 
 <pre>
 \x97\xE1:
-; 2017/06/04 21:12:40.123
-LogTimestampFormat=%Y/%m/%d %H:%M:%S.%N
+; Sun Jun  4 21:12:40.123 2017
+LogTimestampFormat=%a %b %e %H:%M:%S.%N %Y
 </pre>
 
 <pre>
 \x8F?\xAA\x8E\x9E:
-; Sun Jun  4 21:12:40.123 JST 2017
-LogTimestampFormat=%a %b %e %H:%M:%S.%N %Y
+; 2017-06-04 21:12:40.123
+LogTimestampFormat=%Y-%m-%d %H:%M:%S.%N
 </pre>
 
 

From svnnotify ＠ sourceforge.jp  Mon Jun 12 10:47:12 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 12 Jun 2017 10:47:12 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY3OTddICDlpInmm7TlsaXmrbTkv67mraMg?=
 =?utf-8?q?=28_r6795=29?=
Message-ID: <1497232032.669377.96416.nullmailer@users.sourceforge.jp>

Revision: 6797
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6797
Author:   doda
Date:     2017-06-12 10:47:12 +0900 (Mon, 12 Jun 2017)
Log Message:
-----------
変更履歴修正 (r6795)

Revision Links:
--------------
    http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6795

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2017-06-10 23:20:56 UTC (rev 6796)
+++ trunk/doc/en/html/about/history.html	2017-06-12 01:47:12 UTC (rev 6797)
@@ -38,6 +38,7 @@
       <!--li>\x83\x8D\x83O\x82?s\x93\xAA\x82??\xC1\x82\xB7\x82\xE9\x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82?t\x83H\x81[\x83}\x83b\x83g\x82\xF0\x8Ew\x92\xE8\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B
         <ul>
           <li>teraterm.ini \x82\xC9 <a href="../setup/teraterm-misc.html#LogTimestampFormat">LogTimestampFormat</a> \x83G\x83\x93\x83g\x83\x8A\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B\x83f\x83t\x83H\x83\x8B\x83g\x82\xCD"%a %b %e %H:%M:%S.%N %Y"\x81B</li>
+          <li>\x83f\x83t\x83H\x83\x8B\x83g\x82?t\x83H\x81[\x83}\x83b\x83g\x82\xCD RFC 3339 \x8C`\x8E\xAE\x82?ύX\x82\xB3\x82?\x81B\x88?O\x82?t\x83H\x81[\x83}\x83b\x83g\x82??\xB7\x82?\xCD LogTimestampFormat \x82\xC9 "%a %b %e %H:%M:%S.%N %Y" \x82\xF0\x90??\x82\xE9\x81B</li>
         </ul></li>
       <li>\x83\x8D\x83O\x82?s\x93\xAA\x82??\xC1\x82\xB7\x82\xE9\x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82?\x9E\x8D\x8F\x82\xC9UTC\x82\xF0\x8Eg\x97p\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B
         <ul>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2017-06-10 23:20:56 UTC (rev 6796)
+++ trunk/doc/ja/html/about/history.html	2017-06-12 01:47:12 UTC (rev 6797)
@@ -37,7 +37,8 @@
     <ul>
       <li>\x83\x8D\x83O\x82?s\x93\xAA\x82??\xC1\x82\xB7\x82\xE9\x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82?t\x83H\x81[\x83}\x83b\x83g\x82\xF0\x8Ew\x92\xE8\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B
         <ul>
-          <li>teraterm.ini \x82\xC9 <a href="../setup/teraterm-misc.html#LogTimestampFormat">LogTimestampFormat</a> \x83G\x83\x93\x83g\x83\x8A\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B\x83f\x83t\x83H\x83\x8B\x83g\x82\xCD"%a %b %e %H:%M:%S.%N %Y"\x81B</li>
+          <li>teraterm.ini \x82\xC9 <a href="../setup/teraterm-misc.html#LogTimestampFormat">LogTimestampFormat</a> \x83G\x83\x93\x83g\x83\x8A\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B\x83f\x83t\x83H\x83\x8B\x83g\x82\xCD"%Y-%m-%d %H:%M:%S.%N"\x81B</li>
+          <li>\x83f\x83t\x83H\x83\x8B\x83g\x82?t\x83H\x81[\x83}\x83b\x83g\x82\xCD RFC 3339 \x8C`\x8E\xAE\x82?ύX\x82\xB3\x82?\x81B\x88?O\x82?t\x83H\x81[\x83}\x83b\x83g\x82??\xB7\x82?\xCD LogTimestampFormat \x82\xC9 "%a %b %e %H:%M:%S.%N %Y" \x82\xF0\x90??\x82\xE9\x81B</li>
         </ul></li>
       <li>\x83\x8D\x83O\x82?s\x93\xAA\x82??\xC1\x82\xB7\x82\xE9\x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82?\x9E\x8D\x8F\x82\xC9UTC\x82\xF0\x8Eg\x97p\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B
         <ul>

From svnnotify ＠ sourceforge.jp  Mon Jun 12 19:43:25 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 12 Jun 2017 19:43:25 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY3OThdICDmnaHku7bliIblspDjgYzlpJo=?=
 =?utf-8?b?44GZ44GO44Gm6KaL6YCa44GX44GM5oKq44GE44Gu44Gn44CB5YWx6YCa6YOo?=
 =?utf-8?b?5YiG44KS6Zai5pWw44Gr5ous44KK44Gg44GX44Gm5YiG5bKQ44KS5LiA566H?=
 =?utf-8?b?5omA44Gr44G+44Go44KB44Gf44CC?=
Message-ID: <1497264205.817772.13392.nullmailer@users.sourceforge.jp>

Revision: 6798
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6798
Author:   doda
Date:     2017-06-12 19:43:25 +0900 (Mon, 12 Jun 2017)
Log Message:
-----------
条件分岐が多すぎて見通しが悪いので、共通部分を関数に括りだして分岐を一箇所にまとめた。

コネクションタイプ独自の処理が増えるようならば、関数に括りだすようにする。

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/ssh.c

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2017-06-12 01:47:12 UTC (rev 6797)
+++ trunk/ttssh2/ttxssh/ssh.c	2017-06-12 10:43:25 UTC (rev 6798)
@@ -7372,6 +7372,47 @@
 	return TRUE;
 }
 
+/*
+ * SSH_MSG_CHANNEL_REQUEST \x91\x97\x90M\x8A?\x94
+ * type-specific data \x82\xAA string \x82\xC5 0 \x81` 2 \x82?\xA8\x82?Ή\x9E\x81B
+ * \x8Eg\x97p\x82\xB5\x82?\xA2\x83\x81\x83b\x83Z\x81[\x83W\x82\xCD NULL \x82?\xB7\x82\xE9\x81B
+ * type-specific data \x82\xAA\x91\xBC\x82?`\x8E\xAE\x82??Ή\x9E\x82\xB5\x82Ă\xA2\x82?\xA2\x82?ŁA\x8E\xA9\x91O\x82ő\x97\x82鎖\x81B
+ */
+static BOOL send_channel_request_gen(PTInstVar pvar, Channel_t *c, unsigned char *req, int want_reply, unsigned char *msg1, unsigned char *msg2)
+{
+	buffer_t *msg;
+	unsigned char *outmsg;
+	int len;
+
+	msg = buffer_init();
+	if (msg == NULL) {
+		return FALSE;
+	}
+
+	buffer_put_int(msg, c->remote_id);
+	buffer_put_string(msg, req, strlen(req));
+
+	buffer_put_char(msg, want_reply);
+
+	if (msg1) {
+		buffer_put_string(msg, msg1, strlen(msg1));
+	}
+	if (msg2) {
+		buffer_put_string(msg, msg1, strlen(msg1));
+	}
+
+	len = buffer_len(msg);
+	outmsg = begin_send_packet(pvar, SSH2_MSG_CHANNEL_REQUEST, len);
+	memcpy(outmsg, buffer_ptr(msg), len);
+	finish_send_packet(pvar);
+	buffer_free(msg);
+
+	logprintf(pvar, LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH2_MSG_CHANNEL_REQUEST. "
+	          "local: %d, remote: %d, request-type: %s, msg1=%s, msg2=%s",
+	          c->self_id, c->remote_id, req, msg1 ? msg1 : "none", msg2 ? msg2 : "none");
+	return TRUE;
+}
+
 BOOL send_pty_request(PTInstVar pvar, Channel_t *c)
 {
 	buffer_t *msg, *ttymsg;
@@ -7459,18 +7500,17 @@
 }
 
 static BOOL handle_SSH2_open_confirm(PTInstVar pvar)
-{	
-	buffer_t *msg;
-	char *s;
-	unsigned char *outmsg;
+{
 	int len;
 	char *data;
 	int id, remote_id;
 	Channel_t *c;
+	char buff[MAX_PATH + 30];
+
 #ifdef DONT_WANTCONFIRM
-	int wantconfirm = 0; // false
+	int want_reply = 0; // false
 #else
-	int wantconfirm = 1; // true
+	int want_reply = 1; // true
 #endif
 
 	notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_OPEN_CONFIRMATION was received.", LOG_LEVEL_VERBOSE);
@@ -7505,97 +7545,42 @@
 	c->remote_maxpacket = get_uint32_MSBfirst(data);
 	data += 4;
 
-	if (c->type == TYPE_PORTFWD) {
+	switch (c->type) {
+	case TYPE_PORTFWD:
 		// port-forwading\x82\xCC"direct-tcpip"\x82\xAA\x90\xAC\x8C\xF7\x81B
 		FWD_confirmed_open(pvar, c->local_num, -1);
-		return TRUE;
-	}
+		break;
 
-	if (c->type == TYPE_SHELL) {
+	case TYPE_SHELL:
 		// \x83|\x81[\x83g\x83t\x83H\x83\x8F\x81[\x83f\x83B\x83\x93\x83O\x82?\x80\x94\xF5 (2005.2.26, 2005.6.21 yutaka)
 		// \x83V\x83F\x83\x8B\x83I\x81[\x83v\x83\x93\x82\xB5\x82\xBD\x82\xA0\x82?\xC9 X11 \x82?v\x8B\x81\x82\xF0\x8Fo\x82\xB3\x82?\xAD\x82Ă??\xE7\x82?\xA2\x81B(2005.7.3 yutaka)
 		FWD_prep_forwarding(pvar);
 		FWD_enter_interactive_mode(pvar);
-	}
 
-	//debug_print(100, data, len);
-
-	if (c->type == TYPE_SHELL) {
 		// \x83G\x81[\x83W\x83F\x83\x93\x83g\x93]\x91\x97 (2008.11.25 maya)
 		if (pvar->session_settings.ForwardAgent) {
 			// pty-req \x82\xE6\x82\xE8\x91O\x82?\x8A\x83N\x83G\x83X\x83g\x82\xB5\x82?\xA2\x82?G\x83\x89\x81[\x82??\xE9\x96?l
-
-			msg = buffer_init();
-			if (msg == NULL) {
-				// TODO: error check
-				return FALSE;
-			}
-			buffer_put_int(msg, c->remote_id);
-			s = "auth-agent-req ＠ openssh.com";
-			buffer_put_string(msg, s, strlen(s));
-			buffer_put_char(msg, 1); // want reply
-			len = buffer_len(msg);
-			outmsg = begin_send_packet(pvar, SSH2_MSG_CHANNEL_REQUEST, len);
-			memcpy(outmsg, buffer_ptr(msg), len);
-			finish_send_packet(pvar);
-			buffer_free(msg);
-
-			notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_REQUEST was sent at handle_SSH2_channel_success().", LOG_LEVEL_VERBOSE);
-			return TRUE;
+			return send_channel_request_gen(pvar, c, "auth-agent-req ＠ openssh.com", 1, NULL, NULL);
 		}
 		else {
 			return send_pty_request(pvar, c);
 		}
-	}
+		break;
 
-	msg = buffer_init();
-	if (msg == NULL) {
-		// TODO: error check
-		return FALSE;
-	}
-
-	buffer_put_int(msg, remote_id);
-	if (c->type == TYPE_SCP) {
-		s = "exec";
-	} else if (c->type == TYPE_SFTP || c->type == TYPE_SUBSYSTEM_GEN) {
-		s = "subsystem";
-	} else {
-		s = "";  // NOT REACHED
-	}
-	buffer_put_string(msg, s, strlen(s));
-	buffer_put_char(msg, wantconfirm);  // wantconfirm (disable\x82?ύX 2005/3/28 yutaka)
-
-	if (c->type == TYPE_SCP) {
-		char sbuf[MAX_PATH + 30];
+	case TYPE_SCP:
 		if (c->scp.dir == TOREMOTE) {
-			_snprintf_s(sbuf, sizeof(sbuf), _TRUNCATE, "scp -t %s", c->scp.remotefile);
+			_snprintf_s(buff, sizeof(buff), _TRUNCATE, "scp -t %s", c->scp.remotefile);
 
 		} else {
 			// \x83t\x83@\x83C\x83\x8B\x96\xBC\x82??\xF0\x8A??\xEA\x82Ă\xA2\x82Ă\xE0\x82悢\x82悤\x82?A\x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xF0\x93\xF1\x8Fd\x88\xF8\x97p\x95\x84\x82ň??B
 			// (2014.7.13 yutaka)
-			_snprintf_s(sbuf, sizeof(sbuf), _TRUNCATE, "scp -p -f \"%s\"", c->scp.remotefile);
+			_snprintf_s(buff, sizeof(buff), _TRUNCATE, "scp -p -f \"%s\"", c->scp.remotefile);
+		}
 
+		if (!send_channel_request_gen(pvar, c, "exec", want_reply, buff, NULL)) {
+			return FALSE;;
 		}
-		buffer_put_string(msg, sbuf, strlen(sbuf));
-	}
-	else if (c->type == TYPE_SFTP) {
-		char *sbuf = "sftp";
-		buffer_put_string(msg, sbuf, strlen(sbuf));
-	}
-	else if (c->type == TYPE_SUBSYSTEM_GEN) {
-		buffer_put_string(msg, pvar->subsystem_name, strlen(pvar->subsystem_name));
-		pvar->session_nego_status = 0;
-	}
 
-	len = buffer_len(msg);
-	outmsg = begin_send_packet(pvar, SSH2_MSG_CHANNEL_REQUEST, len);
-	memcpy(outmsg, buffer_ptr(msg), len);
-	finish_send_packet(pvar);
-	buffer_free(msg);
-
-	notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_REQUEST was sent at handle_SSH2_open_confirm().", LOG_LEVEL_VERBOSE);
-
-	if (c->type == TYPE_SCP) {
 		// SCP\x82\xC5 remote-to-local \x82??\x82?A\x83T\x81[\x83o\x82\xA9\x82\xE7\x82?t\x83@\x83C\x83\x8B\x91\x97\x90M\x97v\x8B\x81\x82\xF0\x8Fo\x82\xB7\x81B
 		// \x82\xB1\x82?\x9E\x93_\x82ł\xCD remote window size \x82\xAA"0"\x82??ŁA\x82\xB7\x82\xAE\x82??\x97\x82\xE7\x82\xEA\x82?\xA2\x82\xAA\x81A\x92x\x89\x84\x91\x97\x90M\x8F\x88\x97\x9D\x82ő\x97\x82\xE7\x82\xEA\x82\xE9\x81B
 		// (2007.12.27 yutaka)
@@ -7603,18 +7588,32 @@
 			char ch = '\0';
 			SSH2_send_channel_data(pvar, c, &ch, 1, 0);
 		}
+		break;
 
-	} else if (c->type == TYPE_SFTP) {
+	case TYPE_SFTP:
+		if (!send_channel_request_gen(pvar, c, "subsystem", want_reply, "sftp", NULL)) {
+			return FALSE;;
+		}
+
 		// SFTP\x83Z\x83b\x83V\x83\x87\x83\x93\x82\xF0\x8AJ\x8En\x82\xB7\x82邽\x82??l\x83S\x83V\x83G\x81[\x83V\x83\x87\x83\x93\x82\xF0\x8Ds\x82\xA4\x81B
 		// (2012.5.3 yutaka)
 		sftp_do_init(pvar, c);
+		break;
 
+	case TYPE_SUBSYSTEM_GEN:
+		if (!send_channel_request_gen(pvar, c, "subsystem", want_reply, pvar->subsystem_name, NULL)) {
+			return FALSE;;
+		}
+		pvar->session_nego_status = 0;
+		break;
+
+	default: // NOT REACHED
+		logprintf(pvar, LOG_LEVEL_ERROR, __FUNCTION__ ": Invalid channel-type. (%d)", c->type);
+		return FALSE;
 	}
-
 	return TRUE;
 }
 
-
 // SSH2 port-forwarding \x82?\xA8\x82\xA2\x82ăZ\x83b\x83V\x83\x87\x83\x93\x82\xAA\x83I\x81[\x83v\x83\x93\x82ł\xAB\x82?\xA2\x8F?\x82?T\x81[\x83o\x82\xA9\x82\xE7\x82?\x8A\x83v\x83\x89\x83C\x81i\x8E\xB8\x94s\x81j
 static BOOL handle_SSH2_open_failure(PTInstVar pvar)
 {	
@@ -7679,7 +7678,6 @@
 	return TRUE;
 }
 
-
 // SSH2_MSG_GLOBAL_REQUEST for OpenSSH 6.8
 static BOOL handle_SSH2_client_global_request(PTInstVar pvar)
 {
@@ -7764,15 +7762,11 @@
 
 static BOOL handle_SSH2_channel_success(PTInstVar pvar)
 {	
-	buffer_t *msg;
-	char *s;
-	unsigned char *outmsg;
-	int len;
 	Channel_t *c;
 #ifdef DONT_WANTCONFIRM
-	int wantconfirm = 0; // false
+	int want_reply = 0; // false
 #else
-	int wantconfirm = 1; // true
+	int want_reply = 1; // true
 #endif
 	char buf[128];
 
@@ -7793,11 +7787,7 @@
 
 	} else if (pvar->session_nego_status == 2) {
 		pvar->session_nego_status = 3;
-		msg = buffer_init();
-		if (msg == NULL) {
-			// TODO: error check
-			return FALSE;
-		}
+
 		// find channel by shell id(2005.2.27 yutaka)
 		c = ssh2_channel_lookup(pvar->shell_id);
 		if (c == NULL) {
@@ -7804,22 +7794,12 @@
 			// TODO: error check
 			return FALSE;
 		}
-		buffer_put_int(msg, c->remote_id);
-//		buffer_put_int(msg, pvar->remote_id);
 
-		s = "shell";
-		buffer_put_string(msg, s, strlen(s));  // ctype
-		buffer_put_char(msg, wantconfirm);   // wantconfirm (disable\x82?ύX 2005/3/28 yutaka)
+		if (!send_channel_request_gen(pvar, c, "shell", want_reply, NULL, NULL)) {
+			return FALSE;;
+		}
 
-		len = buffer_len(msg);
-		outmsg = begin_send_packet(pvar, SSH2_MSG_CHANNEL_REQUEST, len);
-		memcpy(outmsg, buffer_ptr(msg), len);
-		finish_send_packet(pvar);
-		buffer_free(msg);
-
-		notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_REQUEST was sent at handle_SSH2_channel_success().", LOG_LEVEL_VERBOSE);
-
-		if (wantconfirm == 0) {
+		if (want_reply == 0) {
 			handle_SSH2_channel_success(pvar);
 		}
 
@@ -7838,7 +7818,6 @@
 	Channel_t *c;
 	char *data;
 	int channel_id;
-	char buf[128];
 
 	data = pvar->ssh_state.payload;
 	channel_id = get_uint32_MSBfirst(data);
@@ -7864,12 +7843,10 @@
 			if (pvar->session_nego_status == 1) {
 				// \x83\x8A\x83\x82\x81[\x83g\x82\xC5 auth-agent-req ＠ openssh.com \x82\xAA\x83T\x83|\x81[\x83g\x82\xB3\x82\xEA\x82Ă?\xA2\x82?\xC5
 				// \x83G\x83\x89\x81[\x82?C\x82?\xB9\x82\xB8\x8E\x9F\x82?i\x82\xDE
+				notify_verbose_message(pvar,
+					"auth-agent-req ＠ openssh.com is not supported by remote host.",
+					LOG_LEVEL_VERBOSE);
 
-				strncpy_s(buf, sizeof(buf),
-					  "auth-agent-req ＠ openssh.com is not supported by remote host.",
-					  _TRUNCATE);
-				notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
-
 				return send_pty_request(pvar, c);
 			}
 		}

From svnnotify ＠ sourceforge.jp  Mon Jun 12 19:43:32 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 12 Jun 2017 19:43:32 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY4MDBdICDjg63jgrDlh7rlipvlvLfljJYg?=
 =?utf-8?b?KCBTU0gyX01TR19DSEFOTkVMX1JFUVVFU1Qg6YCB5L+h6Zai6YCjICk=?=
Message-ID: <1497264212.041506.13492.nullmailer@users.sourceforge.jp>

Revision: 6800
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6800
Author:   doda
Date:     2017-06-12 19:43:31 +0900 (Mon, 12 Jun 2017)
Log Message:
-----------
ログ出力強化 (SSH2_MSG_CHANNEL_REQUEST 送信関連)

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/ssh.c

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2017-06-12 10:43:28 UTC (rev 6799)
+++ trunk/ttssh2/ttxssh/ssh.c	2017-06-12 10:43:31 UTC (rev 6800)
@@ -2848,17 +2848,20 @@
 			unsigned char FAR *outmsg =
 				begin_send_packet(pvar, SSH_CMSG_WINDOW_SIZE, 16);
 
-			set_uint32(outmsg, rows);
-			set_uint32(outmsg + 4, cols);
-			set_uint32(outmsg + 8, x);
-			set_uint32(outmsg + 12, y);
+			set_uint32(outmsg, rows);     // window height (characters)
+			set_uint32(outmsg + 4, cols); // window width  (characters)
+			set_uint32(outmsg + 8, x);    // window width  (pixels)
+			set_uint32(outmsg + 12, y);   // window height (pixels)
 			finish_send_packet(pvar);
+			logprintf(pvar, LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH_CMSG_WINDOW_SIZE. "
+			          "cols: %d, rows: %d, x: %d, y: %d", cols, rows, x, y);
 		}
 
-	} else if (SSHv2(pvar)) { // \x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y\x95ύX\x92?m\x82??\xC1 (2005.1.4 yutaka)
-		                      // SSH2\x82\xA9\x82?\xA4\x82\xA9\x82?`\x83F\x83b\x83N\x82\xE0\x8Ds\x82\xA4\x81B(2005.1.5 yutaka)
+	} else if (SSHv2(pvar)) {
+		// \x83^\x81[\x83~\x83i\x83\x8B\x83T\x83C\x83Y\x95ύX\x92?m\x82??\xC1 (2005.1.4 yutaka)
+		// SSH2\x82\xA9\x82?\xA4\x82\xA9\x82?`\x83F\x83b\x83N\x82\xE0\x8Ds\x82\xA4\x81B(2005.1.5 yutaka)
 		buffer_t *msg;
-		char *s;
+		char *req_type = "window-change";
 		unsigned char *outmsg;
 		int len;
 		Channel_t *c;
@@ -2873,13 +2876,12 @@
 			return;
 		}
 		buffer_put_int(msg, c->remote_id);
-		s = "window-change";
-		buffer_put_string(msg, s, strlen(s));
-		buffer_put_char(msg, 0);  // wantconfirm
-		buffer_put_int(msg, pvar->ssh_state.win_cols);  // columns
-		buffer_put_int(msg, pvar->ssh_state.win_rows);  // lines
-		buffer_put_int(msg, x);  // window width (pixel):
-		buffer_put_int(msg, y);  // window height (pixel):
+		buffer_put_string(msg, req_type, strlen(req_type));
+		buffer_put_char(msg, 0);    // want_reply
+		buffer_put_int(msg, cols);  // columns
+		buffer_put_int(msg, rows);  // lines
+		buffer_put_int(msg, x);     // window width (pixel):
+		buffer_put_int(msg, y);     // window height (pixel):
 		len = buffer_len(msg);
 		outmsg = begin_send_packet(pvar, SSH2_MSG_CHANNEL_REQUEST, len);
 		memcpy(outmsg, buffer_ptr(msg), len);
@@ -2886,28 +2888,25 @@
 		finish_send_packet(pvar);
 		buffer_free(msg);
 
-		notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_REQUEST was sent at SSH_notify_win_size().", LOG_LEVEL_VERBOSE);
+		logprintf(pvar, LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH2_MSG_CHANNEL_REQUEST. "
+		          "local: %d, remote: %d, request-type: %s, cols: %d, rows: %d, x: %d, y: %d",
+		          c->self_id, c->remote_id, req_type, cols, rows, x, y);
 
 	} else {
 		// SSH\x82ł?\xA2\x8F?\x82?\xBD\x82\xE0\x82\xB5\x82?\xA2\x81B
-
 	}
-
 }
 
-// \x83u\x83\x8C\x81[\x83N\x90M\x8D\x86\x82?\xE9\x81B
-// OpenSSH \x82\xCC"~B"\x82?\x8A\x93\x96\x82\xB7\x82\xE9\x81B\x82\xBD\x82\xBE\x82\xB5\x81ASSH2\x82??B
+// \x83u\x83\x8C\x81[\x83N\x90M\x8D\x86\x82?\xE9 -- RFC 4335
+// OpenSSH \x82\xCC"~B"\x82?\x8A\x93\x96\x82\xB7\x82\xE9\x81B
 // (2010.9.27 yutaka)
 int SSH_notify_break_signal(PTInstVar pvar)
 {
 	int ret = 0;
 
-	if (SSHv1(pvar)) {
-		// \x89\xBD\x82\xE0\x82\xB5\x82?\xA2\x81B
-
-	} else if (SSHv2(pvar)) { 
+	if (SSHv2(pvar)) { // SSH2 \x82??Ή\x9E
 		buffer_t *msg;
-		char *s;
+		char *req_type = "break";
 		unsigned char *outmsg;
 		int len;
 		Channel_t *c;
@@ -2921,10 +2920,9 @@
 			goto error;
 		}
 		buffer_put_int(msg, c->remote_id);
-		s = "break";
-		buffer_put_string(msg, s, strlen(s));
-		buffer_put_char(msg, 0);  // wantconfirm
-		buffer_put_int(msg, 1000);  
+		buffer_put_string(msg, req_type, strlen(req_type));
+		buffer_put_char(msg, 0);  // want_reply
+		buffer_put_int(msg, 1000);  // break-length (msec)
 		len = buffer_len(msg);
 		outmsg = begin_send_packet(pvar, SSH2_MSG_CHANNEL_REQUEST, len);
 		memcpy(outmsg, buffer_ptr(msg), len);
@@ -2931,13 +2929,11 @@
 		finish_send_packet(pvar);
 		buffer_free(msg);
 
-		notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_REQUEST was sent at SSH_notify_break_signal().", LOG_LEVEL_VERBOSE);
+		logprintf(pvar, LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH2_MSG_CHANNEL_REQUEST. "
+		          "local: %d, remote: %d, request-type: %s, break-length: %d",
+		          c->self_id, c->remote_id, req_type, 1000);
 
 		ret = 1;
-
-	} else {
-		// SSH\x82ł?\xA2\x8F?\x82?\xBD\x82\xE0\x82\xB5\x82?\xA2\x81B
-
 	}
 
 error:
@@ -3680,7 +3676,7 @@
 	} else {
 		// SSH2: X11 port-forwarding (2005.7.2 yutaka)
 		buffer_t *msg;
-		char *s;
+		char *req_type = "x11-req";
 		unsigned char *outmsg;
 		int len;
 		Channel_t *c;
@@ -3709,15 +3705,12 @@
 		newdata[newlen - 1] = '\0';
 
 		buffer_put_int(msg, c->remote_id);
-		s = "x11-req";
-		buffer_put_string(msg, s, strlen(s)); // service name
-		buffer_put_char(msg, 0);  // want confirm (false)
-		buffer_put_char(msg, 0);  // XXX bool single connection
+		buffer_put_string(msg, req_type, strlen(req_type)); // service name
+		buffer_put_char(msg, 0);  // want_reply (false)
+		buffer_put_char(msg, 0);  // single connection
 
-		s = auth_protocol; // MIT-MAGIC-COOKIE-1
-		buffer_put_string(msg, s, strlen(s));
-		s = newdata;
-		buffer_put_string(msg, s, strlen(s));
+		buffer_put_string(msg, auth_protocol, strlen(auth_protocol)); // protocol ("MIT-MAGIC-COOKIE-1")
+		buffer_put_string(msg, newdata, strlen(newdata)); // cookie
 
 		buffer_put_int(msg, screen_num);
 
@@ -3727,7 +3720,9 @@
 		finish_send_packet(pvar);
 		buffer_free(msg);
 
-		notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_REQUEST was sent at SSH_request_X11_forwarding().", LOG_LEVEL_VERBOSE);
+		logprintf(pvar, LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH2_MSG_CHANNEL_REQUEST. "
+		          "local: %d, remote: %d, request-type: %s, proto: %s, cookie: %s, screen: %d",
+		          c->self_id, c->remote_id, req_type, auth_protocol, newdata, screen_num);
 
 		free(newdata);
 	}
@@ -7420,13 +7415,13 @@
 BOOL send_pty_request(PTInstVar pvar, Channel_t *c)
 {
 	buffer_t *msg, *ttymsg;
-	char *s = "pty-req";  // pseudo terminal\x82?\x8A\x83N\x83G\x83X\x83g
+	char *req_type = "pty-req";  // pseudo terminal\x82?\x8A\x83N\x83G\x83X\x83g
 	unsigned char *outmsg;
 	int len, x, y;
 #ifdef DONT_WANTCONFIRM
-	int wantconfirm = 0; // false
+	int want_reply = 0; // false
 #else
-	int wantconfirm = 1; // true
+	int want_reply = 1; // true
 #endif
 
 	// pty open
@@ -7443,11 +7438,10 @@
 	}
 
 	buffer_put_int(msg, c->remote_id);
-	buffer_put_string(msg, s, strlen(s));
-	buffer_put_char(msg, wantconfirm);  // wantconfirm (disable\x82?ύX 2005/3/28 yutaka)
+	buffer_put_string(msg, req_type, strlen(req_type));
+	buffer_put_char(msg, want_reply);  // want_reply (disable\x82?ύX 2005/3/28 yutaka)
 
-	s = pvar->ts->TermType; // TERM
-	buffer_put_string(msg, s, strlen(s));
+	buffer_put_string(msg, pvar->ts->TermType, strlen(pvar->ts->TermType));
 	buffer_put_int(msg, pvar->ssh_state.win_cols);  // columns
 	buffer_put_int(msg, pvar->ssh_state.win_rows);  // lines
 	get_window_pixel_size(pvar, &x, &y);
@@ -7494,9 +7488,17 @@
 	buffer_free(ttymsg);
 
 	notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_REQUEST was sent at send_pty_request().", LOG_LEVEL_VERBOSE);
+	logprintf(pvar, LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH2_MSG_CHANNEL_REQUEST. "
+	          "local: %d, remote: %d, request-type: %s, "
+	          "term: %s, cols: %d, rows: %d, x: %d, y: %d, "
+	          "out-speed: %d, in-speed: %d, verase: %s, onlcr: %s",
+	          c->self_id, c->remote_id, req_type, pvar->ts->TermType,
+	          pvar->ssh_state.win_cols, pvar->ssh_state.win_rows, x, y,
+	          9600, 9600, (pvar->ts->BSKey==IdBS)?"^h":"^?", (pvar->ts->CRReceive==IdBS)?"on":"off");
+
 	pvar->session_nego_status = 2;
 
-	if (wantconfirm == 0) {
+	if (want_reply == 0) {
 		handle_SSH2_channel_success(pvar);
 	}
 

From svnnotify ＠ sourceforge.jp  Mon Jun 12 19:43:29 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 12 Jun 2017 19:43:29 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY3OTldICBTU0h2MSDjgafnq6/mnKvjgrU=?=
 =?utf-8?b?44Kk44K65aSJ5pu05pmC44Gr44OU44Kv44K744Or5Y2Y5L2N44Gn44Gu5YCk?=
 =?utf-8?b?44KC6YCB44KL44KI44GG44Gr44GX44Gf44CC?=
Message-ID: <1497264209.155950.13445.nullmailer@users.sourceforge.jp>

Revision: 6799
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6799
Author:   doda
Date:     2017-06-12 19:43:28 +0900 (Mon, 12 Jun 2017)
Log Message:
-----------
SSHv1 で端末サイズ変更時にピクセル単位での値も送るようにした。

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html
    trunk/ttssh2/ttxssh/ssh.c

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2017-06-12 10:43:25 UTC (rev 6798)
+++ trunk/doc/en/html/about/history.html	2017-06-12 10:43:28 UTC (rev 6799)
@@ -2918,6 +2918,8 @@
   <!--li>Bug fixes
     <ul>
       <li>\x83p\x83X\x83\x8F\x81[\x83h\x94F\x8F?\x9E\x82?p\x83X\x83\x8F\x81[\x83h\x95ύX\x83_\x83C\x83A\x83\x8D\x83O\x82ŃL\x83\x83\x83\x93\x83Z\x83\x8B\x82\xB5\x82\xBD\x8E\x9E\x82?A\x83f\x83o\x83b\x83O\x83\x8D\x83O\x82?S\x83~\x82\xAA\x8Fo\x97?\xB3\x82\xEA\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+      <li>SSHv1 \x90?\xB1\x8E\x9E\x82?E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x95ύX\x92?m\x82ŁA\x90\xB3\x82\xB5\x82\xA2\x83E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y(\x83s\x83N\x83Z\x83\x8B\x90\x94)\x82\xF0\x92?m\x82\xB7\x82\xE9\x82悤\x82?C\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+      <li>When the window size change is notified, the right window size(pixel) can be reported.</li>
     </ul>
   </li-->
 

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2017-06-12 10:43:25 UTC (rev 6798)
+++ trunk/doc/ja/html/about/history.html	2017-06-12 10:43:28 UTC (rev 6799)
@@ -2924,6 +2924,7 @@
   <li>\x83o\x83O\x8FC\x90\xB3
     <ul>
       <li>\x83p\x83X\x83\x8F\x81[\x83h\x94F\x8F?\x9E\x82?p\x83X\x83\x8F\x81[\x83h\x95ύX\x83_\x83C\x83A\x83\x8D\x83O\x82ŃL\x83\x83\x83\x93\x83Z\x83\x8B\x82\xB5\x82\xBD\x8E\x9E\x82?A\x83f\x83o\x83b\x83O\x83\x8D\x83O\x82?S\x83~\x82\xAA\x8Fo\x97?\xB3\x82\xEA\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+      <li>SSHv1 \x90?\xB1\x8E\x9E\x82?E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x95ύX\x92?m\x82ŁA\x90\xB3\x82\xB5\x82\xA2\x83E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y(\x83s\x83N\x83Z\x83\x8B\x90\x94)\x82\xF0\x92?m\x82\xB7\x82\xE9\x82悤\x82?C\x90\xB3\x82\xB5\x82\xBD\x81B</li>
     </ul>
   </li>
 

Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2017-06-12 10:43:25 UTC (rev 6798)
+++ trunk/ttssh2/ttxssh/ssh.c	2017-06-12 10:43:28 UTC (rev 6799)
@@ -127,8 +127,8 @@
 static BOOL SSH_agent_response(PTInstVar pvar, Channel_t *c, int local_channel_num, unsigned char *data, unsigned int buflen);
 static void ssh2_scp_get_packetlist(Channel_t *c, unsigned char **buf, unsigned int *buflen);
 static void ssh2_scp_free_packetlist(Channel_t *c);
+static void get_window_pixel_size(PTInstVar pvar, int *x, int *y);
 
-
 //
 // Global request confirm
 //
@@ -2197,13 +2197,16 @@
 	static const int msgs[] = { SSH_SMSG_SUCCESS, SSH_SMSG_FAILURE };
 	static const SSHPacketHandler handlers[]
 	= { handle_pty_success, handle_pty_failure };
+	int x, y;
 
+	get_window_pixel_size(pvar, &x, &y);
+
 	set_uint32(outmsg, len);
 	memcpy(outmsg + 4, pvar->ts->TermType, len);
 	set_uint32(outmsg + 4 + len, pvar->ssh_state.win_rows);
 	set_uint32(outmsg + 4 + len + 4, pvar->ssh_state.win_cols);
-	set_uint32(outmsg + 4 + len + 8, 0);
-	set_uint32(outmsg + 4 + len + 12, 0);
+	set_uint32(outmsg + 4 + len + 8, x);
+	set_uint32(outmsg + 4 + len + 12, y);
 	memcpy(outmsg + 4 + len + 16, ssh_ttymodes, sizeof(ssh_ttymodes));
 	finish_send_packet(pvar);
 
@@ -2815,7 +2818,7 @@
 	}
 }
 
-void get_window_pixel_size(PTInstVar pvar, int *x, int *y)
+static void get_window_pixel_size(PTInstVar pvar, int *x, int *y)
 {
 	RECT r;
 
@@ -2838,6 +2841,8 @@
 	pvar->ssh_state.win_cols = cols;
 	pvar->ssh_state.win_rows = rows;
 
+	get_window_pixel_size(pvar, &x, &y);
+
 	if (SSHv1(pvar)) {
 		if (get_handler(pvar, SSH_SMSG_STDOUT_DATA) == handle_data) {
 			unsigned char FAR *outmsg =
@@ -2845,8 +2850,8 @@
 
 			set_uint32(outmsg, rows);
 			set_uint32(outmsg + 4, cols);
-			set_uint32(outmsg + 8, 0);
-			set_uint32(outmsg + 12, 0);
+			set_uint32(outmsg + 8, x);
+			set_uint32(outmsg + 12, y);
 			finish_send_packet(pvar);
 		}
 
@@ -2873,7 +2878,6 @@
 		buffer_put_char(msg, 0);  // wantconfirm
 		buffer_put_int(msg, pvar->ssh_state.win_cols);  // columns
 		buffer_put_int(msg, pvar->ssh_state.win_rows);  // lines
-		get_window_pixel_size(pvar, &x, &y);
 		buffer_put_int(msg, x);  // window width (pixel):
 		buffer_put_int(msg, y);  // window height (pixel):
 		len = buffer_len(msg);

From svnnotify ＠ sourceforge.jp  Tue Jun 13 19:30:13 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 13 Jun 2017 19:30:13 +0900
Subject: [Ttssh2-commit] [6801] eliminate FAR keyword.
Message-ID: <1497349813.623031.139973.nullmailer@users.sourceforge.jp>

Revision: 6801
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6801
Author:   doda
Date:     2017-06-13 19:30:12 +0900 (Tue, 13 Jun 2017)
Log Message:
-----------
eliminate FAR keyword.

Modified Paths:
--------------
    trunk/TTXKanjiMenu/ttxkanjimenu.c
    trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.c
    trunk/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.c
    trunk/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.c
    trunk/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.c
    trunk/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.c
    trunk/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.c
    trunk/TTXSamples/TTXKcodeChange/TTXKcodeChange.c
    trunk/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.c
    trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.c
    trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.c
    trunk/TTXSamples/TTXResizeWin/TTXResizeWin.c
    trunk/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.c
    trunk/TTXSamples/TTXViewMode/TTXViewMode.c
    trunk/TTXSamples/TTXttyrec/TTXttyplay.c
    trunk/TTXSamples/TTXttyrec/TTXttyrec.c
    trunk/TTXSamples/ttxtest/ttxtest.c
    trunk/teraterm/common/compat_w95.h
    trunk/teraterm/common/i18n.c
    trunk/teraterm/common/i18n.h
    trunk/teraterm/common/ttcommon.h
    trunk/teraterm/common/ttlib.c
    trunk/teraterm/common/ttlib.h
    trunk/teraterm/common/ttplugin.h
    trunk/teraterm/common/tttypes.h
    trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.c
    trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.h
    trunk/teraterm/teraterm/commlib.c
    trunk/teraterm/teraterm/filesys.h
    trunk/teraterm/teraterm/teklib.h
    trunk/teraterm/teraterm/tekwin.cpp
    trunk/teraterm/teraterm/tekwin.h
    trunk/teraterm/teraterm/ttdialog.h
    trunk/teraterm/teraterm/ttfileio.c
    trunk/teraterm/teraterm/ttfileio.h
    trunk/teraterm/teraterm/ttime.c
    trunk/teraterm/teraterm/ttplug.c
    trunk/teraterm/teraterm/ttplug.h
    trunk/teraterm/teraterm/ttsetup.h
    trunk/teraterm/teraterm/ttwinman.c
    trunk/teraterm/teraterm/ttwsk.h
    trunk/teraterm/teraterm/vtdisp.c
    trunk/teraterm/teraterm/vtwin.cpp
    trunk/teraterm/teraterm/vtwin.h
    trunk/teraterm/ttpcmn/language.c
    trunk/teraterm/ttpcmn/language.h
    trunk/teraterm/ttpcmn/ttcmn.c
    trunk/teraterm/ttpdlg/ttdlg.c
    trunk/teraterm/ttpdlg/ttdlg.h
    trunk/teraterm/ttpfile/bplus.c
    trunk/teraterm/ttpfile/ftlib.h
    trunk/teraterm/ttpfile/ttfile.c
    trunk/teraterm/ttpset/ttset.c
    trunk/teraterm/ttptek/tekesc.h
    trunk/teraterm/ttptek/tttek.c
    trunk/ttpmenu/winmisc.cpp
    trunk/ttssh2/matcher/matcher.c
    trunk/ttssh2/matcher/matcher.h
    trunk/ttssh2/ttxssh/auth.c
    trunk/ttssh2/ttxssh/auth.h
    trunk/ttssh2/ttxssh/crypt.c
    trunk/ttssh2/ttxssh/crypt.h
    trunk/ttssh2/ttxssh/dns.c
    trunk/ttssh2/ttxssh/dns.h
    trunk/ttssh2/ttxssh/fwd.c
    trunk/ttssh2/ttxssh/fwd.h
    trunk/ttssh2/ttxssh/fwdui.c
    trunk/ttssh2/ttxssh/hosts.c
    trunk/ttssh2/ttxssh/hosts.h
    trunk/ttssh2/ttxssh/key.c
    trunk/ttssh2/ttxssh/keyfiles.c
    trunk/ttssh2/ttxssh/pkt.c
    trunk/ttssh2/ttxssh/pkt.h
    trunk/ttssh2/ttxssh/sftp.c
    trunk/ttssh2/ttxssh/ssh.c
    trunk/ttssh2/ttxssh/ssh.h
    trunk/ttssh2/ttxssh/ttxssh.c
    trunk/ttssh2/ttxssh/ttxssh.h
    trunk/ttssh2/ttxssh/util.c
    trunk/ttssh2/ttxssh/util.h
    trunk/ttssh2/ttxssh/x11util.c
    trunk/ttssh2/ttxssh/x11util.h

-------------- next part --------------
Modified: trunk/TTXKanjiMenu/ttxkanjimenu.c
===================================================================
--- trunk/TTXKanjiMenu/ttxkanjimenu.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/TTXKanjiMenu/ttxkanjimenu.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -53,7 +53,7 @@
 	BOOL NeedResetCharSet;
 } TInstVar;
 
-static TInstVar FAR * pvar;
+static TInstVar *pvar;
 
 /* WIN32 allows multiple instances of a DLL */
 static TInstVar InstVar;
@@ -61,7 +61,7 @@
 /*
  * This function is called when Tera Term starts up.
  */
-static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) {
+static void PASCAL TTXInit(PTTSet ts, PComVar cv) {
 	pvar->ts = ts;
 	pvar->cv = cv;
 	pvar->origReadIniFile = NULL;
@@ -70,7 +70,7 @@
 	pvar->NeedResetCharSet = FALSE;
 }
 
-static BOOL FAR PASCAL TTXKanjiMenuSetupTerminal(HWND parent, PTTSet ts) {
+static BOOL PASCAL TTXKanjiMenuSetupTerminal(HWND parent, PTTSet ts) {
 	WORD orgRecvCode, orgSendCode;
 	BOOL ret;
 
@@ -101,12 +101,12 @@
 	return ret;
 }
 
-static BOOL FAR PASCAL ResetCharSet(HWND parent, PTTSet ts) {
+static BOOL PASCAL ResetCharSet(HWND parent, PTTSet ts) {
 	pvar->NeedResetCharSet = FALSE;
 	return TRUE;
 }
 
-static void PASCAL FAR TTXGetUIHooks(TTXUIHooks FAR * hooks) {
+static void PASCAL TTXGetUIHooks(TTXUIHooks *hooks) {
 	if (pvar->NeedResetCharSet) {
 		*hooks->SetupTerminal = ResetCharSet;
 	}
@@ -116,7 +116,7 @@
 	}
 }
 
-static void PASCAL FAR TTXKanjiMenuReadIniFile(PCHAR fn, PTTSet ts) {
+static void PASCAL TTXKanjiMenuReadIniFile(PCHAR fn, PTTSet ts) {
 	char buff[20];
 
 	/* Call original ReadIniFile */
@@ -143,7 +143,7 @@
 	return;
 }
 
-static void PASCAL FAR TTXKanjiMenuWriteIniFile(PCHAR fn, PTTSet ts) {
+static void PASCAL TTXKanjiMenuWriteIniFile(PCHAR fn, PTTSet ts) {
 	/* Call original WriteIniFile */
 	pvar->origWriteIniFile(fn, ts);
 
@@ -152,7 +152,7 @@
 	return;
 }
 
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks FAR *hooks) {
+static void PASCAL TTXGetSetupHooks(TTXSetupHooks *hooks) {
 	pvar->origReadIniFile = *hooks->ReadIniFile;
 	*hooks->ReadIniFile = TTXKanjiMenuReadIniFile;
 	pvar->origWriteIniFile = *hooks->WriteIniFile;
@@ -164,7 +164,7 @@
 #define ID_MI_KANJISEND 54109
 #define ID_MI_USEONESETTING 54200
 
-static void PASCAL FAR InsertSendKcodeMenu(HMENU menu) {
+static void PASCAL InsertSendKcodeMenu(HMENU menu) {
 	UINT flag = MF_BYPOSITION | MF_STRING | MF_CHECKED;
 
 	if (pvar->ts->Language == IdJapanese) {
@@ -196,7 +196,7 @@
 	}
 }
 
-static void PASCAL FAR DeleteSendKcodeMenu(HMENU menu) {
+static void PASCAL DeleteSendKcodeMenu(HMENU menu) {
 	if (pvar->ts->Language == IdJapanese) {
 		DeleteMenu(menu, 5, MF_BYPOSITION);
 		DeleteMenu(menu, 5, MF_BYPOSITION);
@@ -211,7 +211,7 @@
 	}
 }
 
-static void PASCAL FAR UpdateRecvMenuCaption(HMENU menu, BOOL UseOneSetting) {
+static void PASCAL UpdateRecvMenuCaption(HMENU menu, BOOL UseOneSetting) {
 	if (UseOneSetting) {
 		if (pvar->ts->Language == IdJapanese) {
 			GetI18nStr(IniSection, "MENU_SJIS", pvar->ts->UIMsg, sizeof(pvar->ts->UIMsg),
@@ -285,7 +285,7 @@
 /*
  * This function is called when Tera Term creates a new menu.
  */
-static void PASCAL FAR TTXModifyMenu(HMENU menu) {
+static void PASCAL TTXModifyMenu(HMENU menu) {
 	UINT flag = MF_ENABLED;
 
 	// \x8C\xBE\x8C?\x93\xFA\x96{\x8C\xEA\x82??\xAB\x82??\x81\x83j\x83\x85\x81[\x82??\xC1\x82\xB3\x82\xEA\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B (2007.7.14 maya)
@@ -373,7 +373,7 @@
 /*
  * This function is called when Tera Term pops up a submenu menu.
  */
-static void PASCAL FAR TTXModifyPopupMenu(HMENU menu) {
+static void PASCAL TTXModifyPopupMenu(HMENU menu) {
 	// \x83\x81\x83j\x83\x85\x81[\x82\xAA\x8CĂяo\x82\xB3\x82?\x82\xE7\x81A\x8DŐV\x82??\xE8\x82?X\x90V\x82\xB7\x82\xE9\x81B(2007.5.25 yutaka)
 	UpdateRecvMenu(pvar->ts->KanjiCode);
 	if (!pvar->UseOneSetting) {
@@ -386,7 +386,7 @@
 /*
  * This function is called when Tera Term receives a command message.
  */
-static int PASCAL FAR TTXProcessCommand(HWND hWin, WORD cmd) {
+static int PASCAL TTXProcessCommand(HWND hWin, WORD cmd) {
 	WORD val;
 
 	if ((cmd > ID_MI_KANJIRECV) && (cmd <= ID_MI_KANJIRECV+IdUTF8m)) {
@@ -476,7 +476,7 @@
 	NULL  // TTXSetCommandLine
 };
 
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports FAR * exports) {
+BOOL __declspec(dllexport) PASCAL TTXBind(WORD Version, TTXExports *exports) {
 	int size = sizeof(Exports) - sizeof(exports->size);
 	/* do version checking if necessary */
 	/* if (Version!=TTVERSION) return FALSE; */
@@ -484,8 +484,8 @@
 	if (size > exports->size) {
 		size = exports->size;
 	}
-	memcpy((char FAR *)exports + sizeof(exports->size),
-	       (char FAR *)&Exports + sizeof(exports->size),
+	memcpy((char *)exports + sizeof(exports->size),
+	       (char *)&Exports + sizeof(exports->size),
 	       size);
 	return TRUE;
 }

Modified: trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.c
===================================================================
--- trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/TTXSamples/TTXAdditionalTitle/TTXAdditionalTitle.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -43,7 +43,7 @@
   char orig_title[TitleBuffSize];
 } TInstVar;
 
-static TInstVar FAR * pvar;
+static TInstVar *pvar;
 static TInstVar InstVar;
 
 static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) {
@@ -174,7 +174,7 @@
   }
 }
 
-int PASCAL FAR TTXrecv(SOCKET s, char FAR *buff, int len, int flags) {
+int PASCAL FAR TTXrecv(SOCKET s, char *buff, int len, int flags) {
   int rlen;
 
   if ((rlen = pvar->origPrecv(s, buff, len, flags)) > 0) {
@@ -191,23 +191,23 @@
   return result;
 }
 
-static void PASCAL FAR TTXOpenTCP(TTXSockHooks FAR * hooks) {
+static void PASCAL FAR TTXOpenTCP(TTXSockHooks *hooks) {
   pvar->origPrecv = *hooks->Precv;
   *hooks->Precv = TTXrecv;
 }
 
-static void PASCAL FAR TTXCloseTCP(TTXSockHooks FAR * hooks) {
+static void PASCAL FAR TTXCloseTCP(TTXSockHooks *hooks) {
   if (pvar->origPrecv) {
     *hooks->Precv = pvar->origPrecv;
   }
 }
 
-static void PASCAL FAR TTXOpenFile(TTXFileHooks FAR * hooks) {
+static void PASCAL FAR TTXOpenFile(TTXFileHooks *hooks) {
   pvar->origPReadFile = *hooks->PReadFile;
   *hooks->PReadFile = TTXReadFile;
 }
 
-static void PASCAL FAR TTXCloseFile(TTXFileHooks FAR * hooks) {
+static void PASCAL FAR TTXCloseFile(TTXFileHooks *hooks) {
   if (pvar->origPReadFile) {
     *hooks->PReadFile = pvar->origPReadFile;
   }
@@ -230,7 +230,7 @@
   return (TRUE);
 }
 
-static void PASCAL FAR TTXGetUIHooks(TTXUIHooks FAR * hooks) {
+static void PASCAL FAR TTXGetUIHooks(TTXUIHooks *hooks) {
   if (pvar->ChangeTitle) {
     pvar->ChangeTitle = FALSE;
     *hooks->SetupWin = TTXDummySetupWin;
@@ -303,7 +303,7 @@
   }
 }
 
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks FAR * hooks) {
+static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) {
   pvar->origReadIniFile = *hooks->ReadIniFile;
   *hooks->ReadIniFile = TTXReadIniFile;
   pvar->origWriteIniFile = *hooks->WriteIniFile;
@@ -340,14 +340,14 @@
   TTXCloseFile
 };
 
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports FAR * exports) {
+BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
   int size = sizeof(Exports) - sizeof(exports->size);
 
   if (size > exports->size) {
     size = exports->size;
   }
-  memcpy((char FAR *)exports + sizeof(exports->size),
-    (char FAR *)&Exports + sizeof(exports->size),
+  memcpy((char *)exports + sizeof(exports->size),
+    (char *)&Exports + sizeof(exports->size),
     size);
   return TRUE;
 }

Modified: trunk/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.c
===================================================================
--- trunk/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/TTXSamples/TTXAlwaysOnTop/TTXAlwaysOnTop.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -28,7 +28,7 @@
   BOOL ontop;
 } TInstVar;
 
-static TInstVar FAR * pvar;
+static TInstVar *pvar;
 static TInstVar InstVar;
 
 #define GetFileMenu(menu)	GetSubMenuByChildID(menu, ID_FILE_NEWCONNECTION)
@@ -130,14 +130,14 @@
   NULL, // TTXEnd
 };
 
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports FAR * exports) {
+BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
   int size = sizeof(Exports) - sizeof(exports->size);
 
   if (size > exports->size) {
     size = exports->size;
   }
-  memcpy((char FAR *)exports + sizeof(exports->size),
-    (char FAR *)&Exports + sizeof(exports->size),
+  memcpy((char *)exports + sizeof(exports->size),
+    (char *)&Exports + sizeof(exports->size),
     size);
   return TRUE;
 }

Modified: trunk/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.c
===================================================================
--- trunk/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/TTXSamples/TTXCallSysMenu/TTXCallSysMenu.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -17,7 +17,7 @@
   PComVar cv;
 } TInstVar;
 
-static TInstVar FAR * pvar;
+static TInstVar *pvar;
 static TInstVar InstVar;
 
 static int PASCAL FAR TTXProcessCommand(HWND hWin, WORD cmd) {
@@ -48,7 +48,7 @@
   NULL, // TTXCloseFile
 };
 
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports FAR * exports) {
+BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
   int size = sizeof(Exports) - sizeof(exports->size);
   /* do version checking if necessary */
   /* if (Version!=TTVERSION) return FALSE; */
@@ -56,8 +56,8 @@
   if (size > exports->size) {
     size = exports->size;
   }
-  memcpy((char FAR *)exports + sizeof(exports->size),
-    (char FAR *)&Exports + sizeof(exports->size),
+  memcpy((char *)exports + sizeof(exports->size),
+    (char *)&Exports + sizeof(exports->size),
     size);
   return TRUE;
 }

Modified: trunk/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.c
===================================================================
--- trunk/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/TTXSamples/TTXCommandLineOpt/TTXCommandLineOpt.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -17,7 +17,7 @@
   PParseParam origParseParam;
 } TInstVar;
 
-static TInstVar FAR * pvar;
+static TInstVar *pvar;
 static TInstVar InstVar;
 
 static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) {
@@ -85,7 +85,7 @@
   pvar->origParseParam(Param, ts, DDETopic);
 }
 
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks FAR *hooks) {
+static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) {
   pvar->origParseParam = *hooks->ParseParam;
   *hooks->ParseParam = TTXParseParam;
 }
@@ -106,14 +106,14 @@
   NULL, // TTXEnd
 };
 
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports FAR * exports) {
+BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
   int size = sizeof(Exports) - sizeof(exports->size);
 
   if (size > exports->size) {
     size = exports->size;
   }
-  memcpy((char FAR *)exports + sizeof(exports->size),
-    (char FAR *)&Exports + sizeof(exports->size),
+  memcpy((char *)exports + sizeof(exports->size),
+    (char *)&Exports + sizeof(exports->size),
     size);
   return TRUE;
 }

Modified: trunk/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.c
===================================================================
--- trunk/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/TTXSamples/TTXCopyIniFile/TTXCopyIniFile.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -18,7 +18,7 @@
 	char origIniFileName[MAXPATHLEN];
 } TInstVar;
 
-static TInstVar FAR * pvar;
+static TInstVar *pvar;
 static TInstVar InstVar;
 
 static void PASCAL FAR TTXReadIniFile(PCHAR fn, PTTSet ts) {
@@ -31,7 +31,7 @@
 	(pvar->origWriteIniFile)(fn, ts);
 }
 
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks FAR * hooks) {
+static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) {
 	if (pvar->origIniFileName[0] == 0) {
 		pvar->origReadIniFile = *hooks->ReadIniFile;
 		*hooks->ReadIniFile = TTXReadIniFile;
@@ -61,14 +61,14 @@
 	NULL	// TTXCloseFile
 };
 
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports FAR * exports) {
+BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
 	int size = sizeof(Exports) - sizeof(exports->size);
 
 	if (size > exports->size) {
 		size = exports->size;
 	}
-	memcpy((char FAR *)exports + sizeof(exports->size),
-		(char FAR *)&Exports + sizeof(exports->size),
+	memcpy((char *)exports + sizeof(exports->size),
+		(char *)&Exports + sizeof(exports->size),
 		size);
 	return TRUE;
 }

Modified: trunk/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.c
===================================================================
--- trunk/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/TTXSamples/TTXFixedWinSize/TTXFixedWinSize.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -23,7 +23,7 @@
   PReadIniFile origReadIniFile;
 } TInstVar;
 
-static TInstVar FAR * pvar;
+static TInstVar *pvar;
 static TInstVar InstVar;
 
 static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) {
@@ -54,7 +54,7 @@
     return ret;
 }
 
-static void PASCAL FAR TTXGetUIHooks(TTXUIHooks FAR * hooks) {
+static void PASCAL FAR TTXGetUIHooks(TTXUIHooks *hooks) {
     pvar->origSetupTerminalDlg = *hooks->SetupTerminal;
     *hooks->SetupTerminal = FixedSizeSetupTerminalDlg;
 }
@@ -65,7 +65,7 @@
     ts->TerminalHeight = HEIGHT;
 }
 
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks FAR * hooks) {
+static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) {
     pvar->origReadIniFile = *hooks->ReadIniFile;
     *hooks->ReadIniFile = FixedSizeReadIniFile;
 }
@@ -94,14 +94,14 @@
   NULL, // TTXEnd
 };
 
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports FAR * exports) {
+BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
   int size = sizeof(Exports) - sizeof(exports->size);
 
   if (size > exports->size) {
     size = exports->size;
   }
-  memcpy((char FAR *)exports + sizeof(exports->size),
-    (char FAR *)&Exports + sizeof(exports->size),
+  memcpy((char *)exports + sizeof(exports->size),
+    (char *)&Exports + sizeof(exports->size),
     size);
   return TRUE;
 }

Modified: trunk/TTXSamples/TTXKcodeChange/TTXKcodeChange.c
===================================================================
--- trunk/TTXSamples/TTXKcodeChange/TTXKcodeChange.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/TTXSamples/TTXKcodeChange/TTXKcodeChange.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -38,7 +38,7 @@
   TWriteFile origPWriteFile;
 } TInstVar;
 
-static TInstVar FAR * pvar;
+static TInstVar *pvar;
 static TInstVar InstVar;
 
 static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) {
@@ -322,7 +322,7 @@
   }
 }
 
-int PASCAL FAR TTXrecv(SOCKET s, char FAR *buff, int len, int flags) {
+int PASCAL FAR TTXrecv(SOCKET s, char *buff, int len, int flags) {
   int rlen;
 
   if ((rlen = pvar->origPrecv(s, buff, len, flags)) > 0) {
@@ -339,23 +339,23 @@
   return result;
 }
 
-static void PASCAL FAR TTXOpenTCP(TTXSockHooks FAR * hooks) {
+static void PASCAL FAR TTXOpenTCP(TTXSockHooks *hooks) {
   pvar->origPrecv = *hooks->Precv;
   *hooks->Precv = TTXrecv;
 }
 
-static void PASCAL FAR TTXCloseTCP(TTXSockHooks FAR * hooks) {
+static void PASCAL FAR TTXCloseTCP(TTXSockHooks *hooks) {
   if (pvar->origPrecv) {
     *hooks->Precv = pvar->origPrecv;
   }
 }
 
-static void PASCAL FAR TTXOpenFile(TTXFileHooks FAR * hooks) {
+static void PASCAL FAR TTXOpenFile(TTXFileHooks *hooks) {
   pvar->origPReadFile = *hooks->PReadFile;
   *hooks->PReadFile = TTXReadFile;
 }
 
-static void PASCAL FAR TTXCloseFile(TTXFileHooks FAR * hooks) {
+static void PASCAL FAR TTXCloseFile(TTXFileHooks *hooks) {
   if (pvar->origPReadFile) {
     *hooks->PReadFile = pvar->origPReadFile;
   }
@@ -380,14 +380,14 @@
   TTXCloseFile
 };
 
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports FAR * exports) {
+BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
   int size = sizeof(Exports) - sizeof(exports->size);
 
   if (size > exports->size) {
     size = exports->size;
   }
-  memcpy((char FAR *)exports + sizeof(exports->size),
-    (char FAR *)&Exports + sizeof(exports->size),
+  memcpy((char *)exports + sizeof(exports->size),
+    (char *)&Exports + sizeof(exports->size),
     size);
   return TRUE;
 }

Modified: trunk/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.c
===================================================================
--- trunk/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/TTXSamples/TTXOutputBuffering/TTXOutputBuffering.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -20,7 +20,7 @@
 	char buff[BUFF_SIZE];
 } TInstVar;
 
-typedef TInstVar FAR * PTInstVar;
+typedef TInstVar *PTInstVar;
 PTInstVar pvar;
 static TInstVar InstVar;
 
@@ -63,7 +63,7 @@
 //
 //  TTXSend -- \x83L\x81[\x93\xFC\x97?\x88\x97\x9D
 //
-static int PASCAL FAR TTXsend(SOCKET s, const char FAR *buf, int len, int flags) {
+static int PASCAL FAR TTXsend(SOCKET s, const char *buf, int len, int flags) {
 	int i, wlen, left_len;
 
 	if (len > 0 && pvar->enable) {
@@ -121,7 +121,7 @@
 // TTXOpen -- \x83Z\x83b\x83V\x83\x87\x83\x93\x8AJ\x8En\x8F\x88\x97\x9D
 //	Psend \x82\xF0\x83t\x83b\x83N\x82\xB7\x82\xE9\x81B
 //
-static void PASCAL FAR TTXOpenTCP(TTXSockHooks FAR * hooks) {
+static void PASCAL FAR TTXOpenTCP(TTXSockHooks *hooks) {
 	pvar->origPsend = *hooks->Psend;
 	*hooks->Psend = TTXsend;
 	pvar->buff_used = 0;
@@ -131,7 +131,7 @@
 // TTXCloseTCP -- \x83Z\x83b\x83V\x83\x87\x83\x93\x8FI\x97\xB9\x8E\x9E\x8F\x88\x97\x9D
 //	Psend \x82?t\x83b\x83N\x82\xF0\x89\xF0\x8F\x9C\x82\xB7\x82\xE9\x81B
 //
-static void PASCAL FAR TTXCloseTCP(TTXSockHooks FAR * hooks) {
+static void PASCAL FAR TTXCloseTCP(TTXSockHooks *hooks) {
 	if (pvar->origPsend) {
 		*hooks->Psend = pvar->origPsend;
 	}
@@ -156,7 +156,7 @@
 	NULL, // TTXCloseFile
 };
 
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports FAR * exports) {
+BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
 	int size = sizeof(Exports) - sizeof(exports->size);
 	/* do version checking if necessary */
 	/* if (Version!=TTVERSION) return FALSE; */
@@ -164,8 +164,8 @@
 	if (size > exports->size) {
 		size = exports->size;
 	}
-	memcpy((char FAR *)exports + sizeof(exports->size),
-	       (char FAR *)&Exports + sizeof(exports->size), size);
+	memcpy((char *)exports + sizeof(exports->size),
+	       (char *)&Exports + sizeof(exports->size), size);
 	return TRUE;
 }
 

Modified: trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.c
===================================================================
--- trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/TTXSamples/TTXRecurringCommand/TTXRecurringCommand.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -45,7 +45,7 @@
 	unsigned char orgCommand[OutBuffSize];
 } TInstVar;
 
-typedef TInstVar FAR * PTInstVar;
+typedef TInstVar *PTInstVar;
 PTInstVar pvar;
 static TInstVar InstVar;
 
@@ -272,7 +272,7 @@
 //  TTXSend, TTXWriteFile -- \x83L\x81[\x93\xFC\x97?\x88\x97\x9D
 //	\x83L\x81[\x93\xFC\x97?\xAA\x82\xA0\x82\xC1\x82\xBD\x82\xE7\x81A\x83^\x83C\x83}\x82\xF0\x89\x84\x92\xB7\x82\xB7\x82\xE9
 //
-static int PASCAL FAR TTXsend(SOCKET s, const char FAR *buf, int len, int flags) {
+static int PASCAL FAR TTXsend(SOCKET s, const char *buf, int len, int flags) {
 	if (pvar->enable && len > 0) {
 		SetTimer(pvar->cv->HWin, IdRecurringTimer, pvar->interval * 1000, RecurringTimerProc);
 	}
@@ -290,7 +290,7 @@
 // TTXOpenTCP, TTXOpenFile -- \x83Z\x83b\x83V\x83\x87\x83\x93\x8AJ\x8En\x8F\x88\x97\x9D
 //	Psend, WriteFile\x82\xF0\x83t\x83b\x83N\x82\xB5\x81A\x97L\x8C\xF8\x82?\xE7\x82?^\x83C\x83}\x82\xF0\x83Z\x83b\x83g\x82\xB7\x82\xE9\x81B
 //
-static void PASCAL FAR TTXOpenTCP(TTXSockHooks FAR * hooks) {
+static void PASCAL FAR TTXOpenTCP(TTXSockHooks *hooks) {
 	pvar->origPsend = *hooks->Psend;
 	*hooks->Psend = TTXsend;
 
@@ -299,7 +299,7 @@
 	}
 }
 
-static void PASCAL FAR TTXOpenFile(TTXFileHooks FAR * hooks) {
+static void PASCAL FAR TTXOpenFile(TTXFileHooks *hooks) {
 	pvar->origPWriteFile = *hooks->PWriteFile;
 	*hooks->PWriteFile = TTXWriteFile;
 
@@ -312,7 +312,7 @@
 // TTXCloseTCP, TTXCloseFile -- \x83Z\x83b\x83V\x83\x87\x83\x93\x8FI\x97\xB9\x8E\x9E\x8F\x88\x97\x9D
 //	Psend, WriteFile\x82?t\x83b\x83N\x82\xF0\x89\xF0\x8F\x9C\x82\xB5\x81A\x83^\x83C\x83}\x82\xF0\x8E~\x82?\xE9\x81B
 //
-static void PASCAL FAR TTXCloseTCP(TTXSockHooks FAR * hooks) {
+static void PASCAL FAR TTXCloseTCP(TTXSockHooks *hooks) {
 	if (pvar->origPsend) {
 		*hooks->Psend = pvar->origPsend;
 	}
@@ -319,7 +319,7 @@
 	KillTimer(pvar->cv->HWin, IdRecurringTimer);
 }
 
-static void PASCAL FAR TTXCloseFile(TTXFileHooks FAR * hooks) {
+static void PASCAL FAR TTXCloseFile(TTXFileHooks *hooks) {
 	if (pvar->origPWriteFile) {
 		*hooks->PWriteFile = pvar->origPWriteFile;
 	}
@@ -411,7 +411,7 @@
 	return;
 }
 
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks FAR * hooks) {
+static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) {
 	pvar->origReadIniFile = *hooks->ReadIniFile;
 	*hooks->ReadIniFile = TTXReadIniFile;
 
@@ -632,7 +632,7 @@
 	TTXCloseFile
 };
 
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports FAR * exports) {
+BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
 	int size = sizeof(Exports) - sizeof(exports->size);
 	/* do version checking if necessary */
 	/* if (Version!=TTVERSION) return FALSE; */
@@ -640,8 +640,8 @@
 	if (size > exports->size) {
 		size = exports->size;
 	}
-	memcpy((char FAR *)exports + sizeof(exports->size),
-	       (char FAR *)&Exports + sizeof(exports->size), size);
+	memcpy((char *)exports + sizeof(exports->size),
+	       (char *)&Exports + sizeof(exports->size), size);
 	return TRUE;
 }
 

Modified: trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.c
===================================================================
--- trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/TTXSamples/TTXResizeMenu/TTXResizeMenu.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -27,7 +27,7 @@
   int ResizeList[MAX_MENU_ITEMS][2];
 } TInstVar;
 
-static TInstVar FAR * pvar;
+static TInstVar *pvar;
 
 /* WIN32 allows multiple instances of a DLL */
 static TInstVar InstVar;
@@ -172,7 +172,7 @@
   return (TRUE);
 }
 
-static void PASCAL FAR TTXGetUIHooks(TTXUIHooks FAR * hooks) {
+static void PASCAL FAR TTXGetUIHooks(TTXUIHooks *hooks) {
   if (pvar->ReplaceTermDlg) {
     *hooks->SetupTerminal = TTXSetupTerminal;
   }
@@ -221,7 +221,7 @@
   pvar->MenuItems = i;
 }
 
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks FAR * hooks) {
+static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) {
   pvar->origReadIniFile = *hooks->ReadIniFile;
   *hooks->ReadIniFile = ResizeMenuReadIniFile;
 }
@@ -290,14 +290,14 @@
   NULL, // TTXEnd
 };
 
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports FAR * exports) {
+BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
   int size = sizeof(Exports) - sizeof(exports->size);
 
   if (size > exports->size) {
     size = exports->size;
   }
-  memcpy((char FAR *)exports + sizeof(exports->size),
-         (char FAR *)&Exports + sizeof(exports->size),
+  memcpy((char *)exports + sizeof(exports->size),
+         (char *)&Exports + sizeof(exports->size),
          size);
   return TRUE;
 }

Modified: trunk/TTXSamples/TTXResizeWin/TTXResizeWin.c
===================================================================
--- trunk/TTXSamples/TTXResizeWin/TTXResizeWin.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/TTXSamples/TTXResizeWin/TTXResizeWin.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -24,7 +24,7 @@
   BOOL ReplaceTermDlg;
 } TInstVar;
 
-static TInstVar FAR * pvar;
+static TInstVar *pvar;
 static TInstVar InstVar;
 
 static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) {
@@ -38,7 +38,7 @@
   return (TRUE);
 }
 
-static void PASCAL FAR TTXGetUIHooks(TTXUIHooks FAR * hooks) {
+static void PASCAL FAR TTXGetUIHooks(TTXUIHooks *hooks) {
   if (pvar->ReplaceTermDlg) {
     *hooks->SetupTerminal = TTXSetupTerminal;
   }
@@ -79,14 +79,14 @@
   NULL, // TTXEnd
 };
 
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports FAR * exports) {
+BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
   int size = sizeof(Exports) - sizeof(exports->size);
 
   if (size > exports->size) {
     size = exports->size;
   }
-  memcpy((char FAR *)exports + sizeof(exports->size),
-         (char FAR *)&Exports + sizeof(exports->size),
+  memcpy((char *)exports + sizeof(exports->size),
+         (char *)&Exports + sizeof(exports->size),
          size);
   return TRUE;
 }

Modified: trunk/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.c
===================================================================
--- trunk/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/TTXSamples/TTXShowCommandLine/TTXShowCommandLine.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -15,7 +15,7 @@
   PParseParam origParseParam;
 } TInstVar;
 
-static TInstVar FAR * pvar;
+static TInstVar *pvar;
 static TInstVar InstVar;
 
 static void PASCAL FAR TTXParseParam(PCHAR Param, PTTSet ts, PCHAR DDETopic) {
@@ -23,7 +23,7 @@
   pvar->origParseParam(Param, ts, DDETopic);
 }
 
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks FAR *hooks) {
+static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) {
   pvar->origParseParam = *hooks->ParseParam;
   *hooks->ParseParam = TTXParseParam;
 }
@@ -44,14 +44,14 @@
   NULL, // TTXEnd
 };
 
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports FAR * exports) {
+BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
   int size = sizeof(Exports) - sizeof(exports->size);
 
   if (size > exports->size) {
     size = exports->size;
   }
-  memcpy((char FAR *)exports + sizeof(exports->size),
-    (char FAR *)&Exports + sizeof(exports->size),
+  memcpy((char *)exports + sizeof(exports->size),
+    (char *)&Exports + sizeof(exports->size),
     size);
   return TRUE;
 }

Modified: trunk/TTXSamples/TTXViewMode/TTXViewMode.c
===================================================================
--- trunk/TTXSamples/TTXViewMode/TTXViewMode.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/TTXSamples/TTXViewMode/TTXViewMode.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -31,7 +31,7 @@
   char password[50];
 } TInstVar;
 
-typedef TInstVar FAR * PTInstVar;
+typedef TInstVar *PTInstVar;
 PTInstVar pvar;
 static TInstVar InstVar;
 
@@ -70,7 +70,7 @@
   pvar->origWriteIniFile = NULL;
 }
 
-static int PASCAL FAR TTXsend(SOCKET s, const char FAR *buf, int len, int flags) {
+static int PASCAL FAR TTXsend(SOCKET s, const char *buf, int len, int flags) {
   if (pvar->enable) {
     return len;
   }
@@ -89,23 +89,23 @@
   }
 }
 
-static void PASCAL FAR TTXOpenTCP(TTXSockHooks FAR * hooks) {
+static void PASCAL FAR TTXOpenTCP(TTXSockHooks *hooks) {
   pvar->origPsend = *hooks->Psend;
   *hooks->Psend = TTXsend;
 }
 
-static void PASCAL FAR TTXCloseTCP(TTXSockHooks FAR * hooks) {
+static void PASCAL FAR TTXCloseTCP(TTXSockHooks *hooks) {
   if (pvar->origPsend) {
     *hooks->Psend = pvar->origPsend;
   }
 }
 
-static void PASCAL FAR TTXOpenFile(TTXFileHooks FAR * hooks) {
+static void PASCAL FAR TTXOpenFile(TTXFileHooks *hooks) {
   pvar->origPWriteFile = *hooks->PWriteFile;
   *hooks->PWriteFile = TTXWriteFile;
 }
 
-static void PASCAL FAR TTXCloseFile(TTXFileHooks FAR * hooks) {
+static void PASCAL FAR TTXCloseFile(TTXFileHooks *hooks) {
   if (pvar->origPWriteFile) {
     *hooks->PWriteFile = pvar->origPWriteFile;
   }
@@ -123,7 +123,7 @@
   return;
 }
 
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks FAR * hooks) {
+static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) {
   pvar->origReadIniFile = *hooks->ReadIniFile;
   *hooks->ReadIniFile = TTXReadIniFile;
   pvar->origWriteIniFile = *hooks->WriteIniFile;
@@ -281,7 +281,7 @@
   TTXCloseFile
 };
 
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports FAR * exports) {
+BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
   int size = sizeof(Exports) - sizeof(exports->size);
   /* do version checking if necessary */
   /* if (Version!=TTVERSION) return FALSE; */
@@ -289,8 +289,8 @@
   if (size > exports->size) {
     size = exports->size;
   }
-  memcpy((char FAR *)exports + sizeof(exports->size),
-    (char FAR *)&Exports + sizeof(exports->size),
+  memcpy((char *)exports + sizeof(exports->size),
+    (char *)&Exports + sizeof(exports->size),
     size);
   return TRUE;
 }

Modified: trunk/TTXSamples/TTXttyrec/TTXttyplay.c
===================================================================
--- trunk/TTXSamples/TTXttyrec/TTXttyplay.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/TTXSamples/TTXttyrec/TTXttyplay.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -53,7 +53,7 @@
 	char origOLDTitle[TitleBuffSize];
 } TInstVar;
 
-static TInstVar FAR * pvar;
+static TInstVar *pvar;
 static TInstVar InstVar;
 
 #define GetFileMenu(menu)	GetSubMenuByChildID(menu, ID_FILE_NEWCONNECTION)
@@ -293,7 +293,7 @@
 	return TRUE;
 }
 
-static void PASCAL FAR TTXOpenFile(TTXFileHooks FAR * hooks) {
+static void PASCAL FAR TTXOpenFile(TTXFileHooks *hooks) {
 	if (pvar->cv->PortType == IdFile && pvar->enable) {
 		pvar->origPReadFile = *hooks->PReadFile;
 		pvar->origPWriteFile = *hooks->PWriteFile;
@@ -304,7 +304,7 @@
 	}
 }
 
-static void PASCAL FAR TTXCloseFile(TTXFileHooks FAR * hooks) {
+static void PASCAL FAR TTXCloseFile(TTXFileHooks *hooks) {
 	if (pvar->origPReadFile) {
 		*hooks->PReadFile = pvar->origPReadFile;
 	}
@@ -370,7 +370,7 @@
 	pvar->speed = GetPrivateProfileInt(INISECTION, "Speed", 0, fn);
 }
 
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks FAR * hooks) {
+static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) {
 	pvar->origParseParam = *hooks->ParseParam;
 	*hooks->ParseParam = TTXParseParam;
 	pvar->origReadIniFile = *hooks->ReadIniFile;
@@ -424,7 +424,7 @@
 	return (TRUE);
 }
 
-static void PASCAL FAR TTXGetUIHooks(TTXUIHooks FAR * hooks) {
+static void PASCAL FAR TTXGetUIHooks(TTXUIHooks *hooks) {
 	if (pvar->ChangeTitle) {
 		pvar->ChangeTitle = FALSE;
 		*hooks->SetupWin = TTXSetupWin;
@@ -455,14 +455,14 @@
 	TTXCloseFile
 };
 
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports FAR * exports) {
+BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
 	int size = sizeof(Exports) - sizeof(exports->size);
 
 	if (size > exports->size) {
 		size = exports->size;
 	}
-	memcpy((char FAR *)exports + sizeof(exports->size),
-		(char FAR *)&Exports + sizeof(exports->size),
+	memcpy((char *)exports + sizeof(exports->size),
+		(char *)&Exports + sizeof(exports->size),
 		size);
 	return TRUE;
 }

Modified: trunk/TTXSamples/TTXttyrec/TTXttyrec.c
===================================================================
--- trunk/TTXSamples/TTXttyrec/TTXttyrec.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/TTXSamples/TTXttyrec/TTXttyrec.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -37,7 +37,7 @@
   int len;
 };
 
-static TInstVar FAR * pvar;
+static TInstVar *pvar;
 static TInstVar InstVar;
 
 #define GetFileMenu(menu)	GetSubMenuByChildID(menu, ID_FILE_NEWCONNECTION)
@@ -118,12 +118,12 @@
   return;
 }
 
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks FAR *hooks) {
+static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) {
   pvar->origReadIniFile = *hooks->ReadIniFile;
   *hooks->ReadIniFile = TTXReadIniFile;
 }
 
-int PASCAL FAR TTXrecv(SOCKET s, char FAR *buff, int len, int flags) {
+int PASCAL FAR TTXrecv(SOCKET s, char *buff, int len, int flags) {
   int rlen;
 
   rlen = pvar->origPrecv(s, buff, len, flags);
@@ -143,18 +143,18 @@
   return TRUE;
 }
 
-static void PASCAL FAR TTXOpenTCP(TTXSockHooks FAR * hooks) {
+static void PASCAL FAR TTXOpenTCP(TTXSockHooks *hooks) {
   pvar->origPrecv = *hooks->Precv;
   *hooks->Precv = TTXrecv;
 }
 
-static void PASCAL FAR TTXCloseTCP(TTXSockHooks FAR * hooks) {
+static void PASCAL FAR TTXCloseTCP(TTXSockHooks *hooks) {
   if (pvar->origPrecv) {
     *hooks->Precv = pvar->origPrecv;
   }
 }
 
-static void PASCAL FAR TTXOpenFile(TTXFileHooks FAR * hooks) {
+static void PASCAL FAR TTXOpenFile(TTXFileHooks *hooks) {
   if (pvar->cv->PortType == IdSerial) {
     pvar->origPReadFile = *hooks->PReadFile;
     *hooks->PReadFile = TTXReadFile;
@@ -161,7 +161,7 @@
   }
 }
 
-static void PASCAL FAR TTXCloseFile(TTXFileHooks FAR * hooks) {
+static void PASCAL FAR TTXCloseFile(TTXFileHooks *hooks) {
   if (pvar->origPReadFile) {
     *hooks->PReadFile = pvar->origPReadFile;
   }
@@ -263,14 +263,14 @@
   TTXCloseFile
 };
 
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports FAR * exports) {
+BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
   int size = sizeof(Exports) - sizeof(exports->size);
 
   if (size > exports->size) {
     size = exports->size;
   }
-  memcpy((char FAR *)exports + sizeof(exports->size),
-    (char FAR *)&Exports + sizeof(exports->size),
+  memcpy((char *)exports + sizeof(exports->size),
+    (char *)&Exports + sizeof(exports->size),
     size);
   return TRUE;
 }

Modified: trunk/TTXSamples/ttxtest/ttxtest.c
===================================================================
--- trunk/TTXSamples/ttxtest/ttxtest.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/TTXSamples/ttxtest/ttxtest.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -78,7 +78,7 @@
   HMENU SetupMenu;
 } TInstVar;
 
-static TInstVar FAR * pvar;
+static TInstVar *pvar;
 
 /* WIN32 allows multiple instances of a DLL */
 static TInstVar InstVar;
@@ -125,7 +125,7 @@
    This function is called for each extension, in load order (see below).
    Thus, the extension with highest load order puts its hooks in last.
 */
-static void PASCAL FAR TTXOpenTCP(TTXSockHooks FAR * hooks) {
+static void PASCAL FAR TTXOpenTCP(TTXSockHooks *hooks) {
   printf("TTXOpenTCP %d\n", ORDER);
 }
 
@@ -139,7 +139,7 @@
    This function is called for each extension, in reverse load order (see
    below).
 */
-static void PASCAL FAR TTXCloseTCP(TTXSockHooks FAR * hooks) {
+static void PASCAL FAR TTXCloseTCP(TTXSockHooks *hooks) {
   printf("TTXCloseTCP %d\n", ORDER);
 }
 
@@ -175,7 +175,7 @@
    This function is called for each extension, in load order (see below).
    Thus, the extension with highest load order puts its hooks in last.
 */
-static void PASCAL FAR TTXGetUIHooks(TTXUIHooks FAR * hooks) {
+static void PASCAL FAR TTXGetUIHooks(TTXUIHooks *hooks) {
   printf("TTXSetUIHooks %d\n", ORDER);
 }
 
@@ -197,7 +197,7 @@
    This function is called for each extension, in load order (see below).
    Thus, the extension with highest load order puts its hooks in last.
 */
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks FAR * hooks) {
+static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks *hooks) {
   printf("TTXSetSetupHooks %d\n", ORDER);
 }
 
@@ -325,7 +325,7 @@
    This function is called for each extension, in load order (see below).
    Thus, the extension with highest load order puts its hooks in last.
 */
-static void PASCAL FAR TTXOpenFile(TTXFileHooks FAR * hooks) {
+static void PASCAL FAR TTXOpenFile(TTXFileHooks *hooks) {
   printf("TTXOpenFile %d\n", ORDER);
 }
 
@@ -339,7 +339,7 @@
    This function is called for each extension, in reverse load order (see
    below).
 */
-static void PASCAL FAR TTXCloseFile(TTXFileHooks FAR * hooks) {
+static void PASCAL FAR TTXCloseFile(TTXFileHooks *hooks) {
   printf("TTXCloseFile %d\n", ORDER);
 }
 
@@ -414,7 +414,7 @@
    extra functions that have been added since this extension was compiled
    will automatically be NULL and thus get default behaviour.)
 */
-BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports FAR * exports) {
+BOOL __declspec(dllexport) PASCAL FAR TTXBind(WORD Version, TTXExports *exports) {
   int size = sizeof(Exports) - sizeof(exports->size);
   /* do version checking if necessary */
   /* if (Version!=TTVERSION) return FALSE; */
@@ -422,8 +422,8 @@
   if (size > exports->size) {
     size = exports->size;
   }
-  memcpy((char FAR *)exports + sizeof(exports->size),
-    (char FAR *)&Exports + sizeof(exports->size),
+  memcpy((char *)exports + sizeof(exports->size),
+    (char *)&Exports + sizeof(exports->size),
     size);
   return TRUE;
 }

Modified: trunk/teraterm/common/compat_w95.h
===================================================================
--- trunk/teraterm/common/compat_w95.h	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/common/compat_w95.h	2017-06-13 10:30:12 UTC (rev 6801)
@@ -35,7 +35,7 @@
 void __stdcall DoCover_IsDebuggerPresent()
 {
     DWORD dw;
-    DWORD_PTR FAR* lpdw;
+    DWORD_PTR *lpdw;
     OSVERSIONINFO osvi;
     osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
     // Windows95 \x82ł?\xAF\x82\xEA\x82?\xB1\x82\xB1\x82ł\xA8\x82\xED\x82\xE8
@@ -47,7 +47,7 @@
         return;
     }
     // \x89\xA1\x8E\xE6\x82\xE8\x8A?\x94\x82\xF0\x90??\x82\xE9\x83A\x83h\x83\x8C\x83X\x82\xF0\x8E擾
-    lpdw = (DWORD_PTR FAR*) &_imp__IsDebuggerPresent;
+    lpdw = (DWORD_PTR *) &_imp__IsDebuggerPresent;
     // \x82\xB1\x82?A\x83h\x83\x8C\x83X\x82\xF0\x8F\x91\x82\xAB\x8D\x9E\x82?\xE9\x82悤\x82??\xE8
     // (\x93\xAF\x82\xB6\x83v\x83\x8D\x83O\x83\x89\x83\x80\x93\xE0\x82???\xE1\x8AQ\x82?\xAD\x8Ds\x82\xA6\x82\xE9)
     VirtualProtect(lpdw, sizeof(DWORD_PTR), PAGE_READWRITE, &dw);

Modified: trunk/teraterm/common/i18n.c
===================================================================
--- trunk/teraterm/common/i18n.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/common/i18n.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -4,13 +4,13 @@
 
 #include "i18n.h"
 
-void FAR PASCAL GetI18nStr(PCHAR section, PCHAR key, PCHAR buf, int buf_len, PCHAR def, PCHAR iniFile)
+void PASCAL GetI18nStr(PCHAR section, PCHAR key, PCHAR buf, int buf_len, PCHAR def, PCHAR iniFile)
 {
 	GetPrivateProfileString(section, key, def, buf, buf_len, iniFile);
 	RestoreNewLine(buf);
 }
 
-int FAR PASCAL GetI18nLogfont(PCHAR section, PCHAR key, PLOGFONT logfont, int ppi, PCHAR iniFile)
+int PASCAL GetI18nLogfont(PCHAR section, PCHAR key, PLOGFONT logfont, int ppi, PCHAR iniFile)
 {
 	static char tmp[MAX_UIMSG];
 	static char font[LF_FACESIZE];
@@ -30,4 +30,4 @@
 	logfont->lfWidth = 0;
 
 	return TRUE;
-}
\ No newline at end of file
+}

Modified: trunk/teraterm/common/i18n.h
===================================================================
--- trunk/teraterm/common/i18n.h	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/common/i18n.h	2017-06-13 10:30:12 UTC (rev 6801)
@@ -14,8 +14,8 @@
 extern "C" {
 #endif
 
-void FAR PASCAL GetI18nStr(PCHAR section, PCHAR key, PCHAR buf, int buf_len, PCHAR def, PCHAR iniFile);
-int FAR PASCAL GetI18nLogfont(PCHAR section, PCHAR key, PLOGFONT logfont, int ppi, PCHAR iniFile);
+void PASCAL GetI18nStr(PCHAR section, PCHAR key, PCHAR buf, int buf_len, PCHAR def, PCHAR iniFile);
+int PASCAL GetI18nLogfont(PCHAR section, PCHAR key, PLOGFONT logfont, int ppi, PCHAR iniFile);
 
 #ifdef __cplusplus
 }

Modified: trunk/teraterm/common/ttcommon.h
===================================================================
--- trunk/teraterm/common/ttcommon.h	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/common/ttcommon.h	2017-06-13 10:30:12 UTC (rev 6801)
@@ -13,64 +13,64 @@
 int PASCAL CheckComPort(WORD ComPort);
 void PASCAL CopyShmemToTTSet(PTTSet ts);
 void PASCAL CopyTTSetToShmem(PTTSet ts);
-BOOL FAR PASCAL StartTeraTerm(PTTSet ts);
-void PASCAL FAR RestartTeraTerm(HWND hwnd, PTTSet ts);
-void FAR PASCAL ChangeDefaultSet(PTTSet ts, PKeyMap km);
-void FAR PASCAL GetDefaultSet(PTTSet ts);
-// void FAR PASCAL LoadDefaultSet(PCHAR SetupFName);
-WORD FAR PASCAL GetKeyCode(PKeyMap KeyMap, WORD Scan);
-void FAR PASCAL GetKeyStr(HWND HWin, PKeyMap KeyMap, WORD KeyCode,
+BOOL PASCAL StartTeraTerm(PTTSet ts);
+void PASCAL RestartTeraTerm(HWND hwnd, PTTSet ts);
+void PASCAL ChangeDefaultSet(PTTSet ts, PKeyMap km);
+void PASCAL GetDefaultSet(PTTSet ts);
+// void PASCAL LoadDefaultSet(PCHAR SetupFName);
+WORD PASCAL GetKeyCode(PKeyMap KeyMap, WORD Scan);
+void PASCAL GetKeyStr(HWND HWin, PKeyMap KeyMap, WORD KeyCode,
                           BOOL AppliKeyMode, BOOL AppliCursorMode,
                           BOOL Send8BitMode, PCHAR KeyStr,
                           int destlen, LPINT Len, LPWORD Type);
 
-void FAR PASCAL SetCOMFlag(int com);
-void FAR PASCAL ClearCOMFlag(int com);
-int FAR PASCAL CheckCOMFlag(int com);
+void PASCAL SetCOMFlag(int com);
+void PASCAL ClearCOMFlag(int com);
+int PASCAL CheckCOMFlag(int com);
 
-int FAR PASCAL RegWin(HWND HWinVT, HWND HWinTEK);
-void FAR PASCAL UnregWin(HWND HWin);
-void FAR PASCAL SetWinMenu(HMENU menu, PCHAR buf, int buflen, PCHAR langFile, int VTFlag);
-void FAR PASCAL SetWinList(HWND HWin, HWND HDlg, int IList);
-void FAR PASCAL SelectWin(int WinId);
-void FAR PASCAL SelectNextWin(HWND HWin, int Next, BOOL SkipIconic);
-HWND FAR PASCAL GetNthWin(int n);
-void FAR PASCAL ShowAllWin(int stat);
-void FAR PASCAL ShowAllWinSidebySide(HWND);
-void FAR PASCAL ShowAllWinStacked(HWND);
-void FAR PASCAL ShowAllWinCascade(HWND);
-void FAR PASCAL BroadcastClosingMessage(HWND myhwnd);
-void FAR PASCAL UndoAllWin();
-void FAR PASCAL OpenHelp(UINT Command, DWORD Data, char *UILanguageFile);
+int PASCAL RegWin(HWND HWinVT, HWND HWinTEK);
+void PASCAL UnregWin(HWND HWin);
+void PASCAL SetWinMenu(HMENU menu, PCHAR buf, int buflen, PCHAR langFile, int VTFlag);
+void PASCAL SetWinList(HWND HWin, HWND HDlg, int IList);
+void PASCAL SelectWin(int WinId);
+void PASCAL SelectNextWin(HWND HWin, int Next, BOOL SkipIconic);
+HWND PASCAL GetNthWin(int n);
+void PASCAL ShowAllWin(int stat);
+void PASCAL ShowAllWinSidebySide(HWND);
+void PASCAL ShowAllWinStacked(HWND);
+void PASCAL ShowAllWinCascade(HWND);
+void PASCAL BroadcastClosingMessage(HWND myhwnd);
+void PASCAL UndoAllWin();
+void PASCAL OpenHelp(UINT Command, DWORD Data, char *UILanguageFile);
 
-int FAR PASCAL CommReadRawByte(PComVar cv, LPBYTE b);
-int FAR PASCAL CommRead1Byte(PComVar cv, LPBYTE b);
-void FAR PASCAL CommInsert1Byte(PComVar cv, BYTE b);
-int FAR PASCAL CommRawOut(PComVar cv, PCHAR B, int C);
-int FAR PASCAL CommBinaryOut(PComVar cv, PCHAR B, int C);
-int FAR PASCAL CommBinaryBuffOut(PComVar cv, PCHAR B, int C);
-int FAR PASCAL CommTextOut(PComVar cv, PCHAR B, int C);
-int FAR PASCAL CommBinaryEcho(PComVar cv, PCHAR B, int C);
-int FAR PASCAL CommTextEcho(PComVar cv, PCHAR B, int C);
+int PASCAL CommReadRawByte(PComVar cv, LPBYTE b);
+int PASCAL CommRead1Byte(PComVar cv, LPBYTE b);
+void PASCAL CommInsert1Byte(PComVar cv, BYTE b);
+int PASCAL CommRawOut(PComVar cv, PCHAR B, int C);
+int PASCAL CommBinaryOut(PComVar cv, PCHAR B, int C);
+int PASCAL CommBinaryBuffOut(PComVar cv, PCHAR B, int C);
+int PASCAL CommTextOut(PComVar cv, PCHAR B, int C);
+int PASCAL CommBinaryEcho(PComVar cv, PCHAR B, int C);
+int PASCAL CommTextEcho(PComVar cv, PCHAR B, int C);
 
-void FAR PASCAL CreateNotifyIcon(PComVar cv);
-void FAR PASCAL DeleteNotifyIcon(PComVar cv);
-void FAR PASCAL NotifyMessage(PComVar cv, PCHAR message, PCHAR title, DWORD flag);
-void FAR PASCAL ShowNotifyIcon(PComVar cv);
-void FAR PASCAL HideNotifyIcon(PComVar cv);
-void FAR PASCAL SetVerNotifyIcon(PComVar cv, unsigned int ver);
-void FAR PASCAL SetCustomNotifyIcon(HICON icon);
-HICON FAR PASCAL GetCustomNotifyIcon();
+void PASCAL CreateNotifyIcon(PComVar cv);
+void PASCAL DeleteNotifyIcon(PComVar cv);
+void PASCAL NotifyMessage(PComVar cv, PCHAR message, PCHAR title, DWORD flag);
+void PASCAL ShowNotifyIcon(PComVar cv);
+void PASCAL HideNotifyIcon(PComVar cv);
+void PASCAL SetVerNotifyIcon(PComVar cv, unsigned int ver);
+void PASCAL SetCustomNotifyIcon(HICON icon);
+HICON PASCAL GetCustomNotifyIcon();
 
 #define NotifyInfoMessage(cv, msg, title) NotifyMessage(cv, msg, title, 1)
 #define NotifyWarnMessage(cv, msg, title) NotifyMessage(cv, msg, title, 2)
 #define NotifyErrorMessage(cv, msg, title) NotifyMessage(cv, msg, title, 3)
 
-WORD FAR PASCAL SJIS2JIS(WORD KCode);
-WORD FAR PASCAL SJIS2EUC(WORD KCode);
-WORD FAR PASCAL JIS2SJIS(WORD KCode);
-BYTE FAR PASCAL RussConv(int cin, int cout, BYTE b);
-void FAR PASCAL RussConvStr
+WORD PASCAL SJIS2JIS(WORD KCode);
+WORD PASCAL SJIS2EUC(WORD KCode);
+WORD PASCAL JIS2SJIS(WORD KCode);
+BYTE PASCAL RussConv(int cin, int cout, BYTE b);
+void PASCAL RussConvStr
   (int cin, int cout, PCHAR Str, int count);
 
 #ifdef __cplusplus

Modified: trunk/teraterm/common/ttlib.c
===================================================================
--- trunk/teraterm/common/ttlib.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/common/ttlib.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -1555,7 +1555,7 @@
 	return strtime;
 }
 
-PCHAR FAR PASCAL GetParam(PCHAR buff, int size, PCHAR param)
+PCHAR PASCAL GetParam(PCHAR buff, int size, PCHAR param)
 {
 	int i = 0;
 	BOOL quoted = FALSE;
@@ -1593,7 +1593,7 @@
 	return (param);
 }
 
-void FAR PASCAL DequoteParam(PCHAR dest, int dest_len, PCHAR src)
+void PASCAL DequoteParam(PCHAR dest, int dest_len, PCHAR src)
 {
 	BOOL quoted = FALSE;
 	PCHAR dest_end = dest + dest_len - 1;
@@ -1616,7 +1616,7 @@
 	*dest = '\0';
 }
 
-void FAR PASCAL DeleteComment(PCHAR dest, int dest_size, PCHAR src)
+void PASCAL DeleteComment(PCHAR dest, int dest_size, PCHAR src)
 {
 	BOOL quoted = FALSE;
 	PCHAR dest_end = dest + dest_size - 1;

Modified: trunk/teraterm/common/ttlib.h
===================================================================
--- trunk/teraterm/common/ttlib.h	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/common/ttlib.h	2017-06-13 10:30:12 UTC (rev 6801)
@@ -68,9 +68,9 @@
 void b64encode(PCHAR dst, int dsize, PCHAR src, int len);
 int b64decode(PCHAR dst, int dsize, PCHAR src);
 
-PCHAR FAR PASCAL GetParam(PCHAR buff, int size, PCHAR param);
-void FAR PASCAL DequoteParam(PCHAR dest, int dest_len, PCHAR src);
-void FAR PASCAL DeleteComment(PCHAR dest, int dest_size, PCHAR src);
+PCHAR PASCAL GetParam(PCHAR buff, int size, PCHAR param);
+void PASCAL DequoteParam(PCHAR dest, int dest_len, PCHAR src);
+void PASCAL DeleteComment(PCHAR dest, int dest_size, PCHAR src);
 
 void split_buffer(char *buffer, int delimiter, char **head, char **body);
 

Modified: trunk/teraterm/common/ttplugin.h
===================================================================
--- trunk/teraterm/common/ttplugin.h	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/common/ttplugin.h	2017-06-13 10:30:12 UTC (rev 6801)
@@ -14,72 +14,72 @@
 #include "ttfileio.h"
 
 typedef struct {
-  Tclosesocket FAR * Pclosesocket;
-  Tconnect FAR * Pconnect;
-  Thtonl FAR * Phtonl;
-  Thtons FAR * Phtons;
-  Tinet_addr FAR * Pinet_addr;
-  Tioctlsocket FAR * Pioctlsocket;
-  Trecv FAR * Precv;
-  Tselect FAR * Pselect;
-  Tsend FAR * Psend;
-  Tsetsockopt FAR * Psetsockopt;
-  Tsocket FAR * Psocket;
-  TWSAAsyncSelect FAR * PWSAAsyncSelect;
-  TWSAAsyncGetHostByName FAR * PWSAAsyncGetHostByName;
-  TWSACancelAsyncRequest FAR * PWSACancelAsyncRequest;
-  TWSAGetLastError FAR * PWSAGetLastError;
-//  Tgetaddrinfo FAR * Pgetaddrinfo;
-  Tfreeaddrinfo FAR * Pfreeaddrinfo;
-  TWSAAsyncGetAddrInfo FAR * PWSAAsyncGetAddrInfo;
+  Tclosesocket * Pclosesocket;
+  Tconnect * Pconnect;
+  Thtonl * Phtonl;
+  Thtons * Phtons;
+  Tinet_addr * Pinet_addr;
+  Tioctlsocket * Pioctlsocket;
+  Trecv * Precv;
+  Tselect * Pselect;
+  Tsend * Psend;
+  Tsetsockopt * Psetsockopt;
+  Tsocket * Psocket;
+  TWSAAsyncSelect * PWSAAsyncSelect;
+  TWSAAsyncGetHostByName * PWSAAsyncGetHostByName;
+  TWSACancelAsyncRequest * PWSACancelAsyncRequest;
+  TWSAGetLastError * PWSAGetLastError;
+//  Tgetaddrinfo * Pgetaddrinfo;
+  Tfreeaddrinfo * Pfreeaddrinfo;
+  TWSAAsyncGetAddrInfo * PWSAAsyncGetAddrInfo;
 } TTXSockHooks;
 
 typedef struct {
-  TCreateFile FAR * PCreateFile;
-  TCloseFile FAR * PCloseFile;
-  TReadFile FAR * PReadFile;
-  TWriteFile FAR * PWriteFile;
+  TCreateFile * PCreateFile;
+  TCloseFile * PCloseFile;
+  TReadFile * PReadFile;
+  TWriteFile * PWriteFile;
 } TTXFileHooks;
 
 typedef struct {
-  PReadIniFile FAR * ReadIniFile;
-  PWriteIniFile FAR * WriteIniFile;
-  PReadKeyboardCnf FAR * ReadKeyboardCnf;
-  PCopyHostList FAR * CopyHostList;
-  PAddHostToList FAR * AddHostToList;
-  PParseParam FAR * ParseParam;
+  PReadIniFile * ReadIniFile;
+  PWriteIniFile * WriteIniFile;
+  PReadKeyboardCnf * ReadKeyboardCnf;
+  PCopyHostList * CopyHostList;
+  PAddHostToList * AddHostToList;
+  PParseParam * ParseParam;
 } TTXSetupHooks;
 
 typedef struct {
-  PSetupTerminal FAR * SetupTerminal;
-  PSetupWin FAR * SetupWin;
-  PSetupKeyboard FAR * SetupKeyboard;
-  PSetupSerialPort FAR * SetupSerialPort;
-  PSetupTCPIP FAR * SetupTCPIP;
-  PGetHostName FAR * GetHostName;
-  PChangeDirectory FAR * ChangeDirectory;
-  PAboutDialog FAR * AboutDialog;
-  PChooseFontDlg FAR * ChooseFontDlg;
-  PSetupGeneral FAR * SetupGeneral;
-  PWindowWindow FAR * WindowWindow;
+  PSetupTerminal * SetupTerminal;
+  PSetupWin * SetupWin;
+  PSetupKeyboard * SetupKeyboard;
+  PSetupSerialPort * SetupSerialPort;
+  PSetupTCPIP * SetupTCPIP;
+  PGetHostName * GetHostName;
+  PChangeDirectory * ChangeDirectory;
+  PAboutDialog * AboutDialog;
+  PChooseFontDlg * ChooseFontDlg;
+  PSetupGeneral * SetupGeneral;
+  PWindowWindow * WindowWindow;
 } TTXUIHooks;
 
 typedef struct {
   int size;
   int loadOrder; /* smaller numbers get loaded first */
-  void (PASCAL FAR * TTXInit)(PTTSet ts, PComVar cv); /* called first to last */
-  void (PASCAL FAR * TTXGetUIHooks)(TTXUIHooks FAR * UIHooks); /* called first to last */
-  void (PASCAL FAR * TTXGetSetupHooks)(TTXSetupHooks FAR * setupHooks); /* called first to last */
-  void (PASCAL FAR * TTXOpenTCP)(TTXSockHooks FAR * hooks); /* called first to last */
-  void (PASCAL FAR * TTXCloseTCP)(TTXSockHooks FAR * hooks); /* called last to first */
-  void (PASCAL FAR * TTXSetWinSize)(int rows, int cols); /* called first to last */
-  void (PASCAL FAR * TTXModifyMenu)(HMENU menu); /* called first to last */
-  void (PASCAL FAR * TTXModifyPopupMenu)(HMENU menu); /* called first to last */
-  int (PASCAL FAR * TTXProcessCommand)(HWND hWin, WORD cmd); /* returns TRUE if handled, called last to first */
-  void (PASCAL FAR * TTXEnd)(void); /* called last to first */
-  void (PASCAL FAR * TTXSetCommandLine)(PCHAR cmd, int cmdlen, PGetHNRec rec); /* called first to last */
-  void (PASCAL FAR * TTXOpenFile)(TTXFileHooks FAR * hooks); /* called first to last */
-  void (PASCAL FAR * TTXCloseFile)(TTXFileHooks FAR * hooks); /* called last to first */
+  void (PASCAL * TTXInit)(PTTSet ts, PComVar cv); /* called first to last */
+  void (PASCAL * TTXGetUIHooks)(TTXUIHooks * UIHooks); /* called first to last */
+  void (PASCAL * TTXGetSetupHooks)(TTXSetupHooks * setupHooks); /* called first to last */
+  void (PASCAL * TTXOpenTCP)(TTXSockHooks * hooks); /* called first to last */
+  void (PASCAL * TTXCloseTCP)(TTXSockHooks * hooks); /* called last to first */
+  void (PASCAL * TTXSetWinSize)(int rows, int cols); /* called first to last */
+  void (PASCAL * TTXModifyMenu)(HMENU menu); /* called first to last */
+  void (PASCAL * TTXModifyPopupMenu)(HMENU menu); /* called first to last */
+  int (PASCAL * TTXProcessCommand)(HWND hWin, WORD cmd); /* returns TRUE if handled, called last to first */
+  void (PASCAL * TTXEnd)(void); /* called last to first */
+  void (PASCAL * TTXSetCommandLine)(PCHAR cmd, int cmdlen, PGetHNRec rec); /* called first to last */
+  void (PASCAL * TTXOpenFile)(TTXFileHooks * hooks); /* called first to last */
+  void (PASCAL * TTXCloseFile)(TTXFileHooks * hooks); /* called last to first */
 } TTXExports;
 
 /* On entry, 'size' is set to the size of the structure and the rest of
@@ -88,6 +88,6 @@
    default behaviour, i.e. do nothing.
    This is all for binary compatibility across releases; if the record gets bigger,
    then the extra functions will be NULL for DLLs that don't understand them. */
-typedef BOOL (PASCAL FAR * TTXBindProc)(WORD Version, TTXExports FAR * exports);
+typedef BOOL (PASCAL * TTXBindProc)(WORD Version, TTXExports * exports);
 
 #endif

Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/common/tttypes.h	2017-06-13 10:30:12 UTC (rev 6801)
@@ -1010,8 +1010,8 @@
 	WORD NoMsg;
 	/* if TRUE, teraterm trys to connect other protocol family */
 	BOOL RetryWithOtherProtocol;
-	struct addrinfo FAR * res0;
-	struct addrinfo FAR * res;
+	struct addrinfo * res0;
+	struct addrinfo * res;
 	char *Locale;
 	int *CodePage;
 	int *ConnetingTimeout;

Modified: trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.c
===================================================================
--- trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -9,23 +9,23 @@
 #include "WSAASyncGetAddrInfo.h"
 #include "ttwsk.h"
 
-static unsigned __stdcall getaddrinfo_thread(void FAR * p);
+static unsigned __stdcall getaddrinfo_thread(void * p);
 
-HANDLE FAR PASCAL WSAAsyncGetAddrInfo(HWND hWnd, unsigned int wMsg,
-                           const char FAR * hostname,
-                           const char FAR * portname,
-                           struct addrinfo FAR * hints,
-                           struct addrinfo FAR * FAR * res)
+HANDLE PASCAL WSAAsyncGetAddrInfo(HWND hWnd, unsigned int wMsg,
+                           const char *hostname,
+                           const char *portname,
+                           struct addrinfo *hints,
+                           struct addrinfo **res)
 {
 	HANDLE thread;
 	unsigned tid;
-	struct getaddrinfo_args FAR * ga;
+	struct getaddrinfo_args * ga;
 
 	/*
 	* allocate structure to pass args to sub-thread dynamically
 	* WSAAsyncGetAddrInfo() is reentrant
 	*/
-	if ((ga = (struct getaddrinfo_args FAR *)malloc(sizeof(struct getaddrinfo_args))) == NULL)
+	if ((ga = (struct getaddrinfo_args *)malloc(sizeof(struct getaddrinfo_args))) == NULL)
 		return NULL;
 
 	/* packing arguments struct addrinfo_args */
@@ -36,7 +36,7 @@
 	ga->hints = *hints; // \x83|\x83C\x83\x93\x83^\x82\xBE\x82\xAF\x93n\x82\xB7\x82?A\x83X\x83\x8C\x83b\x83h\x90\xE6\x82ŕs\x92\xE8\x82??\xE9\x81B(2016.3.11 yutaka)
 	ga->res = res;
 
-	ga->lpHandle = (HANDLE FAR *)malloc(sizeof(HANDLE));
+	ga->lpHandle = (HANDLE *)malloc(sizeof(HANDLE));
 	if (ga->lpHandle == NULL) {
 		free(ga->hostname);
 		free(ga->portname);
@@ -59,19 +59,19 @@
 		return (HANDLE)thread;
 }
 
-static unsigned __stdcall getaddrinfo_thread(void FAR * p)
+static unsigned __stdcall getaddrinfo_thread(void * p)
 {
 	int gai;
 	HWND hWnd;
 	unsigned int wMsg;
-	const char FAR * hostname;
-	const char FAR * portname;
-	struct addrinfo FAR * hints;
-	struct addrinfo FAR * FAR * res;
-	struct getaddrinfo_args FAR * ga;
+	const char *hostname;
+	const char *portname;
+	struct addrinfo *hints;
+	struct addrinfo **res;
+	struct getaddrinfo_args *ga;
 
 	/* unpacking arguments */
-	ga = (struct getaddrinfo_args FAR *)p;
+	ga = (struct getaddrinfo_args *)p;
 	hWnd = ga->hWnd;
 	wMsg = ga->wMsg;
 	hostname = ga->hostname;

Modified: trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.h
===================================================================
--- trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.h	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.h	2017-06-13 10:30:12 UTC (rev 6801)
@@ -12,18 +12,18 @@
 struct getaddrinfo_args {
   HWND hWnd;
   unsigned int wMsg;
-  char FAR * hostname;
-  char FAR * portname;
+  char *hostname;
+  char *portname;
   struct addrinfo hints;
-  struct addrinfo FAR * FAR * res;
-  HANDLE FAR * lpHandle;
+  struct addrinfo **res;
+  HANDLE *lpHandle;
 };
 
-HANDLE FAR PASCAL WSAAsyncGetAddrInfo(HWND hWnd,
+HANDLE PASCAL WSAAsyncGetAddrInfo(HWND hWnd,
 			   unsigned int wMsg,
-			   const char FAR * hostname,
-			   const char FAR * portname,
-			   struct addrinfo FAR * hints,
-			   struct addrinfo FAR * FAR * res);
+			   const char *hostname,
+			   const char *portname,
+			   struct addrinfo *hints,
+			   struct addrinfo **res);
 
 #endif /* __WSAASYNCGETADDRINFO__ */

Modified: trunk/teraterm/teraterm/commlib.c
===================================================================
--- trunk/teraterm/teraterm/commlib.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/commlib.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -42,7 +42,7 @@
 	BBuf = TRUE;
 	/* set synchronous mode */
 	PWSAAsyncSelect(cv->s,cv->HWin,0,0);
-	Psetsockopt(cv->s,(int)SOL_SOCKET,SO_OOBINLINE,(char FAR *)&BBuf,sizeof(BBuf));
+	Psetsockopt(cv->s,(int)SOL_SOCKET,SO_OOBINLINE,(char *)&BBuf,sizeof(BBuf));
 	/* set asynchronous mode */
 	PWSAAsyncSelect(cv->s,cv->HWin,WM_USER_COMMOPEN, FD_CONNECT);
 

Modified: trunk/teraterm/teraterm/filesys.h
===================================================================
--- trunk/teraterm/teraterm/filesys.h	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/filesys.h	2017-06-13 10:30:12 UTC (rev 6801)
@@ -6,24 +6,24 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-typedef BOOL (FAR PASCAL *PGetSetupFname)
+typedef BOOL (PASCAL *PGetSetupFname)
   (HWND HWin, WORD FuncId, PTTSet ts);
-typedef BOOL (FAR PASCAL *PGetTransFname)
+typedef BOOL (PASCAL *PGetTransFname)
   (PFileVar fv, PCHAR CurDir, WORD FuncId, LPLONG Option);
-typedef BOOL (FAR PASCAL *PGetMultiFname)
+typedef BOOL (PASCAL *PGetMultiFname)
   (PFileVar fv, PCHAR CurDir, WORD FuncId, LPWORD Option);
-typedef BOOL (FAR PASCAL *PGetGetFname)
+typedef BOOL (PASCAL *PGetGetFname)
   (HWND HWin, PFileVar fv);
-typedef void (FAR PASCAL *PSetFileVar) (PFileVar fv);
-typedef BOOL (FAR PASCAL *PGetXFname)
+typedef void (PASCAL *PSetFileVar) (PFileVar fv);
+typedef BOOL (PASCAL *PGetXFname)
   (HWND HWin, BOOL Receive, LPLONG Option, PFileVar fv, PCHAR CurDir);
-typedef void (FAR PASCAL *PProtoInit)
+typedef void (PASCAL *PProtoInit)
   (int Proto, PFileVar fv, PCHAR pv, PComVar cv, PTTSet ts);
-typedef BOOL (FAR PASCAL *PProtoParse)
+typedef BOOL (PASCAL *PProtoParse)
   (int Proto, PFileVar fv, PCHAR pv, PComVar cv);
-typedef void (FAR PASCAL *PProtoTimeOutProc)
+typedef void (PASCAL *PProtoTimeOutProc)
   (int Proto, PFileVar fv, PCHAR pv, PComVar cv);
-typedef BOOL (FAR PASCAL *PProtoCancel)
+typedef BOOL (PASCAL *PProtoCancel)
   (int Proto, PFileVar fv, PCHAR pv, PComVar cv);
 
 extern PGetSetupFname GetSetupFname;

Modified: trunk/teraterm/teraterm/teklib.h
===================================================================
--- trunk/teraterm/teraterm/teklib.h	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/teklib.h	2017-06-13 10:30:12 UTC (rev 6801)
@@ -8,43 +8,43 @@
 extern "C" {
 #endif
 
-typedef void (FAR PASCAL *PTEKInit)
+typedef void (PASCAL *PTEKInit)
   (PTEKVar tk, PTTSet ts);
-typedef void (FAR PASCAL *PTEKResizeWindow)
+typedef void (PASCAL *PTEKResizeWindow)
   (PTEKVar tk, PTTSet ts, int W, int H);
-typedef void (FAR PASCAL *PTEKChangeCaret)
+typedef void (PASCAL *PTEKChangeCaret)
   (PTEKVar tk, PTTSet ts);
-typedef void (FAR PASCAL *PTEKDestroyCaret)
+typedef void (PASCAL *PTEKDestroyCaret)
   (PTEKVar tk, PTTSet ts);
-typedef int (FAR PASCAL *PTEKParse)
+typedef int (PASCAL *PTEKParse)
   (PTEKVar tk, PTTSet ts, PComVar cv);
-typedef void (FAR PASCAL *PTEKReportGIN)
+typedef void (PASCAL *PTEKReportGIN)
   (PTEKVar tk, PTTSet ts, PComVar cv, BYTE KeyCode);
-typedef void (FAR PASCAL *PTEKPaint)
+typedef void (PASCAL *PTEKPaint)
   (PTEKVar tk, PTTSet ts, HDC PaintDC, PAINTSTRUCT *PaintInfo);
-typedef void (FAR PASCAL *PTEKWMLButtonDown)
+typedef void (PASCAL *PTEKWMLButtonDown)
   (PTEKVar tk, PTTSet ts, PComVar cv, POINT pos);
-typedef void (FAR PASCAL *PTEKWMLButtonUp)
+typedef void (PASCAL *PTEKWMLButtonUp)
   (PTEKVar tk, PTTSet ts);
-typedef void (FAR PASCAL *PTEKWMMouseMove)
+typedef void (PASCAL *PTEKWMMouseMove)
   (PTEKVar tk, PTTSet ts, POINT p);
-typedef void (FAR PASCAL *PTEKWMSize)
+typedef void (PASCAL *PTEKWMSize)
   (PTEKVar tk, PTTSet ts, int W, int H, int cx, int cy);
-typedef void (FAR PASCAL *PTEKCMCopy)
+typedef void (PASCAL *PTEKCMCopy)
   (PTEKVar tk, PTTSet ts);
-typedef void (FAR PASCAL *PTEKCMCopyScreen)
+typedef void (PASCAL *PTEKCMCopyScreen)
   (PTEKVar tk, PTTSet ts);
-typedef void (FAR PASCAL *PTEKPrint)
+typedef void (PASCAL *PTEKPrint)
   (PTEKVar tk, PTTSet ts, HDC PrintDC, BOOL SelFlag);
-typedef void (FAR PASCAL *PTEKClearScreen)
+typedef void (PASCAL *PTEKClearScreen)
   (PTEKVar tk, PTTSet ts);
-typedef void (FAR PASCAL *PTEKSetupFont)
+typedef void (PASCAL *PTEKSetupFont)
   (PTEKVar tk, PTTSet ts);
-typedef void (FAR PASCAL *PTEKResetWin)
+typedef void (PASCAL *PTEKResetWin)
   (PTEKVar tk, PTTSet ts, WORD EmuOld);
-typedef void (FAR PASCAL *PTEKRestoreSetup)
+typedef void (PASCAL *PTEKRestoreSetup)
   (PTEKVar tk, PTTSet ts);
-typedef void (FAR PASCAL *PTEKEnd)
+typedef void (PASCAL *PTEKEnd)
   (PTEKVar tk);
 
 extern PTEKInit TEKInit;

Modified: trunk/teraterm/teraterm/tekwin.cpp
===================================================================
--- trunk/teraterm/teraterm/tekwin.cpp	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/tekwin.cpp	2017-06-13 10:30:12 UTC (rev 6801)
@@ -349,7 +349,7 @@
 	ActiveWin = IdVT;
 }
 
-void CTEKWindow::OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI)
+void CTEKWindow::OnGetMinMaxInfo(MINMAXINFO *lpMMI)
 {
 	lpMMI->ptMaxSize.x = 10000;
 	lpMMI->ptMaxSize.y = 10000;

Modified: trunk/teraterm/teraterm/tekwin.h
===================================================================
--- trunk/teraterm/teraterm/tekwin.h	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/tekwin.h	2017-06-13 10:30:12 UTC (rev 6801)
@@ -39,7 +39,7 @@
 	afx_msg void OnActivate(UINT nState, CWnd* pWndOther, BOOL bMinimized);
 	afx_msg void OnChar(UINT nChar, UINT nRepCnt, UINT nFlags);
 	afx_msg void OnDestroy();
-	afx_msg void OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI);
+	afx_msg void OnGetMinMaxInfo(MINMAXINFO *lpMMI);
 	afx_msg void OnInitMenuPopup(CMenu* pPopupMenu, UINT nIndex, BOOL bSysMenu);
 	afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);
 	afx_msg void OnKeyUp(UINT nChar, UINT nRepCnt, UINT nFlags);

Modified: trunk/teraterm/teraterm/ttdialog.h
===================================================================
--- trunk/teraterm/teraterm/ttdialog.h	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/ttdialog.h	2017-06-13 10:30:12 UTC (rev 6801)
@@ -7,27 +7,27 @@
 extern "C" {
 #endif
 
-typedef BOOL (FAR PASCAL *PSetupTerminal)
+typedef BOOL (PASCAL *PSetupTerminal)
   (HWND WndParent, PTTSet ts);
-typedef BOOL (FAR PASCAL *PSetupWin)
+typedef BOOL (PASCAL *PSetupWin)
   (HWND WndParent, PTTSet ts);
-typedef BOOL (FAR PASCAL *PSetupKeyboard)
+typedef BOOL (PASCAL *PSetupKeyboard)
   (HWND WndParent, PTTSet ts);
-typedef BOOL (FAR PASCAL *PSetupSerialPort)
+typedef BOOL (PASCAL *PSetupSerialPort)
   (HWND WndParent, PTTSet ts);
-typedef BOOL (FAR PASCAL *PSetupTCPIP)
+typedef BOOL (PASCAL *PSetupTCPIP)
   (HWND WndParent, PTTSet ts);
-typedef BOOL (FAR PASCAL *PGetHostName)
+typedef BOOL (PASCAL *PGetHostName)
   (HWND WndParent, PGetHNRec GetHNRec);
-typedef BOOL (FAR PASCAL *PChangeDirectory)
+typedef BOOL (PASCAL *PChangeDirectory)
   (HWND WndParent, PCHAR CurDir);
-typedef BOOL (FAR PASCAL *PAboutDialog)
+typedef BOOL (PASCAL *PAboutDialog)
   (HWND WndParent);
-typedef BOOL (FAR PASCAL *PChooseFontDlg)
+typedef BOOL (PASCAL *PChooseFontDlg)
   (HWND WndParent, LPLOGFONT LogFont, PTTSet ts);
-typedef BOOL (FAR PASCAL *PSetupGeneral)
+typedef BOOL (PASCAL *PSetupGeneral)
   (HWND WndParent, PTTSet ts);
-typedef BOOL (FAR PASCAL *PWindowWindow)
+typedef BOOL (PASCAL *PWindowWindow)
   (HWND WndParent, PBOOL Close);
 
 extern PSetupTerminal SetupTerminal;
@@ -42,7 +42,7 @@
 extern PSetupGeneral SetupGeneral;
 extern PWindowWindow WindowWindow;
 
-extern void FAR PASCAL TTDLGSetUILanguageFile(char *file);
+extern void PASCAL TTDLGSetUILanguageFile(char *file);
 
 /* proto types */
 BOOL LoadTTDLG();

Modified: trunk/teraterm/teraterm/ttfileio.c
===================================================================
--- trunk/teraterm/teraterm/ttfileio.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/ttfileio.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -14,7 +14,7 @@
 TCreateFile PCreateFile;
 TCloseFile PCloseFile;
 
-static BOOL PASCAL FAR DummyWriteFile(HANDLE fh, LPCVOID buff,
+static BOOL PASCAL DummyWriteFile(HANDLE fh, LPCVOID buff,
   DWORD len, LPDWORD wbytes, LPOVERLAPPED wol)
 {
 	*wbytes = len;

Modified: trunk/teraterm/teraterm/ttfileio.h
===================================================================
--- trunk/teraterm/teraterm/ttfileio.h	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/ttfileio.h	2017-06-13 10:30:12 UTC (rev 6801)
@@ -7,16 +7,16 @@
 extern "C" {
 #endif
 
-typedef BOOL (PASCAL FAR *TReadFile)
+typedef BOOL (PASCAL *TReadFile)
   (HANDLE FHandle, LPVOID Buff, DWORD ReadSize, LPDWORD ReadBytes,
    LPOVERLAPPED ReadOverLap);
-typedef BOOL (PASCAL FAR *TWriteFile)
+typedef BOOL (PASCAL *TWriteFile)
   (HANDLE FHandle, LPCVOID Buff, DWORD WriteSize, LPDWORD WriteBytes,
    LPOVERLAPPED WriteOverLap);
-typedef HANDLE (PASCAL FAR *TCreateFile)
+typedef HANDLE (PASCAL *TCreateFile)
   (LPCTSTR FName, DWORD AcMode, DWORD ShMode, LPSECURITY_ATTRIBUTES SecAttr,
    DWORD CreateDisposition, DWORD FileAttr, HANDLE Template);
-typedef BOOL (PASCAL FAR *TCloseFile)
+typedef BOOL (PASCAL *TCloseFile)
   (HANDLE FHandle);
 
 extern TReadFile PReadFile;

Modified: trunk/teraterm/teraterm/ttime.c
===================================================================
--- trunk/teraterm/teraterm/ttime.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/ttime.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -22,7 +22,7 @@
     DWORD dwStyle;
     POINT ptCurrentPos;
     RECT  rcArea;
-  } COMPOSITIONFORM, *PCOMPOSITIONFORM, NEAR *NPCOMPOSITIONFORM, FAR *LPCOMPOSITIONFORM;
+  } COMPOSITIONFORM, *PCOMPOSITIONFORM, NEAR *NPCOMPOSITIONFORM, *LPCOMPOSITIONFORM;
 #endif //_IMM_
 
 #define GCS_RESULTSTR 0x0800

Modified: trunk/teraterm/teraterm/ttplug.c
===================================================================
--- trunk/teraterm/teraterm/ttplug.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/ttplug.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -53,7 +53,7 @@
       newExtension->exports = (TTXExports *)malloc(sizeof(TTXExports));
       memset(newExtension->exports, 0, sizeof(TTXExports));
       newExtension->exports->size = sizeof(TTXExports);
-      if (bind(TTVERSION,(TTXExports FAR *)newExtension->exports)) {
+      if (bind(TTVERSION,(TTXExports *)newExtension->exports)) {
         newExtension->next = *extensions;
         *extensions = newExtension;
         NumExtensions++;
@@ -75,7 +75,7 @@
   MessageBox(NULL, buf, uimsg, MB_OK | MB_ICONEXCLAMATION);
 }
 
-void PASCAL FAR TTXInit(PTTSet ts, PComVar cv) {
+void PASCAL TTXInit(PTTSet ts, PComVar cv) {
   ExtensionList * extensionList = NULL;
   int i;
 
@@ -119,7 +119,7 @@
   }
 }
 
-void PASCAL FAR TTXInternalOpenTCP(TTXSockHooks FAR * hooks) {
+void PASCAL TTXInternalOpenTCP(TTXSockHooks * hooks) {
   int i;
 
   for (i = 0; i < NumExtensions; i++) {
@@ -129,7 +129,7 @@
   }
 }
 
-void PASCAL FAR TTXInternalCloseTCP(TTXSockHooks FAR * hooks) {
+void PASCAL TTXInternalCloseTCP(TTXSockHooks * hooks) {
   int i;
 
   for (i = NumExtensions - 1; i >= 0; i--) {
@@ -139,7 +139,7 @@
   }
 }
 
-void PASCAL FAR TTXInternalOpenFile(TTXFileHooks FAR * hooks) {
+void PASCAL TTXInternalOpenFile(TTXFileHooks * hooks) {
   int i;
 
   for (i = 0; i < NumExtensions; i++) {
@@ -149,7 +149,7 @@
   }
 }
 
-void PASCAL FAR TTXInternalCloseFile(TTXFileHooks FAR * hooks) {
+void PASCAL TTXInternalCloseFile(TTXFileHooks * hooks) {
   int i;
 
   for (i = NumExtensions - 1; i >= 0; i--) {
@@ -159,7 +159,7 @@
   }
 }
 
-void PASCAL FAR TTXInternalGetUIHooks(TTXUIHooks FAR * hooks) {
+void PASCAL TTXInternalGetUIHooks(TTXUIHooks * hooks) {
   int i;
 
   for (i = 0; i < NumExtensions; i++) {
@@ -169,7 +169,7 @@
   }
 }
 
-void PASCAL FAR TTXInternalGetSetupHooks(TTXSetupHooks FAR * hooks) {
+void PASCAL TTXInternalGetSetupHooks(TTXSetupHooks * hooks) {
   int i;
 
   for (i = NumExtensions - 1; i >= 0; i--) {
@@ -179,7 +179,7 @@
   }
 }
 
-void PASCAL FAR TTXSetWinSize(int rows, int cols) {
+void PASCAL TTXSetWinSize(int rows, int cols) {
   int i;
 
   for (i = 0; i < NumExtensions; i++) {
@@ -189,7 +189,7 @@
   }
 }
 
-void PASCAL FAR TTXModifyMenu(HMENU menu) {
+void PASCAL TTXModifyMenu(HMENU menu) {
   int i;
 
   for (i = 0; i < NumExtensions; i++) {
@@ -199,7 +199,7 @@
   }
 }
 
-void PASCAL FAR TTXModifyPopupMenu(HMENU menu) {
+void PASCAL TTXModifyPopupMenu(HMENU menu) {
   int i;
 
   for (i = 0; i < NumExtensions; i++) {
@@ -209,7 +209,7 @@
   }
 }
 
-BOOL PASCAL FAR TTXProcessCommand(HWND hWin, WORD cmd) {
+BOOL PASCAL TTXProcessCommand(HWND hWin, WORD cmd) {
   int i;
 
   for (i = NumExtensions - 1; i >= 0; i--) {
@@ -223,7 +223,7 @@
   return FALSE;
 }
 
-void PASCAL FAR TTXEnd(void) {
+void PASCAL TTXEnd(void) {
   int i;
 
   if (NumExtensions==0) return;
@@ -245,7 +245,7 @@
   NumExtensions = 0;
 }
 
-void PASCAL FAR TTXSetCommandLine(PCHAR cmd, int cmdlen, PGetHNRec rec) {
+void PASCAL TTXSetCommandLine(PCHAR cmd, int cmdlen, PGetHNRec rec) {
   int i;
 
   for (i = 0; i < NumExtensions; i++) {

Modified: trunk/teraterm/teraterm/ttplug.h
===================================================================
--- trunk/teraterm/teraterm/ttplug.h	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/ttplug.h	2017-06-13 10:30:12 UTC (rev 6801)
@@ -9,12 +9,12 @@
 
 /* This function initializes the extensions and is called at the beginning
    of the program. */
-void PASCAL FAR TTXInit(PTTSet ts, PComVar cv);
+void PASCAL TTXInit(PTTSet ts, PComVar cv);
 
 /* This function is called when a TCP connection is about to be opened.
    This macro stuff is to make sure that the functions in the caller's
    EXE or DLL are hooked. */
-void PASCAL FAR TTXInternalOpenTCP(TTXSockHooks FAR * hooks);
+void PASCAL TTXInternalOpenTCP(TTXSockHooks * hooks);
 #define TTXOpenTCP()                                             \
   do {                                                           \
     static TTXSockHooks SockHooks = {                            \
@@ -30,7 +30,7 @@
 /* This function is called when a TCP connection has been closed.
    This macro stuff is to make sure that the functions in the caller's
    EXE or DLL are hooked. */
-void PASCAL FAR TTXInternalCloseTCP(TTXSockHooks FAR * hooks);
+void PASCAL TTXInternalCloseTCP(TTXSockHooks * hooks);
 #define TTXCloseTCP()                                            \
   do {                                                           \
     static TTXSockHooks SockHooks = {                            \
@@ -43,7 +43,7 @@
     TTXInternalCloseTCP(&SockHooks);                             \
   } while (0)
 
-void PASCAL FAR TTXInternalOpenFile(TTXFileHooks FAR * hooks);
+void PASCAL TTXInternalOpenFile(TTXFileHooks * hooks);
 #define TTXOpenFile()                                            \
   do {                                                           \
     static TTXFileHooks FileHooks = {                            \
@@ -52,7 +52,7 @@
     TTXInternalOpenFile(&FileHooks);                             \
   } while (0)
 
-void PASCAL FAR TTXInternalCloseFile(TTXFileHooks FAR * hooks);
+void PASCAL TTXInternalCloseFile(TTXFileHooks * hooks);
 #define TTXCloseFile()                                           \
   do {                                                           \
     static TTXFileHooks FileHooks = {                            \
@@ -64,7 +64,7 @@
 /* This function is called after the TTDLG DLL has been loaded.
    This macro stuff is to make sure that the functions in the caller's
    EXE or DLL are hooked. */
-void PASCAL FAR TTXInternalGetUIHooks(TTXUIHooks FAR * hooks);
+void PASCAL TTXInternalGetUIHooks(TTXUIHooks * hooks);
 #define TTXGetUIHooks()                                            \
   do {                                                             \
     static TTXUIHooks UIHooks = {                                  \
@@ -78,7 +78,7 @@
 /* This function is called after the TTSET DLL has been loaded.
    This macro stuff is to make sure that the functions in the caller's
    EXE or DLL are hooked. */
-void PASCAL FAR TTXInternalGetSetupHooks(TTXSetupHooks FAR * hooks);
+void PASCAL TTXInternalGetSetupHooks(TTXSetupHooks * hooks);
 #define TTXGetSetupHooks()                                            \
   do {                                                                \
     static TTXSetupHooks SetupHooks = {                               \
@@ -89,27 +89,27 @@
   } while (0)
 
 /* This function is called when the window size has changed. */
-void PASCAL FAR TTXSetWinSize(int rows, int cols);
+void PASCAL TTXSetWinSize(int rows, int cols);
 
 /* This function adds the extensions' entries to the menu, which is the
    handle for the program's menubar. */
-void PASCAL FAR TTXModifyMenu(HMENU menu);
+void PASCAL TTXModifyMenu(HMENU menu);
 
 /* This function is called when a popup menu is about to be displayed.
    The status of the entries is set appropriately. */
-void PASCAL FAR TTXModifyPopupMenu(HMENU menu);
+void PASCAL TTXModifyPopupMenu(HMENU menu);
 
 /* This function calls on the extensions to handle a command. It returns
    TRUE if they handle it, otherwise FALSE. */
-BOOL PASCAL FAR TTXProcessCommand(HWND hWin, WORD cmd);
+BOOL PASCAL TTXProcessCommand(HWND hWin, WORD cmd);
 
 /* This function is called to see whether Telnet mode can be turned on when
    Tera Term thinks it has detected a telnetd */
-void PASCAL FAR TTXEnd(void);
+void PASCAL TTXEnd(void);
 
 /* This function is called when a new Tera Term is being started with certain
    settings and the extension may wish to add some options to the command line */
-void PASCAL FAR TTXSetCommandLine(PCHAR cmd, int cmdlen, PGetHNRec rec);
+void PASCAL TTXSetCommandLine(PCHAR cmd, int cmdlen, PGetHNRec rec);
 #ifdef __cplusplus
 }
 #endif

Modified: trunk/teraterm/teraterm/ttsetup.h
===================================================================
--- trunk/teraterm/teraterm/ttsetup.h	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/ttsetup.h	2017-06-13 10:30:12 UTC (rev 6801)
@@ -7,21 +7,21 @@
 extern "C" {
 #endif
 
-typedef void (PASCAL FAR *PReadIniFile)
+typedef void (PASCAL *PReadIniFile)
   (PCHAR FName, PTTSet ts);
-typedef void (PASCAL FAR *PWriteIniFile)
+typedef void (PASCAL *PWriteIniFile)
   (PCHAR FName, PTTSet ts);
-typedef void (PASCAL FAR *PReadKeyboardCnf)
+typedef void (PASCAL *PReadKeyboardCnf)
   (PCHAR FName, PKeyMap KeyMap, BOOL ShowWarning);
-typedef void (PASCAL FAR *PCopyHostList)
+typedef void (PASCAL *PCopyHostList)
   (PCHAR IniSrc, PCHAR IniDest);
-typedef void (PASCAL FAR *PAddHostToList)
+typedef void (PASCAL *PAddHostToList)
   (PCHAR FName, PCHAR Host);
-typedef void (PASCAL FAR *PParseParam)
+typedef void (PASCAL *PParseParam)
   (PCHAR Param, PTTSet ts, PCHAR DDETopic);
-typedef void (PASCAL FAR *PCopySerialList)
+typedef void (PASCAL *PCopySerialList)
   (PCHAR IniSrc, PCHAR IniDest, PCHAR section, PCHAR key, int MaxList);
-typedef void (PASCAL FAR *PAddValueToList)
+typedef void (PASCAL *PAddValueToList)
   (PCHAR FName, PCHAR Host, PCHAR section, PCHAR key, int MaxList);
 
 extern PReadIniFile ReadIniFile;

Modified: trunk/teraterm/teraterm/ttwinman.c
===================================================================
--- trunk/teraterm/teraterm/ttwinman.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/ttwinman.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -53,7 +53,7 @@
 {
 #define IS_SJIS(n) (ts.KanjiCode == IdSJIS && IsDBCSLeadByte(n))
 #define IS_EUC(n) (ts.KanjiCode == IdEUC && (n & 0x80))
-	extern WORD FAR PASCAL JIS2SJIS(WORD KCode);
+	extern WORD PASCAL JIS2SJIS(WORD KCode);
 	int len = strlen(str);
 	char *cc = _alloca(len + 1);
 	char *c = cc;

Modified: trunk/teraterm/teraterm/ttwsk.h
===================================================================
--- trunk/teraterm/teraterm/ttwsk.h	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/ttwsk.h	2017-06-13 10:30:12 UTC (rev 6801)
@@ -11,46 +11,46 @@
 extern "C" {
 #endif
 
-typedef int (PASCAL FAR *Tclosesocket) (SOCKET s);
-typedef int (PASCAL FAR *Tconnect)
-  (SOCKET s, const struct sockaddr FAR *name, int namelen);
-typedef u_long (PASCAL FAR *Thtonl)
+typedef int (PASCAL *Tclosesocket) (SOCKET s);
+typedef int (PASCAL *Tconnect)
+  (SOCKET s, const struct sockaddr *name, int namelen);
+typedef u_long (PASCAL *Thtonl)
   (u_long hostlong);
-typedef u_short (PASCAL FAR *Thtons)
+typedef u_short (PASCAL *Thtons)
   (u_short hostshort);
-typedef unsigned long (PASCAL FAR *Tinet_addr)
-  (const char FAR * cp);
-typedef int (PASCAL FAR *Tioctlsocket)
-  (SOCKET s, long cmd, u_long FAR *argp);
-typedef int (PASCAL FAR *Trecv)
-  (SOCKET s, char FAR * buf, int len, int flags);
-typedef int (PASCAL FAR *Tselect)
-  (int nfds, fd_set FAR *readfds, fd_set FAR *writefds,
-   fd_set FAR *exceptfds, const struct timeval FAR *timeout);
-typedef int (PASCAL FAR *Tsend)
-  (SOCKET s, const char FAR * buf, int len, int flags);
-typedef int (PASCAL FAR *Tsetsockopt)
+typedef unsigned long (PASCAL *Tinet_addr)
+  (const char * cp);
+typedef int (PASCAL *Tioctlsocket)
+  (SOCKET s, long cmd, u_long *argp);
+typedef int (PASCAL *Trecv)
+  (SOCKET s, char * buf, int len, int flags);
+typedef int (PASCAL *Tselect)
+  (int nfds, fd_set *readfds, fd_set *writefds,
+   fd_set *exceptfds, const struct timeval *timeout);
+typedef int (PASCAL *Tsend)
+  (SOCKET s, const char * buf, int len, int flags);
+typedef int (PASCAL *Tsetsockopt)
   (SOCKET s, int level, int optname,
-   const char FAR * optval, int optlen);
-typedef SOCKET (PASCAL FAR *Tsocket)
+   const char * optval, int optlen);
+typedef SOCKET (PASCAL *Tsocket)
   (int af, int type, int protocol);
-//typedef struct hostent FAR * (PASCAL FAR *Tgethostbyname)
-//  (const char FAR * name);
-typedef int (PASCAL FAR *TWSAStartup)
+//typedef struct hostent * (PASCAL *Tgethostbyname)
+//  (const char * name);
+typedef int (PASCAL *TWSAStartup)
   (WORD wVersionRequired, LPWSADATA lpWSAData);
-typedef int (PASCAL FAR *TWSACleanup)(void);
-typedef int (PASCAL FAR *TWSAAsyncSelect)
+typedef int (PASCAL *TWSACleanup)(void);
+typedef int (PASCAL *TWSAAsyncSelect)
   (SOCKET s, HWND hWnd, u_int wMsg,long lEvent);
-typedef HANDLE (PASCAL FAR *TWSAAsyncGetHostByName)
-  (HWND hWnd, u_int wMsg, const char FAR * name, char FAR * buf, int buflen);
-typedef int (PASCAL FAR *TWSACancelAsyncRequest)(HANDLE hAsyncTaskHandle);
-typedef int (PASCAL FAR *TWSAGetLastError)(void);
-typedef HANDLE (PASCAL FAR *TWSAAsyncGetAddrInfo)
-  (HWND hWnd, unsigned int wMsg, const char FAR * hostname,
-   const char FAR * portname, struct addrinfo FAR * hints,
-   struct addrinfo FAR * FAR * res);
-// typedef int (PASCAL FAR *Tgetaddrinfo)(const char *name, const char *port, const struct addrinfo *hints, struct addrinfo **res);
-typedef void (PASCAL FAR *Tfreeaddrinfo)(struct addrinfo *ai);
+typedef HANDLE (PASCAL *TWSAAsyncGetHostByName)
+  (HWND hWnd, u_int wMsg, const char * name, char * buf, int buflen);
+typedef int (PASCAL *TWSACancelAsyncRequest)(HANDLE hAsyncTaskHandle);
+typedef int (PASCAL *TWSAGetLastError)(void);
+typedef HANDLE (PASCAL *TWSAAsyncGetAddrInfo)
+  (HWND hWnd, unsigned int wMsg, const char * hostname,
+   const char * portname, struct addrinfo * hints,
+   struct addrinfo * * res);
+// typedef int (PASCAL *Tgetaddrinfo)(const char *name, const char *port, const struct addrinfo *hints, struct addrinfo **res);
+typedef void (PASCAL *Tfreeaddrinfo)(struct addrinfo *ai);
 
 BOOL LoadWinsock();
 void FreeWinsock();

Modified: trunk/teraterm/teraterm/vtdisp.c
===================================================================
--- trunk/teraterm/teraterm/vtdisp.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/vtdisp.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -174,8 +174,8 @@
     BYTE     AlphaFormat;
 }BGBLENDFUNCTION;
 
-BOOL (FAR WINAPI *BGAlphaBlend)(HDC,int,int,int,int,HDC,int,int,int,int,BGBLENDFUNCTION);
-BOOL (FAR WINAPI *BGEnumDisplayMonitors)(HDC,LPCRECT,MONITORENUMPROC,LPARAM);
+BOOL (WINAPI *BGAlphaBlend)(HDC,int,int,int,int,HDC,int,int,int,int,BGBLENDFUNCTION);
+BOOL (WINAPI *BGEnumDisplayMonitors)(HDC,LPCRECT,MONITORENUMPROC,LPARAM);
 
 static HBITMAP GetBitmapHandle(char *File);
 
@@ -414,9 +414,9 @@
 {
   HINSTANCE hSPI;
   char spiVersion[8];
-  int (FAR PASCAL *SPI_IsSupported)(LPSTR,DWORD);
-  int (FAR PASCAL *SPI_GetPicture)(LPSTR,long,unsigned int,HANDLE *,HANDLE *,FARPROC,long);
-  int (FAR PASCAL *SPI_GetPluginInfo)(int,LPSTR,int);
+  int (PASCAL *SPI_IsSupported)(LPSTR,DWORD);
+  int (PASCAL *SPI_GetPicture)(LPSTR,long,unsigned int,HANDLE *,HANDLE *,FARPROC,long);
+  int (PASCAL *SPI_GetPluginInfo)(int,LPSTR,int);
   int ret;
 
   ret  = FALSE;
@@ -504,7 +504,7 @@
   return TRUE;
 }
 
-BOOL FAR WINAPI AlphaBlendWithoutAPI(HDC hdcDest,int dx,int dy,int width,int height,HDC hdcSrc,int sx,int sy,int sw,int sh,BGBLENDFUNCTION bf)
+BOOL WINAPI AlphaBlendWithoutAPI(HDC hdcDest,int dx,int dy,int width,int height,HDC hdcSrc,int sx,int sy,int sw,int sh,BGBLENDFUNCTION bf)
 {
   HDC hdcDestWork,hdcSrcWork;
   int i,invAlpha,alpha;

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/vtwin.cpp	2017-06-13 10:30:12 UTC (rev 6801)
@@ -2200,7 +2200,7 @@
 	DragFinish(hDropInfo);
 }
 
-void CVTWindow::OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI)
+void CVTWindow::OnGetMinMaxInfo(MINMAXINFO *lpMMI)
 {
 #ifndef WINDOW_MAXMIMUM_ENABLED
 	lpMMI->ptMaxSize.x = 10000;

Modified: trunk/teraterm/teraterm/vtwin.h
===================================================================
--- trunk/teraterm/teraterm/vtwin.h	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/teraterm/vtwin.h	2017-06-13 10:30:12 UTC (rev 6801)
@@ -61,7 +61,7 @@
 	afx_msg void OnAllClose();
 	afx_msg void OnDestroy();
 	afx_msg void OnDropFiles(HDROP hDropInfo);
-	afx_msg void OnGetMinMaxInfo(MINMAXINFO FAR* lpMMI);
+	afx_msg void OnGetMinMaxInfo(MINMAXINFO *lpMMI);
 	afx_msg void OnHScroll(UINT nSBCode, UINT nPos, CScrollBar* pScrollBar);
 	afx_msg void OnInitMenuPopup(CMenu* pPopupMenu, UINT nIndex, BOOL bSysMenu);
 	afx_msg void OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags);

Modified: trunk/teraterm/ttpcmn/language.c
===================================================================
--- trunk/teraterm/ttpcmn/language.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/ttpcmn/language.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -37,7 +37,7 @@
 	return (result);
 }
 
-unsigned int FAR PASCAL SJIS2UTF8(WORD KCode, int *byte, char *locale)
+unsigned int PASCAL SJIS2UTF8(WORD KCode, int *byte, char *locale)
 {
 	wchar_t wchar;
 	int ret;
@@ -97,7 +97,7 @@
 
 
 // Japanese SJIS -> JIS
-WORD FAR PASCAL SJIS2JIS(WORD KCode)
+WORD PASCAL SJIS2JIS(WORD KCode)
 {
 	WORD x0,x1,x2,y0;
 	BYTE b = LOBYTE(KCode);
@@ -124,13 +124,13 @@
 }
 
 // Japanese SJIS -> EUC
-WORD FAR PASCAL SJIS2EUC(WORD KCode)
+WORD PASCAL SJIS2EUC(WORD KCode)
 {
 	return (SJIS2JIS(KCode) | 0x8080);
 }
 
 // Japanese JIS -> SJIS
-WORD FAR PASCAL JIS2SJIS(WORD KCode)
+WORD PASCAL JIS2SJIS(WORD KCode)
 {
 	WORD n1, n2, SJIS;
 
@@ -564,7 +564,7 @@
 };
 
 // Russian character set conversion
-BYTE FAR PASCAL RussConv(int cin, int cout, BYTE b)
+BYTE PASCAL RussConv(int cin, int cout, BYTE b)
 // cin: input character set (IdWindows/IdKOI8/Id866/IdISO)
 // cin: output character set (IdWindows/IdKOI8/Id866/IdISO)
 {
@@ -575,7 +575,7 @@
 }
 
 // Russian character set conversion for a character string
-void FAR PASCAL RussConvStr(int cin, int cout, PCHAR Str, int count)
+void PASCAL RussConvStr(int cin, int cout, PCHAR Str, int count)
 // cin: input character set (IdWindows/IdKOI8/Id866/IdISO)
 // cin: output character set (IdWindows/IdKOI8/Id866/IdISO)
 {

Modified: trunk/teraterm/ttpcmn/language.h
===================================================================
--- trunk/teraterm/ttpcmn/language.h	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/ttpcmn/language.h	2017-06-13 10:30:12 UTC (rev 6801)
@@ -9,12 +9,12 @@
 #endif
 
 /* proto types */
-unsigned int FAR PASCAL SJIS2UTF8(WORD KCode, int *byte, char *locale);
-WORD FAR PASCAL SJIS2JIS(WORD KCode);
-WORD FAR PASCAL SJIS2EUC(WORD KCode);
-WORD FAR PASCAL JIS2SJIS(WORD KCode);
-BYTE FAR PASCAL RussConv(int cin, int cout, BYTE b);
-void FAR PASCAL RussConvStr
+unsigned int PASCAL SJIS2UTF8(WORD KCode, int *byte, char *locale);
+WORD PASCAL SJIS2JIS(WORD KCode);
+WORD PASCAL SJIS2EUC(WORD KCode);
+WORD PASCAL JIS2SJIS(WORD KCode);
+BYTE PASCAL RussConv(int cin, int cout, BYTE b);
+void PASCAL RussConvStr
   (int cin, int cout, PCHAR Str, int count);
 
 #ifdef __cplusplus

Modified: trunk/teraterm/ttpcmn/ttcmn.c
===================================================================
--- trunk/teraterm/ttpcmn/ttcmn.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/ttpcmn/ttcmn.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -56,7 +56,7 @@
 }
 
 
-BOOL PASCAL FAR StartTeraTerm(PTTSet ts)
+BOOL PASCAL StartTeraTerm(PTTSet ts)
 {
 	char Temp[MAX_PATH];
 
@@ -99,7 +99,7 @@
 
 // \x90?\xE8\x83t\x83@\x83C\x83\x8B\x82\xF0\x83f\x83B\x83X\x83N\x82??\xB6\x82\xB5\x81ATera Term\x96{\x91?\xF0\x8DċN\x93\xAE\x82\xB7\x82\xE9\x81B
 // (2012.4.30 yutaka)
-void PASCAL FAR RestartTeraTerm(HWND hwnd, PTTSet ts)
+void PASCAL RestartTeraTerm(HWND hwnd, PTTSet ts)
 {
 	char path[1024];
 	STARTUPINFO si;
@@ -132,7 +132,7 @@
 	}
 }
 
-void PASCAL FAR ChangeDefaultSet(PTTSet ts, PKeyMap km)
+void PASCAL ChangeDefaultSet(PTTSet ts, PKeyMap km)
 {
 	if ((ts!=NULL) &&
 		(_stricmp(ts->SetupFName, pm->ts.SetupFName) == 0)) {
@@ -143,7 +143,7 @@
 	}
 }
 
-void PASCAL FAR GetDefaultSet(PTTSet ts)
+void PASCAL GetDefaultSet(PTTSet ts)
 {
 	memcpy(ts,&(pm->ts),sizeof(TTTSet));
 }
@@ -150,7 +150,7 @@
 
 
 /* Key scan code -> Tera Term key code */
-WORD PASCAL FAR GetKeyCode(PKeyMap KeyMap, WORD Scan)
+WORD PASCAL GetKeyCode(PKeyMap KeyMap, WORD Scan)
 {
 	WORD Key;
 
@@ -164,7 +164,7 @@
 	return Key;
 }
 
-void PASCAL FAR GetKeyStr(HWND HWin, PKeyMap KeyMap, WORD KeyCode,
+void PASCAL GetKeyStr(HWND HWin, PKeyMap KeyMap, WORD KeyCode,
                           BOOL AppliKeyMode, BOOL AppliCursorMode,
                           BOOL Send8BitMode, PCHAR KeyStr, int destlen,
                           LPINT Len, LPWORD Type)
@@ -818,22 +818,22 @@
 	PeekMessage(&Msg,HWin, WM_CHAR, WM_CHAR,PM_REMOVE);
 }
 
-void FAR PASCAL SetCOMFlag(int Com)
+void PASCAL SetCOMFlag(int Com)
 {
 	pm->ComFlag[(Com-1)/CHAR_BIT] |= 1 << ((Com-1)%CHAR_BIT);
 }
 
-void FAR PASCAL ClearCOMFlag(int Com)
+void PASCAL ClearCOMFlag(int Com)
 {
 	pm->ComFlag[(Com-1)/CHAR_BIT] &= ~(1 << ((Com-1)%CHAR_BIT));
 }
 
-int FAR PASCAL CheckCOMFlag(int Com)
+int PASCAL CheckCOMFlag(int Com)
 {
 	return ((pm->ComFlag[(Com-1)/CHAR_BIT] & 1 << (Com-1)%CHAR_BIT) > 0);
 }
 
-int FAR PASCAL RegWin(HWND HWinVT, HWND HWinTEK)
+int PASCAL RegWin(HWND HWinVT, HWND HWinTEK)
 {
 	int i, j;
 
@@ -864,7 +864,7 @@
 	}
 }
 
-void FAR PASCAL UnregWin(HWND HWin)
+void PASCAL UnregWin(HWND HWin)
 {
 	int i, j;
 
@@ -902,7 +902,7 @@
 		return '+';
 }
 
-void FAR PASCAL SetWinMenu(HMENU menu, PCHAR buf, int buflen, PCHAR langFile, int VTFlag)
+void PASCAL SetWinMenu(HMENU menu, PCHAR buf, int buflen, PCHAR langFile, int VTFlag)
 {
 	int i;
 	char Temp[MAXPATHLEN];
@@ -974,7 +974,7 @@
 	}
 }
 
-void FAR PASCAL SetWinList(HWND HWin, HWND HDlg, int IList)
+void PASCAL SetWinList(HWND HWin, HWND HDlg, int IList)
 {
 	int i;
 	char Temp[MAXPATHLEN];
@@ -1000,7 +1000,7 @@
 	}
 }
 
-void FAR PASCAL SelectWin(int WinId)
+void PASCAL SelectWin(int WinId)
 {
 	if ((WinId>=0) && (WinId<pm->NWin)) {
 		/* \x83E\x83B\x83\x93\x83h\x83E\x82\xAA\x8Dő?\x82\xA8\x82\xE6\x82э?\xAC\x89\xBB\x82\xB3\x82\xEA\x82Ă\xA2\x82\xBD\x8F?\x81A\x82\xBB\x82?\xF3\x91?\xF0\x88?\x9D\x82ł\xAB\x82\xE9\x82悤\x82?A
@@ -1019,7 +1019,7 @@
 	}
 }
 
-void FAR PASCAL SelectNextWin(HWND HWin, int Next, BOOL SkipIconic)
+void PASCAL SelectNextWin(HWND HWin, int Next, BOOL SkipIconic)
 {
 	int i;
 
@@ -1048,7 +1048,7 @@
 	SelectWin(i);
 }
 
-void FAR PASCAL ShowAllWin(int stat) {
+void PASCAL ShowAllWin(int stat) {
 	int i;
 
 	for (i=0; i < pm->NWin; i++) {
@@ -1056,7 +1056,7 @@
 	}
 }
 
-void FAR PASCAL UndoAllWin(void) {
+void PASCAL UndoAllWin(void) {
 	int i;
 	WINDOWPLACEMENT rc0;
 	RECT rc;
@@ -1123,7 +1123,7 @@
 	}
 }
 
-void FAR PASCAL OpenHelp(UINT Command, DWORD Data, char *UILanguageFile)
+void PASCAL OpenHelp(UINT Command, DWORD Data, char *UILanguageFile)
 {
 	char HomeDir[MAX_PATH];
 	char Temp[MAX_PATH];
@@ -1152,7 +1152,7 @@
 	}
 }
 
-HWND FAR PASCAL GetNthWin(int n)
+HWND PASCAL GetNthWin(int n)
 {
 	if (n<pm->NWin) {
 		return pm->WinList[n];
@@ -1202,7 +1202,7 @@
 }
 
 // \x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x8D\xB6\x89E\x82?\xC0\x82??\\x8E\xA6\x82\xB7\x82\xE9(Show Windows Side by Side)
-void FAR PASCAL ShowAllWinSidebySide(HWND myhwnd)
+void PASCAL ShowAllWinSidebySide(HWND myhwnd)
 {
 	int n;
 	HWND hwnd[MAXNWIN];
@@ -1212,7 +1212,7 @@
 }
 
 // \x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x8F?\x82?\xC0\x82??\\x8E\xA6\x82\xB7\x82\xE9(Show Windows Stacked)
-void FAR PASCAL ShowAllWinStacked(HWND myhwnd)
+void PASCAL ShowAllWinStacked(HWND myhwnd)
 {
 	int n;
 	HWND hwnd[MAXNWIN];
@@ -1222,7 +1222,7 @@
 }
 
 // \x83E\x83B\x83\x93\x83h\x83E\x82\xF0\x8Fd\x82??\\x8E\xA6\x82\xB7\x82\xE9(Cascade)
-void FAR PASCAL ShowAllWinCascade(HWND myhwnd)
+void PASCAL ShowAllWinCascade(HWND myhwnd)
 {
 	int n;
 	HWND hwnd[MAXNWIN];
@@ -1232,7 +1232,7 @@
 }
 
 // \x91STera Term\x82?I\x97\xB9\x8Ew\x8E\xA6\x82\xF0\x8Fo\x82\xB7\x81B
-void FAR PASCAL BroadcastClosingMessage(HWND myhwnd)
+void PASCAL BroadcastClosingMessage(HWND myhwnd)
 {
 	int i, max;
 	HWND hwnd[MAXNWIN];
@@ -1255,7 +1255,7 @@
 }
 
 
-int FAR PASCAL CommReadRawByte(PComVar cv, LPBYTE b)
+int PASCAL CommReadRawByte(PComVar cv, LPBYTE b)
 {
 	if ( ! cv->Ready ) {
 		return 0;
@@ -1276,7 +1276,7 @@
 	}
 }
 
-void PASCAL FAR CommInsert1Byte(PComVar cv, BYTE b)
+void PASCAL CommInsert1Byte(PComVar cv, BYTE b)
 {
 	if ( ! cv->Ready ) {
 		return;
@@ -1319,7 +1319,7 @@
 	}
 }
 
-int FAR PASCAL CommRead1Byte(PComVar cv, LPBYTE b)
+int PASCAL CommRead1Byte(PComVar cv, LPBYTE b)
 {
 	int c;
 
@@ -1389,7 +1389,7 @@
 	return c;
 }
 
-int FAR PASCAL CommRawOut(PComVar cv, PCHAR B, int C)
+int PASCAL CommRawOut(PComVar cv, PCHAR B, int C)
 {
 	int a;
 
@@ -1412,7 +1412,7 @@
 	return a;
 }
 
-int FAR PASCAL CommBinaryOut(PComVar cv, PCHAR B, int C)
+int PASCAL CommBinaryOut(PComVar cv, PCHAR B, int C)
 {
 	int a, i, Len;
 	char d[3];
@@ -1449,7 +1449,7 @@
 	return i;
 }
 
-int FAR PASCAL CommBinaryBuffOut(PComVar cv, PCHAR B, int C)
+int PASCAL CommBinaryBuffOut(PComVar cv, PCHAR B, int C)
 {
 	int a, i, Len, OutLen;
 	char d[3];
@@ -1751,7 +1751,7 @@
 	return i;
 }
 
-int FAR PASCAL CommTextOut(PComVar cv, PCHAR B, int C)
+int PASCAL CommTextOut(PComVar cv, PCHAR B, int C)
 {
 	int i, TempLen, OutLen;
 	char TempStr[12];
@@ -1854,7 +1854,7 @@
 	return i;
 }
 
-int FAR PASCAL CommBinaryEcho(PComVar cv, PCHAR B, int C)
+int PASCAL CommBinaryEcho(PComVar cv, PCHAR B, int C)
 {
 	int a, i, Len;
 	char d[3];
@@ -1898,7 +1898,7 @@
 	return i;
 }
 
-int FAR PASCAL TextEchoMBCS(PComVar cv, PCHAR B, int C)
+int PASCAL TextEchoMBCS(PComVar cv, PCHAR B, int C)
 {
 	int i, TempLen;
 	WORD K;
@@ -2073,7 +2073,7 @@
 	return i;
 }
 
-int FAR PASCAL CommTextEcho(PComVar cv, PCHAR B, int C)
+int PASCAL CommTextEcho(PComVar cv, PCHAR B, int C)
 {
 	int i, TempLen;
 	char TempStr[11];
@@ -2386,17 +2386,17 @@
 static int NotifyIconShowCount = 0;
 static HICON CustomIcon = NULL;
 
-void FAR PASCAL SetCustomNotifyIcon(HICON icon)
+void PASCAL SetCustomNotifyIcon(HICON icon)
 {
 	CustomIcon = icon;
 }
 
-HICON FAR PASCAL GetCustomNotifyIcon()
+HICON PASCAL GetCustomNotifyIcon()
 {
 	return CustomIcon;
 }
 
-void FAR PASCAL CreateNotifyIcon(PComVar cv)
+void PASCAL CreateNotifyIcon(PComVar cv)
 {
 	if (cv->NotifyIcon == NULL) {
 		notify_icon.cbSize = sizeof(notify_icon);
@@ -2428,7 +2428,7 @@
 	return;
 }
 
-void FAR PASCAL DeleteNotifyIcon(PComVar cv)
+void PASCAL DeleteNotifyIcon(PComVar cv)
 {
 	if (cv->NotifyIcon) {
 		Shell_NotifyIcon(NIM_DELETE, cv->NotifyIcon);
@@ -2439,7 +2439,7 @@
 	return;
 }
 
-void FAR PASCAL ShowNotifyIcon(PComVar cv)
+void PASCAL ShowNotifyIcon(PComVar cv)
 {
 	if (cv->NotifyIcon == NULL) {
 		CreateNotifyIcon(cv);
@@ -2454,7 +2454,7 @@
 	return;
 }
 
-void FAR PASCAL HideNotifyIcon(PComVar cv)
+void PASCAL HideNotifyIcon(PComVar cv)
 {
 	if (NotifyIconShowCount > 1) {
 		NotifyIconShowCount -= 1;
@@ -2472,7 +2472,7 @@
 	return;
 }
 
-void FAR PASCAL SetVerNotifyIcon(PComVar cv, unsigned int ver)
+void PASCAL SetVerNotifyIcon(PComVar cv, unsigned int ver)
 {
 	if (cv->NotifyIcon) {
 		cv->NotifyIcon->uVersion = ver;
@@ -2481,7 +2481,7 @@
 	return;
 }
 
-void FAR PASCAL NotifyMessage(PComVar cv, char *msg, char *title, DWORD flag)
+void PASCAL NotifyMessage(PComVar cv, char *msg, char *title, DWORD flag)
 {
 	if (msg == NULL) {
 		return;

Modified: trunk/teraterm/ttpdlg/ttdlg.c
===================================================================
--- trunk/teraterm/ttpdlg/ttdlg.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/ttpdlg/ttdlg.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -25,7 +25,7 @@
 #undef ONIG_EXTERN
 
 #include <winsock2.h>
-static char FAR * ProtocolFamilyList[] = { "UNSPEC", "IPv6", "IPv4", NULL };
+static char * ProtocolFamilyList[] = { "UNSPEC", "IPv6", "IPv4", NULL };
 
 #undef EFFECT_ENABLED	// \x83G\x83t\x83F\x83N\x83g\x82?L\x8C\xF8\x89?\xDB
 #undef TEXTURE_ENABLED	// \x83e\x83N\x83X\x83`\x83\x83\x82?L\x8C\xF8\x89?\xDB
@@ -3421,7 +3421,7 @@
 	return FALSE;
 }
 
-BOOL FAR PASCAL SetupTerminal(HWND WndParent, PTTSet ts)
+BOOL PASCAL SetupTerminal(HWND WndParent, PTTSet ts)
 {
 	int i;
 
@@ -3446,7 +3446,7 @@
 		                     WndParent, TermDlg, (LPARAM)ts);
 }
 
-BOOL FAR PASCAL SetupWin(HWND WndParent, PTTSet ts)
+BOOL PASCAL SetupWin(HWND WndParent, PTTSet ts)
 {
 	return
 		(BOOL)DialogBoxParam(hInst,
@@ -3454,7 +3454,7 @@
 		                     WndParent, WinDlg, (LPARAM)ts);
 }
 
-BOOL FAR PASCAL SetupKeyboard(HWND WndParent, PTTSet ts)
+BOOL PASCAL SetupKeyboard(HWND WndParent, PTTSet ts)
 {
 	return
 		(BOOL)DialogBoxParam(hInst,
@@ -3462,7 +3462,7 @@
 		                     WndParent, KeybDlg, (LPARAM)ts);
 }
 
-BOOL FAR PASCAL SetupSerialPort(HWND WndParent, PTTSet ts)
+BOOL PASCAL SetupSerialPort(HWND WndParent, PTTSet ts)
 {
 	return
 		(BOOL)DialogBoxParam(hInst,
@@ -3470,7 +3470,7 @@
 		                     WndParent, SerialDlg, (LPARAM)ts);
 }
 
-BOOL FAR PASCAL SetupTCPIP(HWND WndParent, PTTSet ts)
+BOOL PASCAL SetupTCPIP(HWND WndParent, PTTSet ts)
 {
 	return
 		(BOOL)DialogBoxParam(hInst,
@@ -3478,7 +3478,7 @@
 		                     WndParent, TCPIPDlg, (LPARAM)ts);
 }
 
-BOOL FAR PASCAL GetHostName(HWND WndParent, PGetHNRec GetHNRec)
+BOOL PASCAL GetHostName(HWND WndParent, PGetHNRec GetHNRec)
 {
 	return
 		(BOOL)DialogBoxParam(hInst,
@@ -3486,7 +3486,7 @@
 		                     WndParent, HostDlg, (LPARAM)GetHNRec);
 }
 
-BOOL FAR PASCAL ChangeDirectory(HWND WndParent, PCHAR CurDir)
+BOOL PASCAL ChangeDirectory(HWND WndParent, PCHAR CurDir)
 {
 	return
 		(BOOL)DialogBoxParam(hInst,
@@ -3494,7 +3494,7 @@
 		                     WndParent, DirDlg, (LPARAM)CurDir);
 }
 
-BOOL FAR PASCAL AboutDialog(HWND WndParent)
+BOOL PASCAL AboutDialog(HWND WndParent)
 {
 	return
 		(BOOL)DialogBox(hInst,
@@ -3544,7 +3544,7 @@
 	return FALSE;
 }
 
-BOOL FAR PASCAL ChooseFontDlg(HWND WndParent, LPLOGFONT LogFont, PTTSet ts)
+BOOL PASCAL ChooseFontDlg(HWND WndParent, LPLOGFONT LogFont, PTTSet ts)
 {
 	CHOOSEFONT cf;
 	BOOL Ok;
@@ -3564,7 +3564,7 @@
 	return Ok;
 }
 
-BOOL FAR PASCAL SetupGeneral(HWND WndParent, PTTSet ts)
+BOOL PASCAL SetupGeneral(HWND WndParent, PTTSet ts)
 {
 	return
 		(BOOL)DialogBoxParam(hInst,
@@ -3572,7 +3572,7 @@
 		                     WndParent, (DLGPROC)&GenDlg, (LPARAM)ts);
 }
 
-BOOL FAR PASCAL WindowWindow(HWND WndParent, PBOOL Close)
+BOOL PASCAL WindowWindow(HWND WndParent, PBOOL Close)
 {
 	*Close = FALSE;
 	return
@@ -3582,7 +3582,7 @@
 		                     (DLGPROC)&WinListDlg, (LPARAM)Close);
 }
 
-void FAR PASCAL TTDLGSetUILanguageFile(char *file)
+void PASCAL TTDLGSetUILanguageFile(char *file)
 {
 	strncpy_s(UILanguageFile, sizeof(UILanguageFile), file, _TRUNCATE);
 }

Modified: trunk/teraterm/ttpdlg/ttdlg.h
===================================================================
--- trunk/teraterm/ttpdlg/ttdlg.h	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/ttpdlg/ttdlg.h	2017-06-13 10:30:12 UTC (rev 6801)
@@ -1 +1 @@
-void FAR PASCAL TTDLGSetUILanguageFile(char *file);
+void PASCAL TTDLGSetUILanguageFile(char *file);

Modified: trunk/teraterm/ttpfile/bplus.c
===================================================================
--- trunk/teraterm/ttpfile/bplus.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/ttpfile/bplus.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -15,7 +15,7 @@
 #include "ttlib.h"
 
 /* proto type */
-BOOL FAR PASCAL GetTransFname
+BOOL PASCAL GetTransFname
   (PFileVar fv, PCHAR CurDir, WORD FuncId, LPLONG Option);
 
 #define BPTimeOut 10

Modified: trunk/teraterm/ttpfile/ftlib.h
===================================================================
--- trunk/teraterm/ttpfile/ftlib.h	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/ttpfile/ftlib.h	2017-06-13 10:30:12 UTC (rev 6801)
@@ -19,8 +19,8 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
-void FAR PASCAL TTFILESetUILanguageFile(char *file);
-void FAR PASCAL TTFILESetFileSendFilter(char *file);
+void PASCAL TTFILESetUILanguageFile(char *file);
+void PASCAL TTFILESetFileSendFilter(char *file);
 #ifdef __cplusplus
 }
 #endif

Modified: trunk/teraterm/ttpfile/ttfile.c
===================================================================
--- trunk/teraterm/ttpfile/ttfile.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/ttpfile/ttfile.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -37,7 +37,7 @@
 char UILanguageFile[MAX_PATH];
 char FileSendFilter[128];
 
-BOOL FAR PASCAL GetSetupFname(HWND HWin, WORD FuncId, PTTSet ts)
+BOOL PASCAL GetSetupFname(HWND HWin, WORD FuncId, PTTSet ts)
 {
 	int i, j;
 	OPENFILENAME ofn;
@@ -319,7 +319,7 @@
 	return FALSE;
 }
 
-BOOL FAR PASCAL GetTransFname
+BOOL PASCAL GetTransFname
   (PFileVar fv, PCHAR CurDir, WORD FuncId, LPLONG Option)
 {
 	char uimsg[MAX_UIMSG];
@@ -520,7 +520,7 @@
 	return FALSE;
 }
 
-BOOL FAR PASCAL GetMultiFname
+BOOL PASCAL GetMultiFname
   (PFileVar fv, PCHAR CurDir, WORD FuncId, LPWORD Option)
 {
 	int i, len;
@@ -760,7 +760,7 @@
 	return FALSE;
 }
 
-BOOL FAR PASCAL GetGetFname(HWND HWin, PFileVar fv)
+BOOL PASCAL GetGetFname(HWND HWin, PFileVar fv)
 {
 	return (BOOL)DialogBoxParam(hInst,
 	                            MAKEINTRESOURCE(IDD_GETFNDLG),
@@ -767,7 +767,7 @@
 	                            HWin, GetFnDlg, (LONG)fv);
 }
 
-void FAR PASCAL SetFileVar(PFileVar fv)
+void PASCAL SetFileVar(PFileVar fv)
 {
 	int i;
 	char uimsg[MAX_UIMSG];
@@ -980,7 +980,7 @@
 	return FALSE;
 }
 
-BOOL FAR PASCAL GetXFname
+BOOL PASCAL GetXFname
   (HWND HWin, BOOL Receive, LPLONG Option, PFileVar fv, PCHAR CurDir)
 {
 	char uimsg[MAX_UIMSG];
@@ -1079,7 +1079,7 @@
 	return Ok;
 }
 
-void FAR PASCAL ProtoInit(int Proto, PFileVar fv, PCHAR pv, PComVar cv, PTTSet ts)
+void PASCAL ProtoInit(int Proto, PFileVar fv, PCHAR pv, PComVar cv, PTTSet ts)
 {
 	switch (Proto) {
 		case PROTO_KMT:
@@ -1103,7 +1103,7 @@
 	}
 }
 
-BOOL FAR PASCAL ProtoParse
+BOOL PASCAL ProtoParse
   (int Proto, PFileVar fv, PCHAR pv, PComVar cv)
 {
 	BOOL Ok;
@@ -1153,7 +1153,7 @@
 	return Ok;
 }
 
-void FAR PASCAL ProtoTimeOutProc
+void PASCAL ProtoTimeOutProc
   (int Proto, PFileVar fv, PCHAR pv, PComVar cv)
 {
 	switch (Proto) {
@@ -1178,7 +1178,7 @@
 	}
 }
 
-BOOL FAR PASCAL ProtoCancel
+BOOL PASCAL ProtoCancel
   (int Proto, PFileVar fv, PCHAR pv, PComVar cv)
 {
 	switch (Proto) {
@@ -1208,12 +1208,12 @@
 	return TRUE;
 }
 
-void FAR PASCAL TTFILESetUILanguageFile(char *file)
+void PASCAL TTFILESetUILanguageFile(char *file)
 {
 	strncpy_s(UILanguageFile, sizeof(UILanguageFile), file, _TRUNCATE);
 }
 
-void FAR PASCAL TTFILESetFileSendFilter(char *file)
+void PASCAL TTFILESetFileSendFilter(char *file)
 {
 	strncpy_s(FileSendFilter, sizeof(FileSendFilter), file, _TRUNCATE);
 }

Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/ttpset/ttset.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -493,7 +493,7 @@
 
 }
 
-void FAR PASCAL ReadIniFile(PCHAR FName, PTTSet ts)
+void PASCAL ReadIniFile(PCHAR FName, PTTSet ts)
 {
 	int i;
 	HDC TmpDC;
@@ -1950,7 +1950,7 @@
 	ReadCygtermConfFile(ts);
 }
 
-void FAR PASCAL WriteIniFile(PCHAR FName, PTTSet ts)
+void PASCAL WriteIniFile(PCHAR FName, PTTSet ts)
 {
 	int i;
 	char Temp[MAX_PATH];
@@ -3240,7 +3240,7 @@
 	KeyMap->Map[KeyId - 1] = Num;
 }
 
-void FAR PASCAL ReadKeyboardCnf
+void PASCAL ReadKeyboardCnf
 	(PCHAR FName, PKeyMap KeyMap, BOOL ShowWarning) {
 	int i, j, Ptr;
 	char EntName[7];
@@ -3493,7 +3493,7 @@
 				}
 }
 
-void FAR PASCAL CopySerialList(PCHAR IniSrc, PCHAR IniDest, PCHAR section,
+void PASCAL CopySerialList(PCHAR IniSrc, PCHAR IniDest, PCHAR section,
                                PCHAR key, int MaxList)
 {
 	int i, j;
@@ -3526,7 +3526,7 @@
 	WritePrivateProfileString(NULL, NULL, NULL, IniDest);
 }
 
-void FAR PASCAL AddValueToList(PCHAR FName, PCHAR Host, PCHAR section,
+void PASCAL AddValueToList(PCHAR FName, PCHAR Host, PCHAR section,
                                PCHAR key, int MaxList)
 {
 	HANDLE MemH;
@@ -3587,12 +3587,12 @@
 }
 
  /* copy hostlist from source IniFile to dest IniFile */
-void FAR PASCAL CopyHostList(PCHAR IniSrc, PCHAR IniDest)
+void PASCAL CopyHostList(PCHAR IniSrc, PCHAR IniDest)
 {
 	CopySerialList(IniSrc, IniDest, "Hosts", "Host", MAXHOSTLIST);
 }
 
-void FAR PASCAL AddHostToList(PCHAR FName, PCHAR Host)
+void PASCAL AddHostToList(PCHAR FName, PCHAR Host)
 {
 	AddValueToList(FName, Host, "Hosts", "Host", MAXHOSTLIST);
 }
@@ -3718,7 +3718,7 @@
 }
 
 
-void FAR PASCAL ParseParam(PCHAR Param, PTTSet ts, PCHAR DDETopic)
+void PASCAL ParseParam(PCHAR Param, PTTSet ts, PCHAR DDETopic)
 {
 	int i, pos, c;
 	//int param_top;

Modified: trunk/teraterm/ttptek/tekesc.h
===================================================================
--- trunk/teraterm/ttptek/tekesc.h	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/ttptek/tekesc.h	2017-06-13 10:30:12 UTC (rev 6801)
@@ -4,7 +4,7 @@
 
 /* TTTEK.DLL, TEK escape sequences */
 
-void FAR PASCAL TEKChangeCaret(PTEKVar tk, PTTSet ts);
+void PASCAL TEKChangeCaret(PTEKVar tk, PTTSet ts);
 void ParseFirst(PTEKVar tk, PTTSet ts, PComVar cv, BYTE b);
 void TEKEscape(PTEKVar tk, PTTSet ts, PComVar cv, BYTE b);
 void SelectCode(PTEKVar tk, PTTSet ts, BYTE b);

Modified: trunk/teraterm/ttptek/tttek.c
===================================================================
--- trunk/teraterm/ttptek/tttek.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/teraterm/ttptek/tttek.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -17,7 +17,7 @@
 
 static HANDLE hInst;
 
-void FAR PASCAL TEKInit(PTEKVar tk, PTTSet ts)
+void PASCAL TEKInit(PTEKVar tk, PTTSet ts)
 {
   int i;
 
@@ -151,7 +151,7 @@
   tk->RubberBand = OnFlag;
 }
 
-void FAR PASCAL TEKChangeCaret(PTEKVar tk, PTTSet ts)
+void PASCAL TEKChangeCaret(PTEKVar tk, PTTSet ts)
 {
   UINT T;
 
@@ -175,7 +175,7 @@
   }
 }
 
-void FAR PASCAL TEKDestroyCaret(PTEKVar tk, PTTSet ts)
+void PASCAL TEKDestroyCaret(PTEKVar tk, PTTSet ts)
 {
   DestroyCaret();
   if (ts->NonblinkingCursor!=0)
@@ -182,7 +182,7 @@
 	KillTimer(tk->HWin,IdCaretTimer);
 }
 
-void FAR PASCAL TEKResizeWindow(PTEKVar tk, PTTSet ts, int W, int H)
+void PASCAL TEKResizeWindow(PTEKVar tk, PTTSet ts, int W, int H)
 {
   int i, Height, Width;
   TEXTMETRIC Metrics;
@@ -377,7 +377,7 @@
   tk->ScaleFont = FALSE;
 }
 
-int FAR PASCAL TEKParse(PTEKVar tk, PTTSet ts, PComVar cv)
+int PASCAL TEKParse(PTEKVar tk, PTTSet ts, PComVar cv)
 {
   BOOL f;
   int c;
@@ -443,7 +443,7 @@
   return (tk->ChangeEmu);
 }
 
-void FAR PASCAL TEKReportGIN(PTEKVar tk, PTTSet ts, PComVar cv, BYTE KeyCode)
+void PASCAL TEKReportGIN(PTEKVar tk, PTTSet ts, PComVar cv, BYTE KeyCode)
 {
   BYTE Code[11];
   int X, Y;
@@ -465,7 +465,7 @@
   tk->IgnoreCount = 6;
 }
 
-void FAR PASCAL TEKPaint
+void PASCAL TEKPaint
   (PTEKVar tk, PTTSet ts, HDC PaintDC, PAINTSTRUCT *PaintInfo)
 {
   int X,Y,W,H;
@@ -486,7 +486,7 @@
   if (tk->GIN) ToggleCrossHair(tk,ts,TRUE);
 }
 
-void FAR PASCAL TEKWMLButtonDown
+void PASCAL TEKWMLButtonDown
   (PTEKVar tk, PTTSet ts, PComVar cv, POINT pos)
 {
   BYTE b;
@@ -517,7 +517,7 @@
   }
 }
 
-void FAR PASCAL TEKWMLButtonUp(PTEKVar tk, PTTSet ts)
+void PASCAL TEKWMLButtonUp(PTEKVar tk, PTTSet ts)
 {
   int X;
 
@@ -546,7 +546,7 @@
   }
 }
 
-void FAR PASCAL TEKWMMouseMove(PTEKVar tk, PTTSet ts, POINT p)
+void PASCAL TEKWMMouseMove(PTEKVar tk, PTTSet ts, POINT p)
 {
   int X, Y;
 
@@ -578,7 +578,7 @@
   if (tk->GIN) SetCapture(tk->HWin);
 }
 
-void FAR PASCAL TEKWMSize(PTEKVar tk, PTTSet ts, int W, int H, int cx, int cy)
+void PASCAL TEKWMSize(PTEKVar tk, PTTSet ts, int W, int H, int cx, int cy)
 {
   int Width, Height;
 
@@ -636,7 +636,7 @@
   SwitchRubberBand(tk,ts,tk->Select);
 }
 
-void FAR PASCAL TEKCMCopy(PTEKVar tk, PTTSet ts)
+void PASCAL TEKCMCopy(PTEKVar tk, PTTSet ts)
 {
   int x, y;
 
@@ -654,13 +654,13 @@
     abs(tk->SelectEnd.y - tk->SelectStart.y));                          
 }
 
-void FAR PASCAL TEKCMCopyScreen(PTEKVar tk, PTTSet ts)
+void PASCAL TEKCMCopyScreen(PTEKVar tk, PTTSet ts)
 {
   /* copy fullscreen to clipboard */
   CopyToClipboard(tk, ts, 0, 0, tk->ScreenWidth, tk->ScreenHeight);
 }
 
-void FAR PASCAL TEKPrint(PTEKVar tk, PTTSet ts, HDC PrintDC, BOOL SelFlag)
+void PASCAL TEKPrint(PTEKVar tk, PTTSet ts, HDC PrintDC, BOOL SelFlag)
 {
   POINT PPI;
   RECT Margin;
@@ -739,7 +739,7 @@
   SwitchRubberBand(tk,ts,tk->Select);
 }
 
-void FAR PASCAL TEKClearScreen(PTEKVar tk, PTTSet ts)
+void PASCAL TEKClearScreen(PTEKVar tk, PTTSet ts)
 {
   RECT R;
 
@@ -753,7 +753,7 @@
   TEKCaretOn(tk,ts);
 }
 
-void FAR PASCAL TEKSetupFont(PTEKVar tk, PTTSet ts)
+void PASCAL TEKSetupFont(PTEKVar tk, PTTSet ts)
 {
   int W, H;
 //  BOOL Ok;
@@ -776,7 +776,7 @@
   TEKResizeWindow(tk,ts,W,H);
 }
 
-void FAR PASCAL TEKResetWin(PTEKVar tk, PTTSet ts, WORD EmuOld)
+void PASCAL TEKResetWin(PTEKVar tk, PTTSet ts, WORD EmuOld)
 {
   HDC TmpDC;
   RECT R;
@@ -844,7 +844,7 @@
   InvalidateRect(tk->HWin,NULL,TRUE);
 }
 
-/* BOOL FAR PASCAL TEKSetupWinDlg(PTEKVar tk, PTTSet ts)
+/* BOOL PASCAL TEKSetupWinDlg(PTEKVar tk, PTTSet ts)
 {
   BOOL Ok;
   WORD OldEmu;
@@ -861,7 +861,7 @@
   return Ok;
 } */
 
-void FAR PASCAL TEKRestoreSetup(PTEKVar tk, PTTSet ts)
+void PASCAL TEKRestoreSetup(PTEKVar tk, PTTSet ts)
 {
   int W, H;
   RECT R;
@@ -879,7 +879,7 @@
   TEKResizeWindow(tk,ts,W,H);
 }
 
-void FAR PASCAL TEKEnd(PTEKVar tk)
+void PASCAL TEKEnd(PTEKVar tk)
 {
   int i;
 

Modified: trunk/ttpmenu/winmisc.cpp
===================================================================
--- trunk/ttpmenu/winmisc.cpp	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttpmenu/winmisc.cpp	2017-06-13 10:30:12 UTC (rev 6801)
@@ -452,7 +452,7 @@
 			char chars[] = { (char) wParam, 0 };
 
 			SendMessage(control, EM_REPLACESEL, (WPARAM) TRUE,
-			            (LPARAM) (char FAR *) chars);
+			            (LPARAM) (char *) chars);
 			return 0;
 		}
 	}

Modified: trunk/ttssh2/matcher/matcher.c
===================================================================
--- trunk/ttssh2/matcher/matcher.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/matcher/matcher.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -40,8 +40,8 @@
    in the length of the string (as opposed to exponential).
    Since it's also best-case quadratic, it should only be used for unusual
    cases (2 or more *'s in the pattern). */
-static BOOL wildcard_match_pattern(char const FAR * pattern, int patternLen,
-                                   char const FAR * str, int strLen) {
+static BOOL wildcard_match_pattern(char const *pattern, int patternLen,
+                                   char const *str, int strLen) {
 	char * canBeAt = (char *)malloc(sizeof(char)*(strLen + 1));
 	int i, result;
 
@@ -79,7 +79,7 @@
 Before entry, ensure that str does not contain any invalid characters
 (at least including '*', '?', ',', ' ' and '\n').
 */
-BOOL match_pattern(char const FAR * pattern, char const FAR * str) {
+BOOL match_pattern(char const *pattern, char const *str) {
 	char patternCh = *pattern;
 	char strCh = *str;
 

Modified: trunk/ttssh2/matcher/matcher.h
===================================================================
--- trunk/ttssh2/matcher/matcher.h	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/matcher/matcher.h	2017-06-13 10:30:12 UTC (rev 6801)
@@ -48,6 +48,6 @@
 This function is optimized for matching many patterns against one string,
 such as occurs when searching an ssh_known_hosts file for a host key.
 */
-BOOL match_pattern(char const FAR * pattern, char const FAR * str);
+BOOL match_pattern(char const *pattern, char const *str);
 
 #endif

Modified: trunk/ttssh2/ttxssh/auth.c
===================================================================
--- trunk/ttssh2/ttxssh/auth.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/auth.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -48,7 +48,7 @@
 static HFONT DlgTisFont;
 static HFONT DlgAuthSetupFont;
 
-void destroy_malloced_string(char FAR * FAR * str)
+void destroy_malloced_string(char **str)
 {
 	if (*str != NULL) {
 		SecureZeroMemory(*str, strlen(*str));
@@ -72,7 +72,7 @@
 			char chars[] = { (char) wParam, 0 };
 
 			SendMessage(control, EM_REPLACESEL, (WPARAM) TRUE,
-			            (LPARAM) (char FAR *) chars);
+			            (LPARAM) (char *) chars);
 			return 0;
 		}
 	}
@@ -352,10 +352,10 @@
 	}
 }
 
-static char FAR *alloc_control_text(HWND ctl)
+static char *alloc_control_text(HWND ctl)
 {
 	int len = GetWindowTextLength(ctl);
-	char FAR *result = malloc(len + 1);
+	char *result = malloc(len + 1);
 
 	if (result != NULL) {
 		GetWindowText(ctl, result, len + 1);
@@ -365,7 +365,7 @@
 	return result;
 }
 
-static int get_key_file_name(HWND parent, char FAR * buf, int bufsize, PTInstVar pvar)
+static int get_key_file_name(HWND parent, char *buf, int bufsize, PTInstVar pvar)
 {
 	OPENFILENAME params;
 	char fullname_buf[2048] = "identity";
@@ -423,7 +423,7 @@
 static BOOL end_auth_dlg(PTInstVar pvar, HWND dlg)
 {
 	int method = SSH_AUTH_PASSWORD;
-	char FAR *password =
+	char *password =
 		alloc_control_text(GetDlgItem(dlg, IDC_SSHPASSWORD));
 	Key *key_pair = NULL;
 
@@ -936,7 +936,7 @@
 	}
 }
 
-char FAR *AUTH_get_user_name(PTInstVar pvar)
+char *AUTH_get_user_name(PTInstVar pvar)
 {
 	return pvar->auth_state.user;
 }
@@ -1121,7 +1121,7 @@
 
 static BOOL end_TIS_dlg(PTInstVar pvar, HWND dlg)
 {
-	char FAR *password =
+	char *password =
 		alloc_control_text(GetDlgItem(dlg, IDC_SSHPASSWORD));
 
 	pvar->auth_state.cur_cred.method = SSH_AUTH_TIS;
@@ -1462,7 +1462,7 @@
 	destroy_malloced_string(&pvar->auth_state.TIS_prompt);
 }
 
-void AUTH_set_TIS_mode(PTInstVar pvar, char FAR * prompt, int len)
+void AUTH_set_TIS_mode(PTInstVar pvar, char *prompt, int len)
 {
 	if (pvar->auth_state.cur_cred.method == SSH_AUTH_TIS) {
 		pvar->auth_state.mode = TIS_AUTH_MODE;
@@ -1520,7 +1520,7 @@
 	}
 }
 
-void AUTH_get_auth_info(PTInstVar pvar, char FAR * dest, int len)
+void AUTH_get_auth_info(PTInstVar pvar, char *dest, int len)
 {
 	const char *method = "unknown";
 	char buf[256];

Modified: trunk/ttssh2/ttxssh/auth.h
===================================================================
--- trunk/ttssh2/ttxssh/auth.h	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/auth.h	2017-06-13 10:30:12 UTC (rev 6801)
@@ -38,15 +38,15 @@
 
 typedef struct {
   SSHAuthMethod method;
-  char FAR * password;
-  char FAR * rhosts_client_user;
-  struct Key FAR * key_pair;
+  char *password;
+  char *rhosts_client_user;
+  struct Key *key_pair;
 } AUTHCred;
 
 typedef enum { GENERIC_AUTH_MODE, TIS_AUTH_MODE } AuthMode;
 
 typedef struct {
-  char FAR * user;
+  char *user;
   AUTHCred cur_cred;
   SSHAuthMethod failed_method;
   int flags;
@@ -54,23 +54,23 @@
   HWND auth_dialog;
 
   AuthMode mode;
-  char FAR * TIS_prompt;
+  char *TIS_prompt;
 } AUTHState;
 
 void AUTH_init(PTInstVar pvar);
-char FAR * AUTH_get_user_name(PTInstVar pvar);
+char *AUTH_get_user_name(PTInstVar pvar);
 int AUTH_set_supported_auth_types(PTInstVar pvar, int types);
 void AUTH_set_generic_mode(PTInstVar pvar);
-void AUTH_set_TIS_mode(PTInstVar pvar, char FAR * prompt, int len);
+void AUTH_set_TIS_mode(PTInstVar pvar, char *prompt, int len);
 void AUTH_advance_to_next_cred(PTInstVar pvar);
 void AUTH_do_cred_dialog(PTInstVar pvar);
 void AUTH_do_default_cred_dialog(PTInstVar pvar);
 void AUTH_destroy_cur_cred(PTInstVar pvar);
-void AUTH_get_auth_info(PTInstVar pvar, char FAR * dest, int len);
+void AUTH_get_auth_info(PTInstVar pvar, char *dest, int len);
 void AUTH_notify_disconnecting(PTInstVar pvar);
 void AUTH_notify_end_error(PTInstVar pvar);
 void AUTH_end(PTInstVar pvar);
-void destroy_malloced_string(char FAR * FAR * str);
+void destroy_malloced_string(char **str);
 LRESULT CALLBACK password_wnd_proc(HWND control, UINT msg,
                                    WPARAM wParam, LPARAM lParam);
 

Modified: trunk/ttssh2/ttxssh/crypt.c
===================================================================
--- trunk/ttssh2/ttxssh/crypt.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/crypt.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -72,12 +72,12 @@
 #define CMP(a,b) memcmp(a, b, SSH_BLOCKSIZE)
 
 
-static char FAR *get_cipher_name(int cipher);
+static char *get_cipher_name(int cipher);
 
-static void crc_update(uint32 FAR * a, uint32 b)
+static void crc_update(uint32 *a, uint32 b)
 {
 	b ^= *a;
-	*a = do_crc((unsigned char FAR *) &b, sizeof(b));
+	*a = do_crc((unsigned char *) &b, sizeof(b));
 }
 
 /* check_crc
@@ -84,11 +84,11 @@
    detects if a block is used in a particular pattern
 */
 
-static int check_crc(unsigned char FAR * S, unsigned char FAR * buf,
-                     uint32 len, unsigned char FAR * IV)
+static int check_crc(unsigned char *S, unsigned char *buf,
+                     uint32 len, unsigned char *IV)
 {
 	uint32 crc;
-	unsigned char FAR *c;
+	unsigned char *c;
 
 	crc = 0;
 	if (IV && !CMP(S, IV)) {
@@ -113,16 +113,16 @@
 detect_attack
 Detects a crc32 compensation attack on a packet
 */
-static int detect_attack(CRYPTDetectAttack FAR * statics,
-                         unsigned char FAR * buf, uint32 len,
-                         unsigned char *FAR IV)
+static int detect_attack(CRYPTDetectAttack *statics,
+                         unsigned char *buf, uint32 len,
+                         unsigned char *IV)
 {
-	uint32 FAR *h = statics->h;
+	uint32 *h = statics->h;
 	uint32 n = statics->n;
 	uint32 i, j;
 	uint32 l;
-	unsigned char FAR *c;
-	unsigned char FAR *d;
+	unsigned char *c;
+	unsigned char *d;
 
 	for (l = n; l < HASH_FACTOR(len / SSH_BLOCKSIZE); l = l << 2) {
 	}
@@ -129,11 +129,11 @@
 
 	if (h == NULL) {
 		n = l;
-		h = (uint32 FAR *) malloc(n * HASH_ENTRYSIZE);
+		h = (uint32 *) malloc(n * HASH_ENTRYSIZE);
 	} else {
 		if (l > n) {
 			n = l;
-			h = (uint32 FAR *) realloc(h, n * HASH_ENTRYSIZE);
+			h = (uint32 *) realloc(h, n * HASH_ENTRYSIZE);
 		}
 	}
 
@@ -188,7 +188,7 @@
 	return DEATTACK_OK;
 }
 
-BOOL CRYPT_detect_attack(PTInstVar pvar, unsigned char FAR * buf,
+BOOL CRYPT_detect_attack(PTInstVar pvar, unsigned char *buf,
                          int bytes)
 {
 	if (SSHv1(pvar)) {
@@ -204,11 +204,11 @@
 	}
 }
 
-static void no_encrypt(PTInstVar pvar, unsigned char FAR * buf, int bytes)
+static void no_encrypt(PTInstVar pvar, unsigned char *buf, int bytes)
 {
 }
 
-static void crypt_SSH2_encrypt(PTInstVar pvar, unsigned char FAR * buf, int bytes)
+static void crypt_SSH2_encrypt(PTInstVar pvar, unsigned char *buf, int bytes)
 {
 	unsigned char *newbuf;
 	int block_size = pvar->ssh2_keys[MODE_OUT].enc.block_size;
@@ -242,7 +242,7 @@
 	free(newbuf);
 }
 
-static void crypt_SSH2_decrypt(PTInstVar pvar, unsigned char FAR * buf, int bytes)
+static void crypt_SSH2_decrypt(PTInstVar pvar, unsigned char *buf, int bytes)
 {
 	unsigned char *newbuf;
 	int block_size = pvar->ssh2_keys[MODE_IN].enc.block_size;
@@ -276,9 +276,9 @@
 	free(newbuf);
 }
 
-static void c3DES_encrypt(PTInstVar pvar, unsigned char FAR * buf, int bytes)
+static void c3DES_encrypt(PTInstVar pvar, unsigned char *buf, int bytes)
 {
-	Cipher3DESState FAR *encryptstate = &pvar->crypt_state.enc.c3DES;
+	Cipher3DESState *encryptstate = &pvar->crypt_state.enc.c3DES;
 
 	DES_ncbc_encrypt(buf, buf, bytes,
 	                 &encryptstate->k1, &encryptstate->ivec1, DES_ENCRYPT);
@@ -288,9 +288,9 @@
 	                 &encryptstate->k3, &encryptstate->ivec3, DES_ENCRYPT);
 }
 
-static void c3DES_decrypt(PTInstVar pvar, unsigned char FAR * buf, int bytes)
+static void c3DES_decrypt(PTInstVar pvar, unsigned char *buf, int bytes)
 {
-	Cipher3DESState FAR *decryptstate = &pvar->crypt_state.dec.c3DES;
+	Cipher3DESState *decryptstate = &pvar->crypt_state.dec.c3DES;
 
 	DES_ncbc_encrypt(buf, buf, bytes,
 	                 &decryptstate->k3, &decryptstate->ivec3, DES_DECRYPT);
@@ -300,25 +300,25 @@
 	                 &decryptstate->k1, &decryptstate->ivec1, DES_DECRYPT);
 }
 
-static void cDES_encrypt(PTInstVar pvar, unsigned char FAR * buf, int bytes)
+static void cDES_encrypt(PTInstVar pvar, unsigned char *buf, int bytes)
 {
-	CipherDESState FAR *encryptstate = &pvar->crypt_state.enc.cDES;
+	CipherDESState *encryptstate = &pvar->crypt_state.enc.cDES;
 
 	DES_ncbc_encrypt(buf, buf, bytes,
 	                 &encryptstate->k, &encryptstate->ivec, DES_ENCRYPT);
 }
 
-static void cDES_decrypt(PTInstVar pvar, unsigned char FAR * buf, int bytes)
+static void cDES_decrypt(PTInstVar pvar, unsigned char *buf, int bytes)
 {
-	CipherDESState FAR *decryptstate = &pvar->crypt_state.dec.cDES;
+	CipherDESState *decryptstate = &pvar->crypt_state.dec.cDES;
 
 	DES_ncbc_encrypt(buf, buf, bytes,
 	                 &decryptstate->k, &decryptstate->ivec, DES_DECRYPT);
 }
 
-static void flip_endianness(unsigned char FAR * cbuf, int bytes)
+static void flip_endianness(unsigned char *cbuf, int bytes)
 {
-	uint32 FAR *buf = (uint32 FAR *) cbuf;
+	uint32 *buf = (uint32 *) cbuf;
 	int count = bytes / 4;
 
 	while (count > 0) {
@@ -331,9 +331,9 @@
 	}
 }
 
-static void cBlowfish_encrypt(PTInstVar pvar, unsigned char FAR * buf, int bytes)
+static void cBlowfish_encrypt(PTInstVar pvar, unsigned char *buf, int bytes)
 {
-	CipherBlowfishState FAR *encryptstate =
+	CipherBlowfishState *encryptstate =
 		&pvar->crypt_state.enc.cBlowfish;
 
 	flip_endianness(buf, bytes);
@@ -342,9 +342,9 @@
 	flip_endianness(buf, bytes);
 }
 
-static void cBlowfish_decrypt(PTInstVar pvar, unsigned char FAR * buf, int bytes)
+static void cBlowfish_decrypt(PTInstVar pvar, unsigned char *buf, int bytes)
 {
-	CipherBlowfishState FAR *decryptstate =
+	CipherBlowfishState *decryptstate =
 		&pvar->crypt_state.dec.cBlowfish;
 
 	flip_endianness(buf, bytes);
@@ -353,7 +353,7 @@
 	flip_endianness(buf, bytes);
 }
 
-void CRYPT_set_random_data(PTInstVar pvar, unsigned char FAR * buf, int bytes)
+void CRYPT_set_random_data(PTInstVar pvar, unsigned char *buf, int bytes)
 {
 	RAND_bytes(buf, bytes);
 }
@@ -365,7 +365,7 @@
 	//RAND_screen();
 }
 
-static BIGNUM FAR *get_bignum(unsigned char FAR * bytes)
+static BIGNUM *get_bignum(unsigned char *bytes)
 {
 	int bits = get_ushort16_MSBfirst(bytes);
 
@@ -373,11 +373,11 @@
 }
 
 // make_key()\x82\xF0 fingerprint \x90\xB6\x90\xAC\x82ł\xE0\x97\x98\x97p\x82\xB7\x82\xE9\x82?ŁAstatic\x82\xF0\x8D?\x81B(2006.3.27 yutaka)
-RSA FAR *make_key(PTInstVar pvar,
-                  int bits, unsigned char FAR * exp,
-                  unsigned char FAR * mod)
+RSA *make_key(PTInstVar pvar,
+                  int bits, unsigned char *exp,
+                  unsigned char *mod)
 {
-	RSA FAR *key = RSA_new();
+	RSA *key = RSA_new();
 
 	if (key != NULL) {
 		key->e = get_bignum(exp);
@@ -405,7 +405,7 @@
 	}
 }
 
-void CRYPT_set_server_cookie(PTInstVar pvar, unsigned char FAR * cookie)
+void CRYPT_set_server_cookie(PTInstVar pvar, unsigned char *cookie)
 {
 	if (SSHv1(pvar)) {
 		memcpy(pvar->crypt_state.server_cookie, cookie, SSH_COOKIE_LENGTH);
@@ -415,7 +415,7 @@
 	}
 }
 
-void CRYPT_set_client_cookie(PTInstVar pvar, unsigned char FAR * cookie)
+void CRYPT_set_client_cookie(PTInstVar pvar, unsigned char *cookie)
 {
 	if (SSHv2(pvar)) {
 		memcpy(pvar->crypt_state.client_cookie, cookie,
@@ -424,8 +424,8 @@
 }
 
 BOOL CRYPT_set_server_RSA_key(PTInstVar pvar,
-                              int bits, unsigned char FAR * exp,
-                              unsigned char FAR * mod)
+                              int bits, unsigned char *exp,
+                              unsigned char *mod)
 {
 	pvar->crypt_state.server_key.RSA_key = make_key(pvar, bits, exp, mod);
 
@@ -433,8 +433,8 @@
 }
 
 BOOL CRYPT_set_host_RSA_key(PTInstVar pvar,
-                            int bits, unsigned char FAR * exp,
-                            unsigned char FAR * mod)
+                            int bits, unsigned char *exp,
+                            unsigned char *mod)
 {
 	pvar->crypt_state.host_key.RSA_key = make_key(pvar, bits, exp, mod);
 
@@ -544,7 +544,7 @@
 // \x81\xA6\x96{\x8A?\x94\x82\xCD SSH2 \x82ł??g\x97p\x82\xB3\x82\xEA\x82\xE9\x81B
 // (2004.12.17 yutaka)
 BOOL CRYPT_verify_receiver_MAC(PTInstVar pvar, uint32 sequence_number,
-	char FAR * data, int len, char FAR * MAC)
+	char *data, int len, char *MAC)
 {
 	HMAC_CTX c;
 	unsigned char m[EVP_MAX_MD_SIZE];
@@ -605,7 +605,7 @@
 
 // for SSH2
 BOOL CRYPT_build_sender_MAC(PTInstVar pvar, uint32 sequence_number,
-                            char FAR * data, int len, char FAR * MAC)
+                            char *data, int len, char *MAC)
 {
 	HMAC_CTX c;
 	static u_char m[EVP_MAX_MD_SIZE];
@@ -697,7 +697,7 @@
 }
 
 int CRYPT_choose_session_key(PTInstVar pvar,
-                             unsigned char FAR * encrypted_key_buf)
+                             unsigned char *encrypted_key_buf)
 {
 	int server_key_bits =
 		BN_num_bits(pvar->crypt_state.server_key.RSA_key->n);
@@ -724,7 +724,7 @@
 		/* following Goldberg's code, I'm using MD5(servkey->n || hostkey->n || cookie)
 		   for the session ID, rather than the one specified in the RFC */
 		int session_buf_len = server_key_bytes + host_key_bytes + 8;
-		char FAR *session_buf = (char FAR *) malloc(session_buf_len);
+		char *session_buf = (char *) malloc(session_buf_len);
 		char session_id[16];
 		int i;
 
@@ -795,9 +795,9 @@
 }
 
 int CRYPT_generate_RSA_challenge_response(PTInstVar pvar,
-                                          unsigned char FAR * challenge,
+                                          unsigned char *challenge,
                                           int challenge_len,
-                                          unsigned char FAR * response)
+                                          unsigned char *response)
 {
 	int server_key_bits =
 		BN_num_bits(pvar->crypt_state.server_key.RSA_key->n);
@@ -805,7 +805,7 @@
 	int server_key_bytes = (server_key_bits + 7) / 8;
 	int host_key_bytes = (host_key_bits + 7) / 8;
 	int session_buf_len = server_key_bytes + host_key_bytes + 8;
-	char FAR *session_buf = (char FAR *) malloc(session_buf_len);
+	char *session_buf = (char *) malloc(session_buf_len);
 	char decrypted_challenge[48];
 	int decrypted_challenge_len;
 
@@ -843,24 +843,24 @@
 	return 1;
 }
 
-static void c3DES_init(char FAR * session_key, Cipher3DESState FAR * state)
+static void c3DES_init(char *session_key, Cipher3DESState *state)
 {
-	DES_set_key((const_DES_cblock FAR *) session_key, &state->k1);
-	DES_set_key((const_DES_cblock FAR *) (session_key + 8), &state->k2);
-	DES_set_key((const_DES_cblock FAR *) (session_key + 16), &state->k3);
+	DES_set_key((const_DES_cblock *) session_key, &state->k1);
+	DES_set_key((const_DES_cblock *) (session_key + 8), &state->k2);
+	DES_set_key((const_DES_cblock *) (session_key + 16), &state->k3);
 	memset(state->ivec1, 0, 8);
 	memset(state->ivec2, 0, 8);
 	memset(state->ivec3, 0, 8);
 }
 
-static void cDES_init(char FAR * session_key, CipherDESState FAR * state)
+static void cDES_init(char *session_key, CipherDESState *state)
 {
-	DES_set_key((const_DES_cblock FAR *) session_key, &state->k);
+	DES_set_key((const_DES_cblock *) session_key, &state->k);
 	memset(state->ivec, 0, 8);
 }
 
-static void cBlowfish_init(char FAR * session_key,
-                           CipherBlowfishState FAR * state)
+static void cBlowfish_init(char *session_key,
+                           CipherBlowfishState *state)
 {
 	BF_set_key(&state->k, 32, session_key);
 	memset(state->ivec, 0, 8);
@@ -940,8 +940,8 @@
 BOOL CRYPT_start_encryption(PTInstVar pvar, int sender_flag, int receiver_flag)
 {
 	struct Enc *enc;
-	char FAR *encryption_key = pvar->crypt_state.sender_cipher_key;
-	char FAR *decryption_key = pvar->crypt_state.receiver_cipher_key;
+	char *encryption_key = pvar->crypt_state.sender_cipher_key;
+	char *decryption_key = pvar->crypt_state.receiver_cipher_key;
 	int cipher;
 	BOOL isOK = TRUE;
 
@@ -1061,7 +1061,7 @@
 		HASH_MINSIZE / HASH_ENTRYSIZE;
 }
 
-static char FAR *get_cipher_name(int cipher)
+static char *get_cipher_name(int cipher)
 {
 	switch (cipher) {
 	case SSH_CIPHER_NONE:
@@ -1122,7 +1122,7 @@
 	}
 }
 
-void CRYPT_get_cipher_info(PTInstVar pvar, char FAR * dest, int len)
+void CRYPT_get_cipher_info(PTInstVar pvar, char *dest, int len)
 {
 	UTIL_get_lang_msg("DLG_ABOUT_CIPHER_INFO", pvar,
 	                  "%s to server, %s from server");
@@ -1131,7 +1131,7 @@
 	          get_cipher_name(pvar->crypt_state.receiver_cipher));
 }
 
-void CRYPT_get_server_key_info(PTInstVar pvar, char FAR * dest, int len)
+void CRYPT_get_server_key_info(PTInstVar pvar, char *dest, int len)
 {
 	if (SSHv1(pvar)) {
 		if (pvar->crypt_state.server_key.RSA_key == NULL
@@ -1191,8 +1191,8 @@
 	SecureZeroMemory(&pvar->crypt_state.dec, sizeof(pvar->crypt_state.dec));
 }
 
-int CRYPT_passphrase_decrypt(int cipher, char FAR * passphrase,
-                             char FAR * buf, int bytes)
+int CRYPT_passphrase_decrypt(int cipher, char *passphrase,
+                             char *buf, int bytes)
 {
 	unsigned char passphrase_key[16];
 
@@ -1202,11 +1202,11 @@
 	case SSH_CIPHER_3DES:{
 			Cipher3DESState state;
 
-			DES_set_key((const_DES_cblock FAR *) passphrase_key,
+			DES_set_key((const_DES_cblock *) passphrase_key,
 			            &state.k1);
-			DES_set_key((const_DES_cblock FAR *) (passphrase_key + 8),
+			DES_set_key((const_DES_cblock *) (passphrase_key + 8),
 			            &state.k2);
-			DES_set_key((const_DES_cblock FAR *) passphrase_key,
+			DES_set_key((const_DES_cblock *) passphrase_key,
 			            &state.k3);
 			memset(state.ivec1, 0, 8);
 			memset(state.ivec2, 0, 8);

Modified: trunk/ttssh2/ttxssh/crypt.h
===================================================================
--- trunk/ttssh2/ttxssh/crypt.h	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/crypt.h	2017-06-13 10:30:12 UTC (rev 6801)
@@ -66,7 +66,7 @@
 } CipherBlowfishState;
 
 typedef struct {
-  uint32 FAR * h;
+  uint32 *h;
   uint32 n;
 } CRYPTDetectAttack;
 
@@ -80,7 +80,7 @@
   CipherBlowfishState cBlowfish;
 } CRYPTCipherState;
 
-typedef void (* CRYPTCryptFun)(PTInstVar pvar, unsigned char FAR * buf, int bytes);
+typedef void (* CRYPTCryptFun)(PTInstVar pvar, unsigned char *buf, int bytes);
 
 typedef struct {
   CRYPTDetectAttack detect_attack_statics;
@@ -108,35 +108,35 @@
    from the server. Therefore we have some time available to do some
    moderately expensive computations. */
 void CRYPT_initialize_random_numbers(PTInstVar pvar);
-void CRYPT_set_random_data(PTInstVar pvar, unsigned char FAR * buf, int bytes);
+void CRYPT_set_random_data(PTInstVar pvar, unsigned char *buf, int bytes);
 void CRYPT_end(PTInstVar pvar);
 
-void CRYPT_get_cipher_info(PTInstVar pvar, char FAR * dest, int len);
-void CRYPT_get_server_key_info(PTInstVar pvar, char FAR * dest, int len);
+void CRYPT_get_cipher_info(PTInstVar pvar, char *dest, int len);
+void CRYPT_get_server_key_info(PTInstVar pvar, char *dest, int len);
 
-void CRYPT_set_server_cookie(PTInstVar pvar, unsigned char FAR * cookie);
-void CRYPT_set_client_cookie(PTInstVar pvar, unsigned char FAR * cookie);
+void CRYPT_set_server_cookie(PTInstVar pvar, unsigned char *cookie);
+void CRYPT_set_client_cookie(PTInstVar pvar, unsigned char *cookie);
 #define CRYPT_get_server_cookie(pvar) ((pvar)->crypt_state.server_cookie)
 
-void CRYPT_free_public_key(CRYPTPublicKey FAR * key);
+void CRYPT_free_public_key(CRYPTPublicKey *key);
 
 BOOL CRYPT_set_server_RSA_key(PTInstVar pvar,
-  int bits, unsigned char FAR * exp, unsigned char FAR * mod);
+  int bits, unsigned char *exp, unsigned char *mod);
 BOOL CRYPT_set_host_RSA_key(PTInstVar pvar,
-  int bits, unsigned char FAR * exp, unsigned char FAR * mod);
+  int bits, unsigned char *exp, unsigned char *mod);
 int CRYPT_get_encrypted_session_key_len(PTInstVar pvar);
-int CRYPT_choose_session_key(PTInstVar pvar, unsigned char FAR * encrypted_key_buf);
+int CRYPT_choose_session_key(PTInstVar pvar, unsigned char *encrypted_key_buf);
 BOOL CRYPT_start_encryption(PTInstVar pvar, int sender_flag, int receiver_flag);
-int CRYPT_generate_RSA_challenge_response(PTInstVar pvar, unsigned char FAR * challenge,
-                                           int challenge_len, unsigned char FAR * response);
+int CRYPT_generate_RSA_challenge_response(PTInstVar pvar, unsigned char *challenge,
+                                           int challenge_len, unsigned char *response);
 
 int CRYPT_get_receiver_MAC_size(PTInstVar pvar);
 BOOL CRYPT_verify_receiver_MAC(PTInstVar pvar, uint32 sequence_number,
-  char FAR * data, int len, char FAR * MAC);
+  char *data, int len, char *MAC);
 int CRYPT_get_sender_MAC_size(PTInstVar pvar);
 
 BOOL CRYPT_build_sender_MAC(PTInstVar pvar, uint32 sequence_number,
-  char FAR * data, int len, char FAR * MAC);
+  char *data, int len, char *MAC);
 
 BOOL CRYPT_set_supported_ciphers(PTInstVar pvar, int sender_ciphers, int receiver_ciphers);
 BOOL CRYPT_choose_ciphers(PTInstVar pvar);
@@ -149,10 +149,10 @@
 #define CRYPT_decrypt(pvar, buf, bytes) \
     ((pvar)->crypt_state.decrypt((pvar), (buf), (bytes)))
 
-BOOL CRYPT_detect_attack(PTInstVar pvar, unsigned char FAR * buf, int bytes);
-int CRYPT_passphrase_decrypt(int cipher, char FAR * passphrase, char FAR * buf, int len);
-RSA FAR *make_key(PTInstVar pvar,
-                  int bits, unsigned char FAR * exp,
-                  unsigned char FAR * mod);
+BOOL CRYPT_detect_attack(PTInstVar pvar, unsigned char *buf, int bytes);
+int CRYPT_passphrase_decrypt(int cipher, char *passphrase, char *buf, int len);
+RSA *make_key(PTInstVar pvar,
+                  int bits, unsigned char *exp,
+                  unsigned char *mod);
 
 #endif

Modified: trunk/ttssh2/ttxssh/dns.c
===================================================================
--- trunk/ttssh2/ttxssh/dns.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/dns.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -51,7 +51,7 @@
 	return 0;
 }
 
-int verify_hostkey_dns(PTInstVar pvar, char FAR *hostname, Key *key)
+int verify_hostkey_dns(PTInstVar pvar, char *hostname, Key *key)
 {
 	DNS_STATUS status;
 	PDNS_RECORD rec, p;

Modified: trunk/ttssh2/ttxssh/dns.h
===================================================================
--- trunk/ttssh2/ttxssh/dns.h	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/dns.h	2017-06-13 10:30:12 UTC (rev 6801)
@@ -63,6 +63,6 @@
 } DNS_SSHFP_DATA, *PDNS_SSHFP_DATA;
 
 int is_numeric_hostname(const char *hostname);
-int verify_hostkey_dns(PTInstVar pvar, char FAR *hostname, Key *key);
+int verify_hostkey_dns(PTInstVar pvar, char *hostname, Key *key);
 
 #endif //  __TTSSH_DNS_H

Modified: trunk/ttssh2/ttxssh/fwd.c
===================================================================
--- trunk/ttssh2/ttxssh/fwd.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/fwd.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -109,7 +109,7 @@
 static int find_listening_socket_num(PTInstVar pvar, int request_num,
                                      SOCKET s)
 {
-	FWDRequest FAR *request = pvar->fwd_state.requests + request_num;
+	FWDRequest *request = pvar->fwd_state.requests + request_num;
 	int i;
 
 	for (i = 0; i < request->num_listening_sockets; ++i)
@@ -123,7 +123,7 @@
 static void drain_matching_messages(HWND wnd, UINT msg, WPARAM wParam)
 {
 	MSG m;
-	MSG FAR *buf;
+	MSG *buf;
 	int buf_len;
 	int buf_size;
 	int i;
@@ -136,12 +136,12 @@
 	/* suck out all the messages */
 	buf_size = 1;
 	buf_len = 0;
-	buf = (MSG FAR *) malloc(sizeof(MSG) * buf_size);
+	buf = (MSG *) malloc(sizeof(MSG) * buf_size);
 
 	while (PeekMessage(&m, wnd, msg, msg, PM_REMOVE)) {
 		if (buf_len == buf_size) {
 			buf_size *= 2;
-			buf = (MSG FAR *) realloc(buf, sizeof(MSG) * buf_size);
+			buf = (MSG *) realloc(buf, sizeof(MSG) * buf_size);
 		}
 
 		buf[buf_len] = m;
@@ -207,7 +207,7 @@
 
 static void request_error(PTInstVar pvar, int request_num, int err)
 {
-	SOCKET FAR *s =
+	SOCKET *s =
 		pvar->fwd_state.requests[request_num].listening_sockets;
 	int i;
 
@@ -229,7 +229,7 @@
 
 static void send_local_connection_closure(PTInstVar pvar, int channel_num)
 {
-	FWDChannel FAR *channel = pvar->fwd_state.channels + channel_num;
+	FWDChannel *channel = pvar->fwd_state.channels + channel_num;
 
 	if ((channel->status & (FWD_REMOTE_CONNECTED | FWD_LOCAL_CONNECTED))
 	 == (FWD_REMOTE_CONNECTED | FWD_LOCAL_CONNECTED)) {
@@ -241,7 +241,7 @@
 
 static void closed_local_connection(PTInstVar pvar, int channel_num)
 {
-	FWDChannel FAR *channel = pvar->fwd_state.channels + channel_num;
+	FWDChannel *channel = pvar->fwd_state.channels + channel_num;
 
 	if (channel->local_socket != INVALID_SOCKET) {
 		safe_closesocket(pvar, channel->local_socket);
@@ -255,7 +255,7 @@
    active channels. */
 static void really_delete_request(PTInstVar pvar, int request_num)
 {
-	FWDRequest FAR *request = pvar->fwd_state.requests + request_num;
+	FWDRequest *request = pvar->fwd_state.requests + request_num;
 
 	if (request->to_host_lookup_handle != 0) {
 		safe_WSACancelAsyncRequest(pvar, request->to_host_lookup_handle);
@@ -268,7 +268,7 @@
 
 void FWD_free_channel(PTInstVar pvar, uint32 local_channel_num)
 {
-	FWDChannel FAR *channel = &pvar->fwd_state.channels[local_channel_num];
+	FWDChannel *channel = &pvar->fwd_state.channels[local_channel_num];
 
 	if (channel->type == TYPE_AGENT) { // TYPE_AGENT \x82ł\xB1\x82\xB1\x82?\x88\x82\xE9\x82?\xCD SSH1 \x82?\xDD
 		buffer_free(channel->agent_msg);
@@ -291,7 +291,7 @@
 	}
 
 	if (channel->request_num >= 0) {
-		FWDRequest FAR *request =
+		FWDRequest *request =
 			&pvar->fwd_state.requests[channel->request_num];
 
 		request->num_channels--;
@@ -305,7 +305,7 @@
 
 void FWD_channel_input_eof(PTInstVar pvar, uint32 local_channel_num)
 {
-	FWDChannel FAR *channel;
+	FWDChannel *channel;
 
 	if (!FWD_check_local_channel_num(pvar, local_channel_num))
 		return;
@@ -324,7 +324,7 @@
 
 void FWD_channel_output_eof(PTInstVar pvar, uint32 local_channel_num)
 {
-	FWDChannel FAR *channel;
+	FWDChannel *channel;
 
 	if (!FWD_check_local_channel_num(pvar, local_channel_num))
 		return;
@@ -341,7 +341,7 @@
 	}
 }
 
-static char FAR *describe_socket_error(PTInstVar pvar, int code)
+static char *describe_socket_error(PTInstVar pvar, int code)
 {
 	switch (code) {
 	case WSAECONNREFUSED:
@@ -373,10 +373,10 @@
 	}
 }
 
-static void channel_error(PTInstVar pvar, char FAR * action,
+static void channel_error(PTInstVar pvar, char *action,
                           int channel_num, int err)
 {
-	char FAR *err_msg;
+	char *err_msg;
 	char uimsg[MAX_UIMSG];
 
 	closed_local_connection(pvar, channel_num);
@@ -410,8 +410,8 @@
 static void channel_opening_error(PTInstVar pvar, int channel_num, int err)
 {
 	char buf[1024];
-	FWDChannel FAR *channel = &pvar->fwd_state.channels[channel_num];
-	FWDRequest FAR *request =
+	FWDChannel *channel = &pvar->fwd_state.channels[channel_num];
+	FWDRequest *request =
 		&pvar->fwd_state.requests[channel->request_num];
 	char uimsg[MAX_UIMSG];
 
@@ -446,7 +446,7 @@
 	int i;
 	int new_num_channels;
 	int new_channel = -1;
-	FWDChannel FAR *channel;
+	FWDChannel *channel;
 
 	for (i = 0; i < pvar->fwd_state.num_channels && new_channel < 0; i++) {
 		if (pvar->fwd_state.channels[i].status == 0) {
@@ -457,7 +457,7 @@
 	if (new_channel < 0) {
 		new_num_channels = pvar->fwd_state.num_channels + 1;
 		pvar->fwd_state.channels =
-			(FWDChannel FAR *) realloc(pvar->fwd_state.channels,
+			(FWDChannel *) realloc(pvar->fwd_state.channels,
 			                           sizeof(FWDChannel) *
 			                           new_num_channels);
 
@@ -491,7 +491,7 @@
 	int i;
 	int new_num_channels;
 	int new_channel = -1;
-	FWDChannel FAR *channel;
+	FWDChannel *channel;
 
 	for (i = 0; i < pvar->fwd_state.num_channels && new_channel < 0; i++) {
 		if (pvar->fwd_state.channels[i].status == 0) {
@@ -502,7 +502,7 @@
 	if (new_channel < 0) {
 		new_num_channels = pvar->fwd_state.num_channels + 1;
 		pvar->fwd_state.channels =
-			(FWDChannel FAR *) realloc(pvar->fwd_state.channels,
+			(FWDChannel *) realloc(pvar->fwd_state.channels,
 			                           sizeof(FWDChannel) *
 			                           new_num_channels);
 
@@ -552,8 +552,8 @@
 
 static void make_local_connection(PTInstVar pvar, int channel_num)
 {
-	FWDChannel FAR *channel = pvar->fwd_state.channels + channel_num;
-	FWDRequest FAR *request =
+	FWDChannel *channel = pvar->fwd_state.channels + channel_num;
+	FWDRequest *request =
 		pvar->fwd_state.requests + channel->request_num;
 
 	for (channel->to_host_addrs = request->to_host_addrs;
@@ -600,21 +600,21 @@
 	char strport[NI_MAXSERV]; // ws2tcpip.h
 	int addrlen = sizeof(addr);
 	char buf[1024];
-	BYTE FAR *IP;
-	FWDChannel FAR *channel;
-	FWDRequest FAR *request = &pvar->fwd_state.requests[request_num];
+	BYTE *IP;
+	FWDChannel *channel;
+	FWDRequest *request = &pvar->fwd_state.requests[request_num];
 	BOOL is_localhost = FALSE;
 
 	s = accept(request->listening_sockets[listening_socket_num],
-	           (struct sockaddr FAR *) &addr, &addrlen);
+	           (struct sockaddr *) &addr, &addrlen);
 	if (s == INVALID_SOCKET)
 		return;
 
-	IP = (BYTE FAR *) & ((struct sockaddr_in *) (&addr))->sin_addr.s_addr;
+	IP = (BYTE *) & ((struct sockaddr_in *) (&addr))->sin_addr.s_addr;
 
 	// SSH2 port-forwarding\x82??\xB1\x8C\xB3\x82?\x8A\x83\x82\x81[\x83g\x83|\x81[\x83g\x82\xAA\x95K\x97v\x81B(2005.2.27 yutaka)
 	if (getnameinfo
-	    ((struct sockaddr FAR *) &addr, addrlen, hname, sizeof(hname),
+	    ((struct sockaddr *) &addr, addrlen, hname, sizeof(hname),
 	     strport, sizeof(strport), NI_NUMERICHOST | NI_NUMERICSERV)) {
 		/* NOT REACHED */
 	}
@@ -640,7 +640,7 @@
 
 static void write_local_connection_buffer(PTInstVar pvar, int channel_num)
 {
-	FWDChannel FAR *channel = pvar->fwd_state.channels + channel_num;
+	FWDChannel *channel = pvar->fwd_state.channels + channel_num;
 
 	if ((channel->status & (FWD_REMOTE_CONNECTED | FWD_LOCAL_CONNECTED))
 	 == (FWD_REMOTE_CONNECTED | FWD_LOCAL_CONNECTED)) {
@@ -653,7 +653,7 @@
 
 static void read_local_connection(PTInstVar pvar, int channel_num)
 {
-	FWDChannel FAR *channel = pvar->fwd_state.channels + channel_num;
+	FWDChannel *channel = pvar->fwd_state.channels + channel_num;
 
 	if ((channel->status & (FWD_REMOTE_CONNECTED | FWD_LOCAL_CONNECTED))
 	 != (FWD_REMOTE_CONNECTED | FWD_LOCAL_CONNECTED)) {
@@ -670,7 +670,7 @@
 		//OutputDebugPrintf("%s: recv %d\n", __FUNCTION__, amount);
 
 		if (amount > 0) {
-			char FAR *new_buf = buf;
+			char *new_buf = buf;
 			int action = FWD_FILTER_RETAIN;
 
 			if (channel->filter != NULL) {
@@ -784,7 +784,7 @@
 
 	case WM_SOCK_IO:{
 			int channel_num = find_channel_num(pvar, (SOCKET) wParam);
-			FWDChannel FAR *channel =
+			FWDChannel *channel =
 				pvar->fwd_state.channels + channel_num;
 
 			if (channel_num < 0)
@@ -867,11 +867,11 @@
 	                      wParam, lParam);
 }
 
-int FWD_compare_specs(void const FAR * void_spec1,
-                      void const FAR * void_spec2)
+int FWD_compare_specs(void const *void_spec1,
+                      void const *void_spec2)
 {
-	FWDRequestSpec FAR *spec1 = (FWDRequestSpec FAR *) void_spec1;
-	FWDRequestSpec FAR *spec2 = (FWDRequestSpec FAR *) void_spec2;
+	FWDRequestSpec *spec1 = (FWDRequestSpec *) void_spec1;
+	FWDRequestSpec *spec2 = (FWDRequestSpec *) void_spec2;
 	int delta = spec1->from_port - spec2->from_port;
 
 	if (delta == 0) {
@@ -890,8 +890,8 @@
    so that we never lie to the server about where its forwarded connection is
    ending up. Maybe some SSH implementation depends on this information being
    reliable, for security? */
-static BOOL can_server_listen_using(FWDRequestSpec FAR * listener,
-                                    FWDRequestSpec FAR * spec)
+static BOOL can_server_listen_using(FWDRequestSpec *listener,
+                                    FWDRequestSpec *spec)
 {
 	return listener->type == spec->type
 	    && listener->from_port == spec->from_port
@@ -902,7 +902,7 @@
 	     || strcmp(listener->bind_address, spec->bind_address) == 0);
 }
 
-BOOL FWD_can_server_listen_for(PTInstVar pvar, FWDRequestSpec FAR * spec)
+BOOL FWD_can_server_listen_for(PTInstVar pvar, FWDRequestSpec *spec)
 {
 	int num_server_listening_requests =
 		pvar->fwd_state.num_server_listening_specs;
@@ -910,7 +910,7 @@
 	if (num_server_listening_requests < 0) {
 		return TRUE;
 	} else {
-		FWDRequestSpec FAR *listener =
+		FWDRequestSpec *listener =
 			bsearch(spec, pvar->fwd_state.server_listening_specs,
 			        num_server_listening_requests,
 			        sizeof(FWDRequestSpec), FWD_compare_specs);
@@ -937,7 +937,7 @@
 	return num_request_specs;
 }
 
-void FWD_get_request_specs(PTInstVar pvar, FWDRequestSpec FAR * specs,
+void FWD_get_request_specs(PTInstVar pvar, FWDRequestSpec *specs,
                            int num_specs)
 {
 	int i;
@@ -956,11 +956,11 @@
    It returns the listening socket for the request, if there is one.
    The caller must close this socket if it is not INVALID_SOCKET.
 */
-static SOCKET FAR *delete_request(PTInstVar pvar, int request_num,
+static SOCKET *delete_request(PTInstVar pvar, int request_num,
                                   int *p_num_listening_sockets)
 {
-	FWDRequest FAR *request = pvar->fwd_state.requests + request_num;
-	SOCKET FAR *lp_listening_sockets;
+	FWDRequest *request = pvar->fwd_state.requests + request_num;
+	SOCKET *lp_listening_sockets;
 
 /* safe to shut down the listening socket here. Any pending connections
    that haven't yet been turned into channels will be broken, but that's
@@ -981,8 +981,8 @@
 	return lp_listening_sockets;
 }
 
-static BOOL are_specs_identical(FWDRequestSpec FAR * spec1,
-                                FWDRequestSpec FAR * spec2)
+static BOOL are_specs_identical(FWDRequestSpec *spec1,
+                                FWDRequestSpec *spec2)
 {
 	return spec1->type == spec2->type
 	    && spec1->from_port == spec2->from_port
@@ -994,12 +994,12 @@
 static BOOL interactive_init_request(PTInstVar pvar, int request_num,
                                      BOOL report_error)
 {
-	FWDRequest FAR *request = pvar->fwd_state.requests + request_num;
+	FWDRequest *request = pvar->fwd_state.requests + request_num;
 
 	if (request->spec.type == FWD_LOCAL_TO_REMOTE) {
 		struct addrinfo hints;
-		struct addrinfo FAR *res;
-		struct addrinfo FAR *res0;
+		struct addrinfo *res;
+		struct addrinfo *res0;
 		SOCKET s;
 		char pname[NI_MAXSERV];
 		char bname[NI_MAXHOST];
@@ -1020,7 +1020,7 @@
 		     res = res->ai_next)
 			request->num_listening_sockets++;
 		request->listening_sockets =
-			(SOCKET FAR *) malloc(sizeof(SOCKET) *
+			(SOCKET *) malloc(sizeof(SOCKET) *
 			                      request->num_listening_sockets);
 		if (request->listening_sockets == NULL) {
 			freeaddrinfo(res0);
@@ -1073,10 +1073,10 @@
 /* This function will only be called on a request when all its channels are
    closed. */
 static BOOL init_request(PTInstVar pvar, int request_num,
-                         BOOL report_error, SOCKET FAR * listening_sockets,
+                         BOOL report_error, SOCKET *listening_sockets,
                          int num_listening_sockets)
 {
-	FWDRequest FAR *request = pvar->fwd_state.requests + request_num;
+	FWDRequest *request = pvar->fwd_state.requests + request_num;
 
 	request->num_listening_sockets = 0;
 	request->listening_sockets = NULL;
@@ -1099,17 +1099,17 @@
 	}
 }
 
-void FWD_set_request_specs(PTInstVar pvar, FWDRequestSpec FAR * specs,
+void FWD_set_request_specs(PTInstVar pvar, FWDRequestSpec *specs,
                            int num_specs)
 {
-	FWDRequestSpec FAR *new_specs =
-		(FWDRequestSpec FAR *) malloc(sizeof(FWDRequestSpec) * num_specs);
-	char FAR *specs_accounted_for;
+	FWDRequestSpec *new_specs =
+		(FWDRequestSpec *) malloc(sizeof(FWDRequestSpec) * num_specs);
+	char *specs_accounted_for;
 	typedef struct _saved_sockets {
-		SOCKET FAR *listening_sockets;
+		SOCKET *listening_sockets;
 		int num_listening_sockets;
 	} saved_sockets_t;
-	saved_sockets_t FAR *ptr_to_saved_sockets;
+	saved_sockets_t *ptr_to_saved_sockets;
 	int i;
 	int num_new_requests = num_specs;
 	int num_free_requests = 0;
@@ -1129,9 +1129,9 @@
 		}
 	}
 
-	specs_accounted_for = (char FAR *) malloc(sizeof(char) * num_specs);
+	specs_accounted_for = (char *) malloc(sizeof(char) * num_specs);
 	ptr_to_saved_sockets =
-		(saved_sockets_t FAR *) malloc(sizeof(saved_sockets_t) *
+		(saved_sockets_t *) malloc(sizeof(saved_sockets_t) *
 		                               num_specs);
 
 	memset(specs_accounted_for, 0, num_specs);
@@ -1142,9 +1142,9 @@
 
 	for (i = pvar->fwd_state.num_requests - 1; i >= 0; i--) {
 		if ((pvar->fwd_state.requests[i].status & FWD_DELETED) == 0) {
-			FWDRequestSpec FAR *cur_spec =
+			FWDRequestSpec *cur_spec =
 				&pvar->fwd_state.requests[i].spec;
-			FWDRequestSpec FAR *new_spec =
+			FWDRequestSpec *new_spec =
 				bsearch(cur_spec, new_specs, num_specs,
 				        sizeof(FWDRequestSpec), FWD_compare_specs);
 
@@ -1154,7 +1154,7 @@
 				num_new_requests--;
 			} else {
 				int num_listening_sockets;
-				SOCKET FAR *listening_sockets;
+				SOCKET *listening_sockets;
 				listening_sockets =
 					delete_request(pvar, i, &num_listening_sockets);
 
@@ -1186,7 +1186,7 @@
 			pvar->fwd_state.num_requests + num_new_requests - num_free_requests;
 
 		pvar->fwd_state.requests =
-			(FWDRequest FAR *) realloc(pvar->fwd_state.requests,
+			(FWDRequest *) realloc(pvar->fwd_state.requests,
 			                           sizeof(FWDRequest) *
 			                           total_requests);
 		for (i = pvar->fwd_state.num_requests; i < total_requests; i++) {
@@ -1227,7 +1227,7 @@
 	int num_server_listening_requests = 0;
 
 	for (i = 0; i < pvar->fwd_state.num_requests; i++) {
-		FWDRequest FAR *request = pvar->fwd_state.requests + i;
+		FWDRequest *request = pvar->fwd_state.requests + i;
 
 		if ((request->status & FWD_DELETED) == 0) {
 			switch (request->spec.type) {
@@ -1263,8 +1263,8 @@
 		num_server_listening_requests;
 
 	if (num_server_listening_requests > 0) {
-		FWDRequestSpec FAR *server_listening_requests =
-			(FWDRequestSpec FAR *) malloc(sizeof(FWDRequestSpec) *
+		FWDRequestSpec *server_listening_requests =
+			(FWDRequestSpec *) malloc(sizeof(FWDRequestSpec) *
 			                              num_server_listening_requests);
 
 		pvar->fwd_state.server_listening_specs = server_listening_requests;
@@ -1309,8 +1309,8 @@
 {
 	char buf[1024];
 	int channel_num;
-	FWDChannel FAR *channel;
-	FWDRequest FAR *request = pvar->fwd_state.requests + request_num;
+	FWDChannel *channel;
+	FWDRequest *request = pvar->fwd_state.requests + request_num;
 	struct addrinfo hints;
 	char pname[NI_MAXSERV];
 
@@ -1365,8 +1365,8 @@
 }
 
 void FWD_open(PTInstVar pvar, uint32 remote_channel_num,
-              char FAR * local_hostname, int local_port,
-              char FAR * originator, int originator_len,
+              char *local_hostname, int local_port,
+              char *originator, int originator_len,
               int *chan_num)
 {
 	int i;
@@ -1373,7 +1373,7 @@
 	char buf[1024];
 
 	for (i = 0; i < pvar->fwd_state.num_requests; i++) {
-		FWDRequest FAR *request = pvar->fwd_state.requests + i;
+		FWDRequest *request = pvar->fwd_state.requests + i;
 
 		if (SSHv1(pvar)) {
 			if ((request->status & FWD_DELETED) == 0
@@ -1401,7 +1401,7 @@
 	/* now, before we panic, maybe we TOLD the server we could forward this port
 	   and then the user changed the settings. */
 	for (i = 0; i < pvar->fwd_state.num_server_listening_specs; i++) {
-		FWDRequestSpec FAR *spec =
+		FWDRequestSpec *spec =
 			pvar->fwd_state.server_listening_specs + i;
 
 		if (spec->type == FWD_REMOTE_TO_LOCAL
@@ -1423,13 +1423,13 @@
 }
 
 void FWD_X11_open(PTInstVar pvar, uint32 remote_channel_num,
-                  char FAR * originator, int originator_len,
+                  char *originator, int originator_len,
                   int *chan_num)
 {
 	int i;
 
 	for (i = 0; i < pvar->fwd_state.num_requests; i++) {
-		FWDRequest FAR *request = pvar->fwd_state.requests + i;
+		FWDRequest *request = pvar->fwd_state.requests + i;
 
 		if ((request->status & FWD_DELETED) == 0
 		 && request->spec.type == FWD_REMOTE_X11_TO_LOCAL) {
@@ -1448,7 +1448,7 @@
 	/* now, before we panic, maybe we TOLD the server we could forward this port
 	   and then the user changed the settings. */
 	for (i = 0; i < pvar->fwd_state.num_server_listening_specs; i++) {
-		FWDRequestSpec FAR *spec =
+		FWDRequestSpec *spec =
 			pvar->fwd_state.server_listening_specs + i;
 
 		if (spec->type == FWD_REMOTE_X11_TO_LOCAL) {
@@ -1479,7 +1479,7 @@
                         uint32 remote_channel_num)
 {
 	SOCKET s;
-	FWDChannel FAR *channel;
+	FWDChannel *channel;
 
 	if (!FWD_check_local_channel_num(pvar, local_channel_num))
 		return;
@@ -1510,7 +1510,7 @@
 	FWD_free_channel(pvar, local_channel_num);
 }
 
-static BOOL blocking_write(PTInstVar pvar, SOCKET s, const char FAR * data,
+static BOOL blocking_write(PTInstVar pvar, SOCKET s, const char *data,
                            int length)
 {
 	u_long do_block = 0;
@@ -1550,10 +1550,10 @@
 }
 
 void FWD_received_data(PTInstVar pvar, uint32 local_channel_num,
-                       unsigned char FAR * data, int length)
+                       unsigned char *data, int length)
 {
 	SOCKET s;
-	FWDChannel FAR *channel;
+	FWDChannel *channel;
 	int action = FWD_FILTER_RETAIN;
 
 	if (!FWD_check_local_channel_num(pvar, local_channel_num))
@@ -1630,7 +1630,7 @@
 		for (i = 0; i < pvar->fwd_state.num_requests; i++) {
 			int j;
 			int num_listening_sockets;
-			SOCKET FAR *s =
+			SOCKET *s =
 				delete_request(pvar, i, &num_listening_sockets);
 
 			for (j = 0; j < num_listening_sockets; ++j) {

Modified: trunk/ttssh2/ttxssh/fwd.h
===================================================================
--- trunk/ttssh2/ttxssh/fwd.h	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/fwd.h	2017-06-13 10:30:12 UTC (rev 6801)
@@ -51,8 +51,8 @@
 
 /* a length == 0 means that we're killing the channel and the filter
    should deallocate */
-typedef int (* FWDFilter)(void FAR * closure, int direction,
-  int FAR * length, unsigned char FAR * FAR * buf);
+typedef int (* FWDFilter)(void *closure, int direction,
+  int *length, unsigned char **buf);
 
 typedef struct {
   int status;
@@ -61,9 +61,9 @@
   int request_num;
   UTILSockWriteBuf writebuf;
 
-  void FAR * filter_closure;
+  void *filter_closure;
   FWDFilter filter;
-  struct addrinfo FAR * to_host_addrs;
+  struct addrinfo *to_host_addrs;
 
   // for agent forwarding
   buffer_t *agent_msg;
@@ -99,8 +99,8 @@
 #define MAX_LISTENING_SOCKETS 4096
 typedef struct {
   int num_listening_sockets;
-  SOCKET FAR * listening_sockets;
-  struct addrinfo FAR * to_host_addrs;
+  SOCKET *listening_sockets;
+  struct addrinfo *to_host_addrs;
   HANDLE to_host_lookup_handle;
 
   int num_channels;
@@ -114,13 +114,13 @@
   WNDPROC old_accept_wnd_proc;
   int num_server_listening_specs;
   /* stored in sorted order */
-  FWDRequestSpec FAR * server_listening_specs;
+  FWDRequestSpec *server_listening_specs;
   int num_requests;
-  FWDRequest FAR * requests;
+  FWDRequest *requests;
   int num_channels;
-  FWDChannel FAR * channels;
-  struct sockaddr_storage FAR * local_host_IP_numbers;
-  struct _X11AuthData FAR * X11_auth_data;
+  FWDChannel *channels;
+  struct sockaddr_storage *local_host_IP_numbers;
+  struct _X11AuthData *X11_auth_data;
   BOOL in_interactive_mode;
 } FWDState;
 
@@ -129,25 +129,25 @@
    given request. Before the SSH session's prep phase, this returns true for
    all requests. After the SSH session's prep phase, this returns true only
    for requests that the server actually was told about during the prep phase. */
-BOOL FWD_can_server_listen_for(PTInstVar pvar, FWDRequestSpec FAR * spec);
+BOOL FWD_can_server_listen_for(PTInstVar pvar, FWDRequestSpec *spec);
 int FWD_get_num_request_specs(PTInstVar pvar);
-void FWD_get_request_specs(PTInstVar pvar, FWDRequestSpec FAR * specs, int num_specs);
-void FWD_set_request_specs(PTInstVar pvar, FWDRequestSpec FAR * specs, int num_specs);
-int FWD_compare_specs(void const FAR * void_spec1, void const FAR * void_spec2);
+void FWD_get_request_specs(PTInstVar pvar, FWDRequestSpec *specs, int num_specs);
+void FWD_set_request_specs(PTInstVar pvar, FWDRequestSpec *specs, int num_specs);
+int FWD_compare_specs(void const *void_spec1, void const *void_spec2);
 void FWD_prep_forwarding(PTInstVar pvar);
 void FWD_enter_interactive_mode(PTInstVar pvar);
 void FWD_open(PTInstVar pvar, uint32 remote_channel_num,
-              char FAR * local_hostname, int local_port,
-              char FAR * originator, int originator_len,
+              char *local_hostname, int local_port,
+              char *originator, int originator_len,
               int *chan_num);
 void FWD_X11_open(PTInstVar pvar, uint32 remote_channel_num,
-                  char FAR * originator, int originator_len,
+                  char *originator, int originator_len,
                   int *chan_num);
 void FWD_confirmed_open(PTInstVar pvar, uint32 local_channel_num,
   uint32 remote_channel_num);
 void FWD_failed_open(PTInstVar pvar, uint32 local_channel_num);
 void FWD_received_data(PTInstVar pvar, uint32 local_channel_num,
-  unsigned char FAR * data, int length);
+  unsigned char *data, int length);
 void FWD_channel_input_eof(PTInstVar pvar, uint32 local_channel_num);
 void FWD_channel_output_eof(PTInstVar pvar, uint32 local_channel_num);
 void FWD_end(PTInstVar pvar);

Modified: trunk/ttssh2/ttxssh/fwdui.c
===================================================================
--- trunk/ttssh2/ttxssh/fwdui.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/fwdui.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -42,11 +42,11 @@
 
 typedef struct {
 	int port;
-	char FAR *name;
+	char *name;
 } TCP_service_name;
 
 typedef struct {
-	FWDRequestSpec FAR *spec;
+	FWDRequestSpec *spec;
 	PTInstVar pvar;
 } FWDEditClosure;
 
@@ -370,15 +370,15 @@
 	{210, "z3950"}
 };
 
-static int compare_services(void const FAR * elem1, void const FAR * elem2)
+static int compare_services(void const *elem1, void const *elem2)
 {
-	TCP_service_name FAR *s1 = (TCP_service_name FAR *) elem1;
-	TCP_service_name FAR *s2 = (TCP_service_name FAR *) elem2;
+	TCP_service_name *s1 = (TCP_service_name *) elem1;
+	TCP_service_name *s2 = (TCP_service_name *) elem2;
 
 	return strcmp(s1->name, s2->name);
 }
 
-static void make_X_forwarding_spec(FWDRequestSpec FAR * spec, PTInstVar pvar)
+static void make_X_forwarding_spec(FWDRequestSpec *spec, PTInstVar pvar)
 {
 	spec->type = FWD_REMOTE_X11_TO_LOCAL;
 	spec->from_port = -1;
@@ -412,7 +412,7 @@
 		}
 	} else {
 		char lower_buf[32];
-		TCP_service_name FAR *result;
+		TCP_service_name *result;
 		TCP_service_name key;
 
 		for (i = 0; buf[i] != 0 && i < sizeof(lower_buf) - 1; i++) {
@@ -421,7 +421,7 @@
 		lower_buf[i] = 0;
 
 		key.name = lower_buf;
-		result = (TCP_service_name FAR *)
+		result = (TCP_service_name *)
 			bsearch(&key, service_DB, NUM_ELEM(service_DB),
 			        sizeof(service_DB[0]), compare_services);
 
@@ -561,10 +561,10 @@
 static void FWDUI_save_settings(PTInstVar pvar)
 {
 	int num_specs = FWD_get_num_request_specs(pvar);
-	FWDRequestSpec FAR *requests =
-		(FWDRequestSpec FAR *) malloc(sizeof(FWDRequestSpec) * num_specs);
+	FWDRequestSpec *requests =
+		(FWDRequestSpec *) malloc(sizeof(FWDRequestSpec) * num_specs);
 	int i;
-	char FAR *str = pvar->settings.DefaultForwarding;
+	char *str = pvar->settings.DefaultForwarding;
 	int str_remaining = sizeof(pvar->settings.DefaultForwarding) - 1;
 	char format[20];
 
@@ -582,7 +582,7 @@
 		}
 
 		if (str_remaining > 0) {
-			FWDRequestSpec FAR *spec = requests + i;
+			FWDRequestSpec *spec = requests + i;
 			int chars;
 
 			// IPv6 \x83A\x83h\x83\x8C\x83X\x82?\xE7 "[", "]" \x82\xF0\x95t\x89\xC1\x82\xB5\x82?\xB6\x8E\x9A\x97\xF1\x89\xBB
@@ -671,11 +671,11 @@
 
 void FWDUI_load_settings(PTInstVar pvar)
 {
-	char FAR *str = pvar->settings.DefaultForwarding;
+	char *str = pvar->settings.DefaultForwarding;
 
 	if (str[0] != 0) {
 		int i, ch, j;
-		FWDRequestSpec FAR *requests;
+		FWDRequestSpec *requests;
 
 		j = 1;
 		for (i = 0; (ch = str[i]) != 0; i++) {
@@ -685,7 +685,7 @@
 		}
 
 		requests =
-			(FWDRequestSpec FAR *) malloc(sizeof(FWDRequestSpec) * j);
+			(FWDRequestSpec *) malloc(sizeof(FWDRequestSpec) * j);
 
 		j = 0;
 		if (parse_request(requests, str, pvar)) {
@@ -729,8 +729,8 @@
 {
 }
 
-static void set_verbose_port(char FAR * buf, int bufsize, int port,
-                             char FAR * name)
+static void set_verbose_port(char *buf, int bufsize, int port,
+                             char *name)
 {
 	if (*name >= '0' && *name <= '9') {
 		strncpy_s(buf, bufsize, name, _TRUNCATE);
@@ -741,7 +741,7 @@
 	buf[bufsize - 1] = 0;
 }
 
-static void get_spec_string(FWDRequestSpec FAR * spec, char FAR * buf,
+static void get_spec_string(FWDRequestSpec *spec, char *buf,
                             int bufsize, PTInstVar pvar)
 {
 	char verbose_from_port[64];
@@ -790,7 +790,7 @@
 	update_listbox_selection(dlg);
 }
 
-static int add_spec_to_listbox(HWND dlg, FWDRequestSpec FAR * spec, PTInstVar pvar)
+static int add_spec_to_listbox(HWND dlg, FWDRequestSpec *spec, PTInstVar pvar)
 {
 	char buf[1024];
 	HWND listbox = GetDlgItem(dlg, IDC_SSHFWDLIST);
@@ -801,7 +801,7 @@
 	index = SendMessage(listbox, LB_ADDSTRING, 0, (LPARAM) buf);
 
 	if (index >= 0) {
-		FWDRequestSpec FAR *listbox_spec = malloc(sizeof(FWDRequestSpec));
+		FWDRequestSpec *listbox_spec = malloc(sizeof(FWDRequestSpec));
 
 		*listbox_spec = *spec;
 		if (SendMessage
@@ -817,8 +817,8 @@
 static void init_fwd_dlg(PTInstVar pvar, HWND dlg)
 {
 	int num_specs = FWD_get_num_request_specs(pvar);
-	FWDRequestSpec FAR *requests =
-		(FWDRequestSpec FAR *) malloc(sizeof(FWDRequestSpec) * num_specs);
+	FWDRequestSpec *requests =
+		(FWDRequestSpec *) malloc(sizeof(FWDRequestSpec) * num_specs);
 	int i;
 	char uimsg[MAX_UIMSG];
 
@@ -867,7 +867,7 @@
 
 static void free_listbox_spec(HWND listbox, int selection)
 {
-	FWDRequestSpec FAR *spec = (FWDRequestSpec FAR *)
+	FWDRequestSpec *spec = (FWDRequestSpec *)
 		SendMessage(listbox, LB_GETITEMDATA, selection, 0);
 
 	if (spec != NULL) {
@@ -892,14 +892,14 @@
 	int num_items = SendMessage(listbox, LB_GETCOUNT, 0, 0);
 	BOOL X_enabled = IsDlgButtonChecked(dlg, IDC_SSHFWDX11);
 	int num_specs = X_enabled ? 1 : 0;
-	FWDRequestSpec FAR *specs =
-		(FWDRequestSpec FAR *) malloc(sizeof(FWDRequestSpec) *
+	FWDRequestSpec *specs =
+		(FWDRequestSpec *) malloc(sizeof(FWDRequestSpec) *
 		                              (num_specs + num_items));
 	int i;
 	int num_unspecified_forwardings = 0;
 
 	for (i = 0; i < num_items; i++) {
-		FWDRequestSpec FAR *spec = (FWDRequestSpec FAR *)
+		FWDRequestSpec *spec = (FWDRequestSpec *)
 			SendMessage(listbox, LB_GETITEMDATA, i, 0);
 
 		if (spec != NULL) {
@@ -1027,7 +1027,7 @@
 	shift_over_input(dlg, type, IDC_SSHRTLTOPORT, IDC_SSHLTRTOPORT);
 }
 
-static void setup_edit_controls(HWND dlg, FWDRequestSpec FAR * spec,
+static void setup_edit_controls(HWND dlg, FWDRequestSpec *spec,
                                 WORD radio_item,
                                 WORD from_port_item, WORD listen_address_item,
                                 WORD to_host_item, WORD to_port_item)
@@ -1046,7 +1046,7 @@
 	set_dir_options_status(dlg);
 }
 
-static void init_fwd_edit_dlg(PTInstVar pvar, FWDRequestSpec FAR * spec, HWND dlg)
+static void init_fwd_edit_dlg(PTInstVar pvar, FWDRequestSpec *spec, HWND dlg)
 {
 	char uimsg[MAX_UIMSG];
 
@@ -1107,7 +1107,7 @@
 }
 
 static void grab_control_text(HWND dlg, int type, WORD rtl_item,
-                              WORD ltr_item, char FAR * buf, int bufsize)
+                              WORD ltr_item, char *buf, int bufsize)
 {
 	GetDlgItemText(dlg, type == FWD_REMOTE_TO_LOCAL ? rtl_item : ltr_item,
 	               buf, bufsize);
@@ -1114,7 +1114,7 @@
 	buf[bufsize - 1] = 0;
 }
 
-static BOOL end_fwd_edit_dlg(PTInstVar pvar, FWDRequestSpec FAR * spec,
+static BOOL end_fwd_edit_dlg(PTInstVar pvar, FWDRequestSpec *spec,
                              HWND dlg)
 {
 	FWDRequestSpec new_spec;
@@ -1192,7 +1192,7 @@
 static BOOL CALLBACK fwd_edit_dlg_proc(HWND dlg, UINT msg, WPARAM wParam,
                                        LPARAM lParam)
 {
-	FWDEditClosure FAR *closure;
+	FWDEditClosure *closure;
 	PTInstVar pvar;
 	LOGFONT logfont;
 	HFONT font;
@@ -1200,7 +1200,7 @@
 
 	switch (msg) {
 	case WM_INITDIALOG:
-		closure = (FWDEditClosure FAR *) lParam;
+		closure = (FWDEditClosure *) lParam;
 		SetWindowLong(dlg, DWL_USER, lParam);
 
 		pvar = closure->pvar;
@@ -1233,7 +1233,7 @@
 		return FALSE;			/* because we set the focus */
 
 	case WM_COMMAND:
-		closure = (FWDEditClosure FAR *) GetWindowLong(dlg, DWL_USER);
+		closure = (FWDEditClosure *) GetWindowLong(dlg, DWL_USER);
 
 		switch (LOWORD(wParam)) {
 		case IDOK:
@@ -1307,7 +1307,7 @@
 	int cursel = SendMessage(listbox, LB_GETCURSEL, 0, 0);
 
 	if (cursel >= 0) {
-		FWDRequestSpec FAR *spec = (FWDRequestSpec FAR *)
+		FWDRequestSpec *spec = (FWDRequestSpec *)
 			SendMessage(listbox, LB_GETITEMDATA, cursel, 0);
 
 		if (spec != NULL) {

Modified: trunk/ttssh2/ttxssh/hosts.c
===================================================================
--- trunk/ttssh2/ttxssh/hosts.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/hosts.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -59,12 +59,12 @@
 static char base64[] ="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
 
-static char FAR *FAR * parse_multi_path(char FAR * buf)
+static char **parse_multi_path(char *buf)
 {
 	int i;
 	int ch;
 	int num_paths = 1;
-	char FAR *FAR * result;
+	char ** result;
 	int last_path_index;
 
 	for (i = 0; (ch = buf[i]) != 0; i++) {
@@ -74,7 +74,7 @@
 	}
 
 	result =
-		(char FAR * FAR *) malloc(sizeof(char FAR *) * (num_paths + 1));
+		(char **) malloc(sizeof(char *) * (num_paths + 1));
 
 	last_path_index = 0;
 	num_paths = 0;
@@ -112,7 +112,7 @@
 //
 // known_hosts\x83t\x83@\x83C\x83\x8B\x82?\xE0\x97e\x82\xF0\x82\xB7\x82?\xC4 pvar->hosts_state.file_data \x82???\x9E\x82\xDE
 //
-static int begin_read_file(PTInstVar pvar, char FAR * name,
+static int begin_read_file(PTInstVar pvar, char *name,
                            int suppress_errors)
 {
 	int fd;
@@ -196,7 +196,7 @@
 }
 
 // MIME64\x82?\xB6\x8E\x9A\x97\xF1\x82\xF0\x83X\x83L\x83b\x83v\x82\xB7\x82\xE9
-static int eat_base64(char FAR * data)
+static int eat_base64(char *data)
 {
 	int index = 0;
 	int ch;
@@ -214,7 +214,7 @@
 	return index;
 }
 
-static int eat_spaces(char FAR * data)
+static int eat_spaces(char *data)
 {
 	int index = 0;
 	int ch;
@@ -225,7 +225,7 @@
 	return index;
 }
 
-static int eat_digits(char FAR * data)
+static int eat_digits(char *data)
 {
 	int index = 0;
 	int ch;
@@ -236,7 +236,7 @@
 	return index;
 }
 
-static int eat_to_end_of_line(char FAR * data)
+static int eat_to_end_of_line(char *data)
 {
 	int index = 0;
 	int ch;
@@ -252,7 +252,7 @@
 	return index;
 }
 
-static int eat_to_end_of_pattern(char FAR * data)
+static int eat_to_end_of_pattern(char *data)
 {
 	int index = 0;
 	int ch;
@@ -301,7 +301,7 @@
 }
 
 
-static char FAR *parse_bignum(char FAR * data)
+static char *parse_bignum(char *data)
 {
 	uint32 digits = 0;
 	BIGNUM *num = BN_new();
@@ -308,7 +308,7 @@
 	BIGNUM *billion = BN_new();
 	BIGNUM *digits_num = BN_new();
 	BN_CTX *ctx = BN_CTX_new();
-	char FAR *result;
+	char *result;
 	int ch;
 	int leftover_digits = 1;
 
@@ -335,7 +335,7 @@
 	BN_mul(num, num, billion, ctx);
 	BN_add(num, num, digits_num);
 
-	result = (char FAR *) malloc(2 + BN_num_bytes(num));
+	result = (char *) malloc(2 + BN_num_bytes(num));
 	set_ushort16_MSBfirst(result, BN_num_bits(num));
 	BN_bn2bin(num, result + 2);
 
@@ -350,8 +350,8 @@
 //
 // known_hosts\x83t\x83@\x83C\x83\x8B\x82?\xE0\x97e\x82\xF0\x89\xF0\x90?\xB5\x81A\x8Ew\x92?\x82\xBD\x83z\x83X\x83g\x82?\xF6\x8AJ\x8C\xAE\x82\xF0\x92T\x82\xB7\x81B
 //
-static int check_host_key(PTInstVar pvar, char FAR * hostname,
-                          unsigned short tcpport, char FAR * data,
+static int check_host_key(PTInstVar pvar, char *hostname,
+                          unsigned short tcpport, char *data,
                           Key *key)
 {
 	int index = eat_spaces(data);
@@ -504,7 +504,7 @@
 //     1: 1\x8Ds\x82\xBE\x82\xAF\x92T\x82\xB5\x82Ė?\xE9
 //
 static int read_host_key(PTInstVar pvar,
-                         char FAR * hostname, unsigned short tcpport,
+                         char *hostname, unsigned short tcpport,
                          int suppress_errors, int return_always,
                          Key *key)
 {
@@ -541,7 +541,7 @@
 	do {
 		if (pvar->hosts_state.file_data == NULL
 		 || pvar->hosts_state.file_data[pvar->hosts_state.file_data_index] == 0) {
-			char FAR *filename;
+			char *filename;
 			int keep_going = 1;
 
 			if (pvar->hosts_state.file_data != NULL) {
@@ -593,7 +593,7 @@
 }
 
 // \x83T\x81[\x83o\x82??\xB1\x82\xB7\x82\xE9\x91O\x82?Aknown_hosts\x83t\x83@\x83C\x83\x8B\x82\xA9\x82\xE7\x83z\x83X\x83g\x8C\xF6\x8AJ\x8C\xAE\x82\xF0\x90\xE6\x93??\xB5\x82Ă\xA8\x82\xAD\x81B
-void HOSTS_prefetch_host_key(PTInstVar pvar, char FAR * hostname, unsigned short tcpport)
+void HOSTS_prefetch_host_key(PTInstVar pvar, char *hostname, unsigned short tcpport)
 {
 	Key key; // known_hosts\x82?o\x98^\x82\xB3\x82\xEA\x82Ă\xA2\x82錮
 
@@ -621,8 +621,8 @@
 // return:
 //   *keyptr != NULL  \x8E擾\x90\xAC\x8C\xF7
 //
-static int parse_hostkey_file(PTInstVar pvar, char FAR * hostname,
-	unsigned short tcpport, char FAR * data, Key **keyptr)
+static int parse_hostkey_file(PTInstVar pvar, char *hostname,
+	unsigned short tcpport, char *data, Key **keyptr)
 {
 	int index = eat_spaces(data);
 	int matched = 0;
@@ -778,7 +778,7 @@
 	int success = 0;
 	int suppress_errors = 1;
 	unsigned short tcpport;
-	char FAR *filename;
+	char *filename;
 	char *hostname;
 	Key *key;
 
@@ -831,8 +831,8 @@
 }
 
 
-static BOOL equal_mp_ints(unsigned char FAR * num1,
-                          unsigned char FAR * num2)
+static BOOL equal_mp_ints(unsigned char *num1,
+                          unsigned char *num2)
 {
 	if (num1 == NULL || num2 == NULL) {
 		return FALSE;
@@ -857,8 +857,8 @@
 int HOSTS_compare_public_key(Key *src, Key *key)
 {
 	int bits;
-	unsigned char FAR * exp;
-	unsigned char FAR * mod;
+	unsigned char *exp;
+	unsigned char *mod;
 	const EC_GROUP *group;
 	const EC_POINT *pa, *pb;
 	Key *a, *b;
@@ -984,7 +984,7 @@
 	hosts_dlg_set_fingerprint(pvar, dlg, SSH_DIGEST_SHA256);
 }
 
-static int print_mp_int(char FAR * buf, unsigned char FAR * mp)
+static int print_mp_int(char *buf, unsigned char *mp)
 {
 	int i = 0, j, k;
 	BIGNUM *num = BN_new();
@@ -1011,7 +1011,7 @@
 //
 // known_hosts \x83t\x83@\x83C\x83\x8B\x82??\xB6\x82\xB7\x82\xE9\x83G\x83\x93\x83g\x83\x8A\x82\xF0\x8D?\x82\xB7\x82\xE9\x81B
 //
-static char FAR *format_host_key(PTInstVar pvar)
+static char *format_host_key(PTInstVar pvar)
 {
 	int host_len = strlen(pvar->hosts_state.prefetched_hostname);
 	char *result = NULL;
@@ -1024,7 +1024,7 @@
 		int result_len = host_len + 50 + 8 +
 		                 get_ushort16_MSBfirst(pvar->hosts_state.hostkey.exp) / 3 +
 		                 get_ushort16_MSBfirst(pvar->hosts_state.hostkey.mod) / 3;
-		result = (char FAR *) malloc(result_len);
+		result = (char *) malloc(result_len);
 
 		if (pvar->ssh_state.tcpport == 22) {
 			strncpy_s(result, result_len, pvar->hosts_state.prefetched_hostname, _TRUNCATE);
@@ -1107,7 +1107,7 @@
 	return result;
 }
 
-static char FAR *format_specified_host_key(Key *key, char *hostname, unsigned short tcpport)
+static char *format_specified_host_key(Key *key, char *hostname, unsigned short tcpport)
 {
 	int host_len = strlen(hostname);
 	char *result = NULL;
@@ -1120,7 +1120,7 @@
 		int result_len = host_len + 50 + 8 +
 			get_ushort16_MSBfirst(key->exp) / 3 +
 			get_ushort16_MSBfirst(key->mod) / 3;
-		result = (char FAR *) malloc(result_len);
+		result = (char *) malloc(result_len);
 
 		if (tcpport == 22) {
 			strncpy_s(result, result_len, hostname, _TRUNCATE);
@@ -1206,7 +1206,7 @@
 
 static void add_host_key(PTInstVar pvar)
 {
-	char FAR *name = NULL;
+	char *name = NULL;
 
 	if ( pvar->hosts_state.file_names != NULL)
 		name = pvar->hosts_state.file_names[0];
@@ -1217,7 +1217,7 @@
 		                  "Restart Tera Term and specify a read/write known-hosts file in the TTSSH Setup dialog box.");
 		notify_nonfatal_error(pvar, pvar->ts->UIMsg);
 	} else {
-		char FAR *keydata = format_host_key(pvar);
+		char *keydata = format_host_key(pvar);
 		int length = strlen(keydata);
 		int fd;
 		int amount_written;
@@ -1259,7 +1259,7 @@
 // \x8Ew\x92?\x82\xBD\x83L\x81[\x82\xF0 known_hosts \x82??\xC1\x82\xB7\x82\xE9\x81B
 void HOSTS_add_host_key(PTInstVar pvar, Key *key)
 {
-	char FAR *name = NULL;
+	char *name = NULL;
 	char *hostname;
 	unsigned short tcpport;
 
@@ -1276,7 +1276,7 @@
 		notify_nonfatal_error(pvar, pvar->ts->UIMsg);
 	}
 	else {
-		char FAR *keydata = format_specified_host_key(key, hostname, tcpport);
+		char *keydata = format_specified_host_key(key, hostname, tcpport);
 		int length = strlen(keydata);
 		int fd;
 		int amount_written;
@@ -1322,7 +1322,7 @@
 //
 static void delete_different_key(PTInstVar pvar)
 {
-	char FAR *name = pvar->hosts_state.file_names[0];
+	char *name = pvar->hosts_state.file_names[0];
 
 	if (name == NULL || name[0] == 0) {
 		UTIL_get_lang_msg("MSG_HOSTS_FILE_UNSPECIFY_ERROR", pvar,
@@ -1371,7 +1371,7 @@
 			int host_index = 0;
 			int matched = 0;
 			int keybits = 0;
-			char FAR *data;
+			char *data;
 			int do_write = 0;
 			length = amount_written = 0;
 
@@ -1506,7 +1506,7 @@
 
 void HOSTS_delete_all_hostkeys(PTInstVar pvar)
 {
-	char FAR *name = pvar->hosts_state.file_names[0];
+	char *name = pvar->hosts_state.file_names[0];
 	char *hostname;
 	unsigned short tcpport;
 
@@ -1561,7 +1561,7 @@
 			int host_index = 0;
 			int matched = 0;
 			int keybits = 0;
-			char FAR *data;
+			char *data;
 			int do_write = 0;
 			length = amount_written = 0;
 
@@ -2229,7 +2229,7 @@
 //
 // SSH2\x91Ή\x9E\x82\xF0\x92?\xC1 (2006.3.24 yutaka)
 //
-BOOL HOSTS_check_host_key(PTInstVar pvar, char FAR * hostname, unsigned short tcpport, Key *key)
+BOOL HOSTS_check_host_key(PTInstVar pvar, char *hostname, unsigned short tcpport, Key *key)
 {
 	int found_different_key = 0, found_different_type_key = 0;
 	Key key2; // known_hosts\x82?o\x98^\x82\xB3\x82\xEA\x82Ă\xA2\x82錮

Modified: trunk/ttssh2/ttxssh/hosts.h
===================================================================
--- trunk/ttssh2/ttxssh/hosts.h	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/hosts.h	2017-06-13 10:30:12 UTC (rev 6801)
@@ -35,13 +35,13 @@
 #define __HOSTS_H
 
 typedef struct {
-  char FAR * prefetched_hostname;
+  char *prefetched_hostname;
 
 #if 0
   int key_bits;
   /* The key exponent and modulus, in SSH mp_int format */
-  unsigned char FAR * key_exp;
-  unsigned char FAR * key_mod;
+  unsigned char *key_exp;
+  unsigned char *key_mod;
 #else
   // \x83z\x83X\x83g\x83L\x81[(SSH1,SSH2)\x82\xCD Key \x8D\\x91\xA2\x91??W\x96?\xE9
   Key hostkey;
@@ -48,9 +48,9 @@
 #endif
 
   int file_num;
-  char FAR * FAR * file_names;
+  char **file_names;
   int file_data_index;
-  char FAR * file_data;  // known_hosts\x83t\x83@\x83C\x83\x8B\x82?\xE0\x97e\x82\xAA\x82\xB7\x82?Ċi\x94[\x82\xB3\x82\xEA\x82\xE9
+  char *file_data;  // known_hosts\x83t\x83@\x83C\x83\x8B\x82?\xE0\x97e\x82\xAA\x82\xB7\x82?Ċi\x94[\x82\xB3\x82\xEA\x82\xE9
 
   HWND hosts_dialog;
 } HOSTSState;
@@ -59,12 +59,12 @@
 
 void HOSTS_init(PTInstVar pvar);
 void HOSTS_open(PTInstVar pvar);
-void HOSTS_prefetch_host_key(PTInstVar pvar, char FAR * hostname, unsigned short tcpport);
+void HOSTS_prefetch_host_key(PTInstVar pvar, char *hostname, unsigned short tcpport);
 #if 0
-BOOL HOSTS_check_host_key(PTInstVar pvar, char FAR * hostname,
-                         int bits, unsigned char FAR * exp, unsigned char FAR * mod);
+BOOL HOSTS_check_host_key(PTInstVar pvar, char *hostname,
+                         int bits, unsigned char *exp, unsigned char *mod);
 #else
-BOOL HOSTS_check_host_key(PTInstVar pvar, char FAR * hostname, unsigned short tcpport, Key *key);
+BOOL HOSTS_check_host_key(PTInstVar pvar, char *hostname, unsigned short tcpport, Key *key);
 #endif
 void HOSTS_do_unknown_host_dialog(HWND wnd, PTInstVar pvar);
 void HOSTS_do_different_key_dialog(HWND wnd, PTInstVar pvar);

Modified: trunk/ttssh2/ttxssh/key.c
===================================================================
--- trunk/ttssh2/ttxssh/key.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/key.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -478,10 +478,10 @@
 	return (ret);   // success
 }
 
-static char FAR *copy_mp_int(char FAR * num)
+static char *copy_mp_int(char *num)
 {
 	int len = (get_ushort16_MSBfirst(num) + 7) / 8 + 2;
-	char FAR *result = (char FAR *) malloc(len);
+	char *result = (char *) malloc(len);
 
 	if (result != NULL) {
 		memcpy(result, num, len);
@@ -2081,7 +2081,7 @@
 				strncat_s(buf, buf_len, "\r\n", _TRUNCATE);
 			}
 		}
-		SendDlgItemMessage(dlg, IDC_ADDKEY_EDIT, WM_SETTEXT, 0, (LPARAM)(char FAR *)buf);
+		SendDlgItemMessage(dlg, IDC_ADDKEY_EDIT, WM_SETTEXT, 0, (LPARAM)(char *)buf);
 		free(buf);
 	}
 
@@ -2088,7 +2088,7 @@
 	if (ctx->nold > 0) {
 		buf_len = 100 * ctx->nold;
 		buf = calloc(100, ctx->nold);
-		SendDlgItemMessage(dlg, IDC_REMOVEKEY_EDIT, WM_SETTEXT, 0, (LPARAM)(char FAR *)"");
+		SendDlgItemMessage(dlg, IDC_REMOVEKEY_EDIT, WM_SETTEXT, 0, (LPARAM)(char *)"");
 		for (i = 0; i < ctx->nold; i++) {
 			switch (dgst_alg) {
 			case SSH_DIGEST_MD5:
@@ -2109,7 +2109,7 @@
 				strncat_s(buf, buf_len, "\r\n", _TRUNCATE);
 			}
 		}
-		SendDlgItemMessage(dlg, IDC_REMOVEKEY_EDIT, WM_SETTEXT, 0, (LPARAM)(char FAR *)buf);
+		SendDlgItemMessage(dlg, IDC_REMOVEKEY_EDIT, WM_SETTEXT, 0, (LPARAM)(char *)buf);
 		free(buf);
 	}
 }

Modified: trunk/ttssh2/ttxssh/keyfiles.c
===================================================================
--- trunk/ttssh2/ttxssh/keyfiles.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/keyfiles.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -51,7 +51,7 @@
 
 static char ID_string[] = "SSH PRIVATE KEY FILE FORMAT 1.1\n";
 
-static BIGNUM FAR *get_bignum(unsigned char FAR * bytes)
+static BIGNUM *get_bignum(unsigned char *bytes)
 {
 	int bits = get_ushort16_MSBfirst(bytes);
 
@@ -63,7 +63,7 @@
    It's needed to work around "issues" with LIBEAY/RSAREF.
    If this function returns 0, then something went wrong and the
    key must be discarded. */
-static BOOL normalize_key(RSA FAR * key)
+static BOOL normalize_key(RSA *key)
 {
 	BOOL OK = FALSE;
 	BIGNUM *r = BN_new();
@@ -107,7 +107,7 @@
 	unsigned char *keyfile_data;
 	unsigned int index;
 	int cipher;
-	RSA FAR *key;
+	RSA *key;
 	unsigned int E_index, N_index, D_index, U_index, P_index, Q_index = 0;
 
 	*invalid_passphrase = FALSE;

Modified: trunk/ttssh2/ttxssh/pkt.c
===================================================================
--- trunk/ttssh2/ttxssh/pkt.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/pkt.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -144,7 +144,7 @@
    -- reads data from the sshd and feeds the SSH protocol packets to ssh.c
    -- copies any available decrypted session data into the application buffer
 */
-int PKT_recv(PTInstVar pvar, char FAR * buf, int buflen)
+int PKT_recv(PTInstVar pvar, char *buf, int buflen)
 {
 	int amount_in_buf = 0;
 	BOOL connection_closed = FALSE;
@@ -197,7 +197,7 @@
 		} else if (pvar->pkt_state.seen_server_ID
 		           && pvar->pkt_state.datalen >=
 		           (unsigned int) SSH_get_min_packet_size(pvar)) {
-			char FAR *data =
+			char *data =
 				pvar->pkt_state.buf + pvar->pkt_state.datastart;
 			uint32 padding;
 			uint32 pktsize;

Modified: trunk/ttssh2/ttxssh/pkt.h
===================================================================
--- trunk/ttssh2/ttxssh/pkt.h	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/pkt.h	2017-06-13 10:30:12 UTC (rev 6801)
@@ -39,7 +39,7 @@
 #define PACKET_MAX_SIZE (4 * 1024 * 1024)
 
 typedef struct {
-  char FAR * buf;
+  char *buf;
   unsigned long buflen;
   unsigned long datastart;
   unsigned long datalen;
@@ -49,7 +49,7 @@
 } PKTState;
 
 void PKT_init(PTInstVar pvar);
-int PKT_recv(PTInstVar pvar, char FAR * buf, int buflen);
+int PKT_recv(PTInstVar pvar, char *buf, int buflen);
 void PKT_end(PTInstVar pvar);
 
 #endif

Modified: trunk/ttssh2/ttxssh/sftp.c
===================================================================
--- trunk/ttssh2/ttxssh/sftp.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/sftp.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -832,7 +832,7 @@
 			if (buf[0] != '\0') {
 				SendDlgItemMessage(GetParent(hwnd), IDC_SFTP_CONSOLE, EM_REPLACESEL, 0, (LPARAM) buf);
 				SendDlgItemMessage(GetParent(hwnd), IDC_SFTP_CONSOLE, EM_REPLACESEL, 0,
-								   (LPARAM) (char FAR *) "\r\n");
+								   (LPARAM) (char *) "\r\n");
 				goto cmd_parsed;
 			}
 		}
@@ -1117,7 +1117,7 @@
 		case WM_USER_CONSOLE:
 			SendDlgItemMessage(hDlgWnd, IDC_SFTP_CONSOLE, EM_REPLACESEL, 0, (LPARAM) lp);
 			SendDlgItemMessage(hDlgWnd, IDC_SFTP_CONSOLE, EM_REPLACESEL, 0,
-							   (LPARAM) (char FAR *) "\r\n");
+							   (LPARAM) (char *) "\r\n");
 			return TRUE;
 
 #if 0

Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/ssh.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -739,7 +739,7 @@
    'len' is the length of the
    payload + padding (+ length of CRC for SSHv1). 'padding' is the length
    of the padding alone. */
-static int prep_packet(PTInstVar pvar, char FAR * data, int len,
+static int prep_packet(PTInstVar pvar, char *data, int len,
 					   int padding)
 {
 	pvar->ssh_state.payload = data + 4;
@@ -857,9 +857,9 @@
    or for the packet type byte).
    Returns a pointer to the payload data area, a region of length 'len',
    to be filled by the caller. */
-unsigned char FAR *begin_send_packet(PTInstVar pvar, int type, int len)
+unsigned char *begin_send_packet(PTInstVar pvar, int type, int len)
 {
-	unsigned char FAR *buf;
+	unsigned char *buf;
 
 	pvar->ssh_state.outgoing_packet_len = len + 1;
 
@@ -890,7 +890,7 @@
 // \x82\xB1\x82?\xAA\x82\xA0\x82\xE9\x82?ŁA\x82\xBB\x82??\x82?G\x83\x89\x81[\x82?\xB5\x82?\xA2\x81B
 // \x82\xB1\x82\xEA\x82?\xE6\x82\xE8\x81ATCP\x83R\x83l\x83N\x83V\x83\x87\x83\x93\x90?f\x82??\x8Fo\x82\xF0\x96h\x82\xAE\x81B
 // (2006.12.9 yutaka)
-static int retry_send_packet(PTInstVar pvar, char FAR * data, int len)
+static int retry_send_packet(PTInstVar pvar, char *data, int len)
 {
 	int n;
 	int err;
@@ -917,7 +917,7 @@
 	return 0; // success
 }
 
-static BOOL send_packet_blocking(PTInstVar pvar, char FAR * data, int len)
+static BOOL send_packet_blocking(PTInstVar pvar, char *data, int len)
 {
 	// \x83p\x83P\x83b\x83g\x91\x97\x90M\x8C\xE3\x82?o\x83b\x83t\x83@\x82\xF0\x8Eg\x82\xA2\x82??\x82\xBD\x82?A\x83u\x83\x8D\x83b\x83L\x83\x93\x83O\x82ő\x97\x90M\x82\xB5\x82Ă\xB5\x82?\xA4\x95K\x97v\x82\xAA\x82\xA0\x82\xE9\x81B
 	// \x83m\x83\x93\x83u\x83\x8D\x83b\x83L\x83\x93\x83O\x82ő\x97\x90M\x82\xB5\x82\xC4WSAEWOULDBLOCK\x82\xAA\x95?\xC1\x82Ă\xAB\x82\xBD\x8F?\x81A\x82\xBB\x82?o\x83b\x83t\x83@\x82?\x97\x90M\x8A\xAE\x97\xB9\x82\xB7\x82\xE9
@@ -986,7 +986,7 @@
 void finish_send_packet_special(PTInstVar pvar, int skip_compress)
 {
 	unsigned int len = pvar->ssh_state.outgoing_packet_len;
-	unsigned char FAR *data;
+	unsigned char *data;
 	unsigned int data_length;
 	buffer_t *msg = NULL; // for SSH2 packet compression
 
@@ -1151,18 +1151,18 @@
    handlers fires, if it returns FALSE, then all handlers in the set are
    removed from their queues. */
 static void enque_handlers(PTInstVar pvar, int num_msgs,
-                           const int FAR * messages,
-                           const SSHPacketHandler FAR * handlers)
+                           const int *messages,
+                           const SSHPacketHandler *handlers)
 {
-	SSHPacketHandlerItem FAR *first_item;
-	SSHPacketHandlerItem FAR *last_item = NULL;
+	SSHPacketHandlerItem *first_item;
+	SSHPacketHandlerItem *last_item = NULL;
 	int i;
 
 	for (i = 0; i < num_msgs; i++) {
-		SSHPacketHandlerItem FAR *item =
-			(SSHPacketHandlerItem FAR *)
+		SSHPacketHandlerItem *item =
+			(SSHPacketHandlerItem *)
 			malloc(sizeof(SSHPacketHandlerItem));
-		SSHPacketHandlerItem FAR *cur_item =
+		SSHPacketHandlerItem *cur_item =
 			pvar->ssh_state.packet_handlers[messages[i]];
 
 		item->handler = handlers[i];
@@ -1195,7 +1195,7 @@
 
 static SSHPacketHandler get_handler(PTInstVar pvar, int message)
 {
-	SSHPacketHandlerItem FAR *cur_item =
+	SSHPacketHandlerItem *cur_item =
 		pvar->ssh_state.packet_handlers[message];
 
 	if (cur_item == NULL) {
@@ -1208,18 +1208,18 @@
 /* Called only by SSH_handle_packet */
 static void deque_handlers(PTInstVar pvar, int message)
 {
-	SSHPacketHandlerItem FAR *cur_item =
+	SSHPacketHandlerItem *cur_item =
 		pvar->ssh_state.packet_handlers[message];
-	SSHPacketHandlerItem FAR *first_item_in_set = cur_item;
+	SSHPacketHandlerItem *first_item_in_set = cur_item;
 
 	if (cur_item == NULL)
 		return;
 
 	do {
-		SSHPacketHandlerItem FAR *next_in_set = cur_item->next_in_set;
+		SSHPacketHandlerItem *next_in_set = cur_item->next_in_set;
 
 		if (cur_item->active_for_message >= 0) {
-			SSHPacketHandlerItem FAR *replacement =
+			SSHPacketHandlerItem *replacement =
 				cur_item->next_for_message;
 
 			if (replacement == cur_item) {
@@ -1247,7 +1247,7 @@
 	enque_handlers(pvar, 1, &message, &handler);
 }
 
-static void chop_newlines(char FAR * buf)
+static void chop_newlines(char *buf)
 {
 	int len = strlen(buf);
 
@@ -1365,7 +1365,7 @@
 static BOOL handle_debug(PTInstVar pvar)
 {
 	BOOL always_display;
-	char FAR *description;
+	char *description;
 	int description_len;
 	char buf[2048];
 
@@ -1411,10 +1411,10 @@
 static BOOL handle_disconnect(PTInstVar pvar)
 {
 	int reason_code;
-	char FAR *description;
+	char *description;
 	int description_len;
 	char buf[2048];
-	char FAR *explanation = "";
+	char *explanation = "";
 	char uimsg[MAX_UIMSG];
 
 	if (SSHv1(pvar)) {
@@ -1527,7 +1527,7 @@
 	int host_key_public_modulus_len;
 	int protocol_flags_pos;
 	int supported_ciphers;
-	char FAR *inmsg;
+	char *inmsg;
 	Key hostkey;
 	int supported_types;
 
@@ -1609,9 +1609,9 @@
 The ID must have already been found to start with "SSH-". It must
 be null-terminated.
 */
-static BOOL parse_protocol_ID(PTInstVar pvar, char FAR * ID)
+static BOOL parse_protocol_ID(PTInstVar pvar, char *ID)
 {
-	char FAR *str;
+	char *str;
 
 	for (str = ID + 4; *str >= '0' && *str <= '9'; str++) {
 	}
@@ -1743,7 +1743,7 @@
 	}
 }
 
-BOOL SSH_handle_server_ID(PTInstVar pvar, char FAR * ID, int ID_len)
+BOOL SSH_handle_server_ID(PTInstVar pvar, char *ID, int ID_len)
 {
 	static char prefix[64];
 	int negotiate;
@@ -1757,11 +1757,11 @@
 		return FALSE;
 	} else {
 		int buf_len;
-		char FAR *buf;
+		char *buf;
 
 		strncpy_s(prefix, sizeof(prefix), "Received server identification string: ", _TRUNCATE);
 		buf_len = strlen(prefix) + ID_len + 1;
-		buf = (char FAR *) malloc(buf_len);
+		buf = (char *) malloc(buf_len);
 		strncpy_s(buf, buf_len, prefix, _TRUNCATE);
 		strncat_s(buf, buf_len, ID, _TRUNCATE);
 		chop_newlines(buf);
@@ -1845,7 +1845,7 @@
 
 					strncpy_s(prefix, sizeof(prefix), "Sent client identification string: ", _TRUNCATE);
 					buf_len = strlen(prefix) + strlen(pvar->client_version_string) + 1;
-					buf = (char FAR *) malloc(buf_len);
+					buf = (char *) malloc(buf_len);
 					strncpy_s(buf, buf_len, prefix, _TRUNCATE);
 					strncat_s(buf, buf_len, pvar->client_version_string, _TRUNCATE);
 					notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
@@ -2109,7 +2109,7 @@
 }
 
 
-void SSH_handle_packet(PTInstVar pvar, char FAR * data, int len,
+void SSH_handle_packet(PTInstVar pvar, char *data, int len,
 					   int padding)
 {
 	unsigned char message = prep_packet(pvar, data, len, padding);
@@ -2144,7 +2144,7 @@
 					pvar->ts->UIMsg, message, handle_message_stage);
 				notify_fatal_error(pvar, buf, TRUE);
 			} else {
-				unsigned char FAR *outmsg =
+				unsigned char *outmsg =
 					begin_send_packet(pvar, SSH2_MSG_UNIMPLEMENTED, 4);
 
 				set_uint32(outmsg,
@@ -2191,7 +2191,7 @@
 static void prep_pty(PTInstVar pvar)
 {
 	int len = strlen(pvar->ts->TermType);
-	unsigned char FAR *outmsg =
+	unsigned char *outmsg =
 		begin_send_packet(pvar, SSH_CMSG_REQUEST_PTY,
 		                  4 + len + 16 + sizeof(ssh_ttymodes));
 	static const int msgs[] = { SSH_SMSG_SUCCESS, SSH_SMSG_FAILURE };
@@ -2354,7 +2354,7 @@
 			static const SSHPacketHandler handlers[]
 			= { handle_enable_compression, handle_disable_compression };
 
-			unsigned char FAR *outmsg =
+			unsigned char *outmsg =
 				begin_send_packet(pvar, SSH_CMSG_REQUEST_COMPRESSION, 4);
 
 			set_uint32(outmsg, pvar->session_settings.CompressionLevel);
@@ -2394,7 +2394,7 @@
 	challenge_bytes = get_mpint_len(pvar, 0);
 
 	if (grab_payload(pvar, challenge_bytes)) {
-		unsigned char FAR *outmsg =
+		unsigned char *outmsg =
 			begin_send_packet(pvar, SSH_CMSG_AUTH_RSA_RESPONSE, 16);
 
 		if (pvar->auth_state.cur_cred.method == SSH_AUTH_RSA) {
@@ -2423,7 +2423,7 @@
 			int server_key_bytes = (server_key_bits + 7) / 8;
 			int host_key_bytes = (host_key_bits + 7) / 8;
 			int session_buf_len = server_key_bytes + host_key_bytes + 8;
-			char FAR *session_buf = (char FAR *) malloc(session_buf_len);
+			char *session_buf = (char *) malloc(session_buf_len);
 			unsigned char session_id[16];
 
 			unsigned char *hash;
@@ -2464,7 +2464,7 @@
 static void try_send_credentials(PTInstVar pvar)
 {
 	if ((pvar->ssh_state.status_flags & STATUS_DONT_SEND_CREDENTIALS) == 0) {
-		AUTHCred FAR *cred = AUTH_get_cur_cred(pvar);
+		AUTHCred *cred = AUTH_get_cur_cred(pvar);
 		static const int RSA_msgs[] =
 			{ SSH_SMSG_AUTH_RSA_CHALLENGE, SSH_SMSG_FAILURE };
 		static const SSHPacketHandler RSA_handlers[]
@@ -2483,7 +2483,7 @@
 			return;
 		case SSH_AUTH_PASSWORD:{
 				int len = strlen(cred->password);
-				unsigned char FAR *outmsg =
+				unsigned char *outmsg =
 					begin_send_packet(pvar, SSH_CMSG_AUTH_PASSWORD,
 					                  4 + len);
 
@@ -2505,7 +2505,7 @@
 			}
 		case SSH_AUTH_RHOSTS:{
 				int len = strlen(cred->rhosts_client_user);
-				unsigned char FAR *outmsg =
+				unsigned char *outmsg =
 					begin_send_packet(pvar, SSH_CMSG_AUTH_RHOSTS, 4 + len);
 
 				notify_verbose_message(pvar,
@@ -2520,7 +2520,7 @@
 			}
 		case SSH_AUTH_RSA:{
 				int len = BN_num_bytes(cred->key_pair->rsa->n);
-				unsigned char FAR *outmsg =
+				unsigned char *outmsg =
 					begin_send_packet(pvar, SSH_CMSG_AUTH_RSA, 2 + len);
 
 				notify_verbose_message(pvar,
@@ -2538,7 +2538,7 @@
 				int name_len = strlen(cred->rhosts_client_user);
 				int exp_len = BN_num_bytes(cred->key_pair->rsa->e);
 				int index;
-				unsigned char FAR *outmsg =
+				unsigned char *outmsg =
 					begin_send_packet(pvar, SSH_CMSG_AUTH_RHOSTS_RSA,
 					                  12 + mod_len + name_len + exp_len);
 
@@ -2562,7 +2562,7 @@
 				break;
 			}
 		case SSH_AUTH_PAGEANT:{
-				unsigned char FAR *outmsg;
+				unsigned char *outmsg;
 				unsigned char *pubkey;
 				int len, bn_bytes;
 
@@ -2604,7 +2604,7 @@
 			}
 		case SSH_AUTH_TIS:{
 				if (cred->password == NULL) {
-					unsigned char FAR *outmsg =
+					unsigned char *outmsg =
 						begin_send_packet(pvar, SSH_CMSG_AUTH_TIS, 0);
 
 					notify_verbose_message(pvar,
@@ -2613,7 +2613,7 @@
 					enque_handlers(pvar, 2, TIS_msgs, TIS_handlers);
 				} else {
 					int len = strlen(cred->password);
-					unsigned char FAR *outmsg =
+					unsigned char *outmsg =
 						begin_send_packet(pvar, SSH_CMSG_AUTH_TIS_RESPONSE,
 						                  4 + len);
 
@@ -2648,11 +2648,11 @@
 static void try_send_user_name(PTInstVar pvar)
 {
 	if ((pvar->ssh_state.status_flags & STATUS_DONT_SEND_USER_NAME) == 0) {
-		char FAR *username = AUTH_get_user_name(pvar);
+		char *username = AUTH_get_user_name(pvar);
 
 		if (username != NULL) {
 			int len = strlen(username);
-			unsigned char FAR *outmsg =
+			unsigned char *outmsg =
 				begin_send_packet(pvar, SSH_CMSG_USER, 4 + len);
 			char buf[1024] = "Sending user name: ";
 			static const int msgs[] =
@@ -2677,7 +2677,7 @@
 static void send_session_key(PTInstVar pvar)
 {
 	int encrypted_session_key_len;
-	unsigned char FAR *outmsg;
+	unsigned char *outmsg;
 
 	if (SSHv1(pvar)) {
 		encrypted_session_key_len =
@@ -2770,11 +2770,11 @@
 	pvar->ssh_state.win_rows = pvar->ts->TerminalHeight;
 }
 
-void SSH_notify_disconnecting(PTInstVar pvar, char FAR * reason)
+void SSH_notify_disconnecting(PTInstVar pvar, char *reason)
 {
 	if (SSHv1(pvar)) {
 		int len = reason == NULL ? 0 : strlen(reason);
-		unsigned char FAR *outmsg =
+		unsigned char *outmsg =
 			begin_send_packet(pvar, SSH_MSG_DISCONNECT, len + 4);
 
 		set_uint32(outmsg, len);
@@ -2845,7 +2845,7 @@
 
 	if (SSHv1(pvar)) {
 		if (get_handler(pvar, SSH_SMSG_STDOUT_DATA) == handle_data) {
-			unsigned char FAR *outmsg =
+			unsigned char *outmsg =
 				begin_send_packet(pvar, SSH_CMSG_WINDOW_SIZE, 16);
 
 			set_uint32(outmsg, rows);     // window height (characters)
@@ -2953,7 +2953,7 @@
 
 /* data is guaranteed to be at least SSH_get_min_packet_size bytes long
    at least 5 bytes must be decrypted */
-void SSH_predecrpyt_packet(PTInstVar pvar, char FAR * data)
+void SSH_predecrpyt_packet(PTInstVar pvar, char *data)
 {
 	if (SSHv2(pvar)) {
 		CRYPT_decrypt(pvar, data, get_predecryption_amount(pvar));
@@ -2979,7 +2979,7 @@
 	try_send_credentials(pvar);
 }
 
-void SSH_send(PTInstVar pvar, unsigned char const FAR * buf, unsigned int buflen)
+void SSH_send(PTInstVar pvar, unsigned char const *buf, unsigned int buflen)
 {
 	// RAW\x83p\x83P\x83b\x83g\x83_\x83\x93\x83v\x82\xF0\x92?\xC1 (2008.8.15 yutaka)
 	if (LOG_LEVEL_SSHDUMP <= pvar->session_settings.LogLevel) {
@@ -2996,7 +2996,7 @@
 			int len =
 				buflen >
 				SSH_MAX_SEND_PACKET_SIZE ? SSH_MAX_SEND_PACKET_SIZE : buflen;
-			unsigned char FAR *outmsg =
+			unsigned char *outmsg =
 				begin_send_packet(pvar, SSH_CMSG_STDIN_DATA, 4 + len);
 
 			set_uint32(outmsg, len);
@@ -3021,7 +3021,7 @@
 				}
 
 				pvar->ssh_state.compress_stream.next_in =
-					(unsigned char FAR *) buf;
+					(unsigned char *) buf;
 				pvar->ssh_state.compress_stream.avail_in = len;
 
 				if (deflate(&pvar->ssh_state.compress_stream, Z_SYNC_FLUSH) != Z_OK) {
@@ -3047,7 +3047,7 @@
 
 }
 
-int SSH_extract_payload(PTInstVar pvar, unsigned char FAR * dest, int len)
+int SSH_extract_payload(PTInstVar pvar, unsigned char *dest, int len)
 {
 	int num_bytes = pvar->ssh_state.payload_datalen;
 
@@ -3077,7 +3077,7 @@
 	return num_bytes;
 }
 
-void SSH_get_compression_info(PTInstVar pvar, char FAR * dest, int len)
+void SSH_get_compression_info(PTInstVar pvar, char *dest, int len)
 {
 	char buf[1024];
 	char buf2[1024];
@@ -3139,7 +3139,7 @@
 	_snprintf_s(dest, len, _TRUNCATE, pvar->ts->UIMsg, buf, buf2);
 }
 
-void SSH_get_server_ID_info(PTInstVar pvar, char FAR * dest, int len)
+void SSH_get_server_ID_info(PTInstVar pvar, char *dest, int len)
 {
 	strncpy_s(dest, len,
 	          pvar->ssh_state.server_ID == NULL ? "Unknown"
@@ -3147,7 +3147,7 @@
 	          _TRUNCATE);
 }
 
-void SSH_get_protocol_version_info(PTInstVar pvar, char FAR * dest,
+void SSH_get_protocol_version_info(PTInstVar pvar, char *dest,
                                    int len)
 {
 	if (pvar->protocol_major == 0) {
@@ -3158,7 +3158,7 @@
 	}
 }
 
-void SSH_get_mac_info(PTInstVar pvar, char FAR * dest, int len)
+void SSH_get_mac_info(PTInstVar pvar, char *dest, int len)
 {
 	UTIL_get_lang_msg("DLG_ABOUT_MAC_INFO", pvar,
 	                  "%s to server, %s from server");
@@ -3173,14 +3173,14 @@
 	int mode;
 
 	for (i = 0; i < 256; i++) {
-		SSHPacketHandlerItem FAR *first_item =
+		SSHPacketHandlerItem *first_item =
 			pvar->ssh_state.packet_handlers[i];
 
 		if (first_item != NULL) {
-			SSHPacketHandlerItem FAR *item = first_item;
+			SSHPacketHandlerItem *item = first_item;
 
 			do {
-				SSHPacketHandlerItem FAR *cur_item = item;
+				SSHPacketHandlerItem *cur_item = item;
 
 				item = item->next_for_message;
 				free(cur_item);
@@ -3287,7 +3287,7 @@
 
 }
 
-void SSH2_send_channel_data(PTInstVar pvar, Channel_t *c, unsigned char FAR * buf, unsigned int buflen, int retry)
+void SSH2_send_channel_data(PTInstVar pvar, Channel_t *c, unsigned char *buf, unsigned int buflen, int retry)
 {
 	buffer_t *msg;
 	unsigned char *outmsg;
@@ -3355,10 +3355,10 @@
 /* support for port forwarding */
 void SSH_channel_send(PTInstVar pvar, int channel_num,
                       uint32 remote_channel_num,
-                      unsigned char FAR * buf, int len, int retry)
+                      unsigned char *buf, int len, int retry)
 {
 	if (SSHv1(pvar)) {
-		unsigned char FAR *outmsg =
+		unsigned char *outmsg =
 			begin_send_packet(pvar, SSH_MSG_CHANNEL_DATA, 8 + len);
 
 		set_uint32(outmsg, remote_channel_num);
@@ -3383,7 +3383,7 @@
 			}
 
 			pvar->ssh_state.compress_stream.next_in =
-				(unsigned char FAR *) buf;
+				(unsigned char *) buf;
 			pvar->ssh_state.compress_stream.avail_in = len;
 
 			if (deflate(&pvar->ssh_state.compress_stream, Z_SYNC_FLUSH) !=
@@ -3410,7 +3410,7 @@
 void SSH_fail_channel_open(PTInstVar pvar, uint32 remote_channel_num)
 {
 	if (SSHv1(pvar)) {
-		unsigned char FAR *outmsg =
+		unsigned char *outmsg =
 			begin_send_packet(pvar, SSH_MSG_CHANNEL_OPEN_FAILURE, 4);
 
 		set_uint32(outmsg, remote_channel_num);
@@ -3476,7 +3476,7 @@
 							  uint32 local_channel_num)
 {
 	if (SSHv1(pvar)) {
-		unsigned char FAR *outmsg =
+		unsigned char *outmsg =
 			begin_send_packet(pvar, SSH_MSG_CHANNEL_OPEN_CONFIRMATION, 8);
 
 		set_uint32(outmsg, remote_channel_num);
@@ -3499,7 +3499,7 @@
 void SSH_channel_output_eof(PTInstVar pvar, uint32 remote_channel_num)
 {
 	if (SSHv1(pvar)){
-		unsigned char FAR *outmsg =
+		unsigned char *outmsg =
 			begin_send_packet(pvar, SSH_MSG_CHANNEL_OUTPUT_CLOSED, 4);
 
 		set_uint32(outmsg, remote_channel_num);
@@ -3550,7 +3550,7 @@
 void SSH_channel_input_eof(PTInstVar pvar, uint32 remote_channel_num, uint32 local_channel_num)
 {
 	if (SSHv1(pvar)){
-		unsigned char FAR *outmsg =
+		unsigned char *outmsg =
 			begin_send_packet(pvar, SSH_MSG_CHANNEL_INPUT_EOF, 4);
 
 		set_uint32(outmsg, remote_channel_num);
@@ -3568,12 +3568,12 @@
 	}
 }
 
-void SSH_request_forwarding(PTInstVar pvar, char FAR * bind_address, int from_server_port,
-                            char FAR * to_local_host, int to_local_port)
+void SSH_request_forwarding(PTInstVar pvar, char *bind_address, int from_server_port,
+                            char *to_local_host, int to_local_port)
 {
 	if (SSHv1(pvar)) {
 		int host_len = strlen(to_local_host);
-		unsigned char FAR *outmsg =
+		unsigned char *outmsg =
 			begin_send_packet(pvar, SSH_CMSG_PORT_FORWARD_REQUEST,
 			                  12 + host_len);
 
@@ -3614,7 +3614,7 @@
 	}
 }
 
-void SSH_cancel_request_forwarding(PTInstVar pvar, char FAR * bind_address, int from_server_port, int reply)
+void SSH_cancel_request_forwarding(PTInstVar pvar, char *bind_address, int from_server_port, int reply)
 {
 	if (SSHv2(pvar)) {
 		buffer_t *msg;
@@ -3645,8 +3645,8 @@
 }
 
 void SSH_request_X11_forwarding(PTInstVar pvar,
-                                char FAR * auth_protocol,
-                                unsigned char FAR * auth_data,
+                                char *auth_protocol,
+                                unsigned char *auth_data,
                                 int auth_data_len, int screen_num)
 {
 	if (SSHv1(pvar)) {
@@ -3653,10 +3653,10 @@
 		int protocol_len = strlen(auth_protocol);
 		int data_len = auth_data_len * 2;
 		int outmsg_len = 12 + protocol_len + data_len;
-		unsigned char FAR *outmsg =
+		unsigned char *outmsg =
 			begin_send_packet(pvar, SSH_CMSG_X11_REQUEST_FORWARDING, outmsg_len);
 		int i;
-		char FAR *auth_data_ptr;
+		char *auth_data_ptr;
 
 		set_uint32(outmsg, protocol_len);
 		memcpy(outmsg + 4, auth_protocol, protocol_len);
@@ -3730,8 +3730,8 @@
 }
 
 void SSH_open_channel(PTInstVar pvar, uint32 local_channel_num,
-                      char FAR * to_remote_host, int to_remote_port,
-                      char FAR * originator, unsigned short originator_port)
+                      char *to_remote_host, int to_remote_port,
+                      char *originator, unsigned short originator_port)
 {
 	static const int msgs[]
 	= { SSH_MSG_CHANNEL_OPEN_CONFIRMATION, SSH_MSG_CHANNEL_OPEN_FAILURE };
@@ -3743,7 +3743,7 @@
 	if ((pvar->ssh_state.
 		 server_protocol_flags & SSH_PROTOFLAG_HOST_IN_FWD_OPEN) != 0) {
 		int originator_len = strlen(originator);
-		unsigned char FAR *outmsg =
+		unsigned char *outmsg =
 			begin_send_packet(pvar, SSH_MSG_PORT_OPEN,
 			                  16 + host_len + originator_len);
 
@@ -3756,7 +3756,7 @@
 	} else {
 
 		if (SSHv1(pvar)) {
-			unsigned char FAR *outmsg =
+			unsigned char *outmsg =
 				begin_send_packet(pvar, SSH_MSG_PORT_OPEN,
 				                  12 + host_len);
 
@@ -6693,7 +6693,7 @@
 }
 
 
-static unsigned __stdcall ssh_heartbeat_thread(void FAR * p)
+static unsigned __stdcall ssh_heartbeat_thread(void *p)
 {
 	static int instance = 0;
 	PTInstVar pvar = (PTInstVar)p;
@@ -8047,7 +8047,7 @@
 	return;
 }
 
-static unsigned __stdcall ssh_scp_thread(void FAR * p)
+static unsigned __stdcall ssh_scp_thread(void *p)
 {
 	Channel_t *c = (Channel_t *)p;
 	PTInstVar pvar = c->scp.pvar;
@@ -8229,7 +8229,7 @@
 
 #define WM_RECEIVING_FILE (WM_USER + 2)
 
-static unsigned __stdcall ssh_scp_receive_thread(void FAR * p)
+static unsigned __stdcall ssh_scp_receive_thread(void *p)
 {
 	Channel_t *c = (Channel_t *)p;
 	PTInstVar pvar = c->scp.pvar;

Modified: trunk/ttssh2/ttxssh/ssh.h
===================================================================
--- trunk/ttssh2/ttxssh/ssh.h	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/ssh.h	2017-06-13 10:30:12 UTC (rev 6801)
@@ -587,27 +587,27 @@
 struct _SSHPacketHandlerItem {
 	SSHPacketHandler handler;
 	/* Circular list of handlers for given message */
-	SSHPacketHandlerItem FAR * next_for_message;
-	SSHPacketHandlerItem FAR * last_for_message;
+	SSHPacketHandlerItem *next_for_message;
+	SSHPacketHandlerItem *last_for_message;
 	/* Circular list of handlers in set */
-	SSHPacketHandlerItem FAR * next_in_set;
+	SSHPacketHandlerItem *next_in_set;
 	int active_for_message;
 };
 
 typedef struct {
-	char FAR * hostname;
+	char *hostname;
 
 	int server_protocol_flags;
-	char FAR * server_ID;
+	char *server_ID;
 
 	/* This buffer is used to hold the outgoing data, and encrypted in-place
 	   here if necessary. */
-	unsigned char FAR * outbuf;
+	unsigned char *outbuf;
 	long outbuflen;
 	/* This buffer is used by the SSH protocol processing to store uncompressed
 	   packet data for compression. User data is never streamed through here;
 	   it is compressed directly from the user's buffer. */
-	unsigned char FAR * precompress_outbuf;
+	unsigned char *precompress_outbuf;
 	long precompress_outbuflen;
 	/* this is the length of the packet data, including the type header */
 	long outgoing_packet_len;
@@ -615,10 +615,10 @@
 	/* This buffer is used by the SSH protocol processing to store decompressed
 	   packet data. User data is never streamed through here; it is decompressed
 	   directly to the user's buffer. */
-	unsigned char FAR * postdecompress_inbuf;
+	unsigned char *postdecompress_inbuf;
 	long postdecompress_inbuflen;
 
-	unsigned char FAR * payload;
+	unsigned char *payload;
 	long payload_grabbed;
 	long payloadlen;
 	long payload_datastart;
@@ -633,7 +633,7 @@
 	BOOL decompressing;
 	int compression_level;
 
-	SSHPacketHandlerItem FAR * packet_handlers[256];
+	SSHPacketHandlerItem *packet_handlers[256];
 	int status_flags;
 
 	int win_cols;
@@ -651,47 +651,47 @@
 
 void SSH_init(PTInstVar pvar);
 void SSH_open(PTInstVar pvar);
-void SSH_notify_disconnecting(PTInstVar pvar, char FAR * reason);
+void SSH_notify_disconnecting(PTInstVar pvar, char *reason);
 /* SSH_handle_server_ID returns TRUE iff a valid ID string has been
    received. If it returns FALSE, we need to keep looking for another
    ID string. */
-BOOL SSH_handle_server_ID(PTInstVar pvar, char FAR * ID, int ID_len);
+BOOL SSH_handle_server_ID(PTInstVar pvar, char *ID, int ID_len);
 /* SSH_handle_packet requires NO PAYLOAD on entry.
    'len' is the size of the packet: payload + padding (+ CRC for SSHv1)
    'padding' is the size of the padding.
    'data' points to the start of the packet data (the length field)
 */
-void SSH_handle_packet(PTInstVar pvar, char FAR * data, int len, int padding);
+void SSH_handle_packet(PTInstVar pvar, char *data, int len, int padding);
 void SSH_notify_win_size(PTInstVar pvar, int cols, int rows);
 void SSH_notify_user_name(PTInstVar pvar);
 void SSH_notify_cred(PTInstVar pvar);
 void SSH_notify_host_OK(PTInstVar pvar);
-void SSH_send(PTInstVar pvar, unsigned char const FAR * buf, unsigned int buflen);
+void SSH_send(PTInstVar pvar, unsigned char const *buf, unsigned int buflen);
 /* SSH_extract_payload returns number of bytes extracted */
-int SSH_extract_payload(PTInstVar pvar, unsigned char FAR * dest, int len);
+int SSH_extract_payload(PTInstVar pvar, unsigned char *dest, int len);
 void SSH_end(PTInstVar pvar);
 
-void SSH_get_server_ID_info(PTInstVar pvar, char FAR * dest, int len);
-void SSH_get_protocol_version_info(PTInstVar pvar, char FAR * dest, int len);
-void SSH_get_compression_info(PTInstVar pvar, char FAR * dest, int len);
-void SSH_get_mac_info(PTInstVar pvar, char FAR * dest, int len);
+void SSH_get_server_ID_info(PTInstVar pvar, char *dest, int len);
+void SSH_get_protocol_version_info(PTInstVar pvar, char *dest, int len);
+void SSH_get_compression_info(PTInstVar pvar, char *dest, int len);
+void SSH_get_mac_info(PTInstVar pvar, char *dest, int len);
 
 /* len must be <= SSH_MAX_SEND_PACKET_SIZE */
 void SSH_channel_send(PTInstVar pvar, int channel_num,
                       uint32 remote_channel_num,
-                      unsigned char FAR * buf, int len, int retry);
+                      unsigned char *buf, int len, int retry);
 void SSH_fail_channel_open(PTInstVar pvar, uint32 remote_channel_num);
 void SSH_confirm_channel_open(PTInstVar pvar, uint32 remote_channel_num, uint32 local_channel_num);
 void SSH_channel_output_eof(PTInstVar pvar, uint32 remote_channel_num);
 void SSH_channel_input_eof(PTInstVar pvar, uint32 remote_channel_num, uint32 local_channel_num);
-void SSH_request_forwarding(PTInstVar pvar, char FAR * bind_address, int from_server_port,
-                            char FAR * to_local_host, int to_local_port);
-void SSH_cancel_request_forwarding(PTInstVar pvar, char FAR * bind_address, int from_server_port, int reply);
+void SSH_request_forwarding(PTInstVar pvar, char *bind_address, int from_server_port,
+                            char *to_local_host, int to_local_port);
+void SSH_cancel_request_forwarding(PTInstVar pvar, char *bind_address, int from_server_port, int reply);
 void SSH_request_X11_forwarding(PTInstVar pvar,
-  char FAR * auth_protocol, unsigned char FAR * auth_data, int auth_data_len, int screen_num);
+  char *auth_protocol, unsigned char *auth_data, int auth_data_len, int screen_num);
 void SSH_open_channel(PTInstVar pvar, uint32 local_channel_num,
-                      char FAR * to_remote_host, int to_remote_port,
-                      char FAR * originator, unsigned short originator_port);
+                      char *to_remote_host, int to_remote_port,
+                      char *originator, unsigned short originator_port);
 
 int SSH_start_scp(PTInstVar pvar, char *sendfile, char *dstfile);
 int SSH_start_scp_receive(PTInstVar pvar, char *filename);
@@ -702,7 +702,7 @@
 int SSH_get_min_packet_size(PTInstVar pvar);
 /* data is guaranteed to be at least SSH_get_min_packet_size bytes long
    at least 5 bytes must be decrypted */
-void SSH_predecrpyt_packet(PTInstVar pvar, char FAR * data);
+void SSH_predecrpyt_packet(PTInstVar pvar, char *data);
 int SSH_get_clear_MAC_size(PTInstVar pvar);
 
 #define SSH_is_any_payload(pvar) ((pvar)->ssh_state.payload_datalen > 0)
@@ -822,9 +822,9 @@
 	unsigned int state;
 } Channel_t;
 
-unsigned char FAR *begin_send_packet(PTInstVar pvar, int type, int len);
+unsigned char *begin_send_packet(PTInstVar pvar, int type, int len);
 void finish_send_packet_special(PTInstVar pvar, int skip_compress);
-void SSH2_send_channel_data(PTInstVar pvar, Channel_t *c, unsigned char FAR * buf, unsigned int buflen, int retry);
+void SSH2_send_channel_data(PTInstVar pvar, Channel_t *c, unsigned char *buf, unsigned int buflen, int retry);
 
 #define finish_send_packet(pvar) finish_send_packet_special((pvar), 0)
 #define get_payload_uint32(pvar, offset) get_uint32_MSBfirst((pvar)->ssh_state.payload + (offset))

Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/ttxssh.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -54,7 +54,7 @@
 #include <commctrl.h>
 #include <commdlg.h>
 #include <winsock2.h>
-static char FAR *ProtocolFamilyList[] = { "UNSPEC", "IPv6", "IPv4", NULL };
+static char *ProtocolFamilyList[] = { "UNSPEC", "IPv6", "IPv4", NULL };
 
 #include <Lmcons.h>
 
@@ -99,7 +99,7 @@
 static HFONT DlgSetupFont;
 static HFONT DlgKeygenFont;
 
-static TInstVar FAR *pvar;
+static TInstVar *pvar;
 
 typedef struct {
 	int cnt;
@@ -171,7 +171,7 @@
 	ssh_heartbeat_lock_finalize();
 }
 
-static void PASCAL FAR TTXInit(PTTSet ts, PComVar cv)
+static void PASCAL TTXInit(PTTSet ts, PComVar cv)
 {
 	pvar->settings = *pvar->ts_SSH;
 	pvar->ts = ts;
@@ -274,7 +274,7 @@
  * Remove unsupported cipher or duplicated cipher.
  * Add unspecified ciphers at the end of list.
  */
-static void normalize_cipher_order(char FAR * buf)
+static void normalize_cipher_order(char *buf)
 {
 	/* SSH_CIPHER_NONE means that all ciphers below that one are disabled.
 	   We *never* allow no encryption. */
@@ -310,7 +310,7 @@
 	normalize_generic_order(buf, default_strings, NUM_ELEM(default_strings));
 }
 
-static void normalize_kex_order(char FAR * buf)
+static void normalize_kex_order(char *buf)
 {
 	static char default_strings[] = {
 		KEX_ECDH_SHA2_256,
@@ -329,7 +329,7 @@
 	normalize_generic_order(buf, default_strings, NUM_ELEM(default_strings));
 }
 
-static void normalize_host_key_order(char FAR * buf)
+static void normalize_host_key_order(char *buf)
 {
 	static char default_strings[] = {
 		KEY_ECDSA256,
@@ -344,7 +344,7 @@
 	normalize_generic_order(buf, default_strings, NUM_ELEM(default_strings));
 }
 
-static void normalize_mac_order(char FAR * buf)
+static void normalize_mac_order(char *buf)
 {
 	static char default_strings[] = {
 		HMAC_SHA2_512,
@@ -362,7 +362,7 @@
 	normalize_generic_order(buf, default_strings, NUM_ELEM(default_strings));
 }
 
-static void normalize_comp_order(char FAR * buf)
+static void normalize_comp_order(char *buf)
 {
 	static char default_strings[] = {
 		COMP_DELAYED,
@@ -381,7 +381,7 @@
 	pvar->ts_SSH->TryDefaultAuth = FALSE;
 }
 
-static BOOL read_BOOL_option(PCHAR fileName, char FAR * keyName, BOOL def)
+static BOOL read_BOOL_option(PCHAR fileName, char *keyName, BOOL def)
 {
 	char buf[1024];
 
@@ -397,8 +397,8 @@
 	}
 }
 
-static void read_string_option(PCHAR fileName, char FAR * keyName,
-                               char FAR * def, char FAR * buf, int bufSize)
+static void read_string_option(PCHAR fileName, char *keyName,
+                               char *def, char *buf, int bufSize)
 {
 
 	buf[0] = 0;
@@ -408,7 +408,7 @@
 static void read_ssh_options(PTInstVar pvar, PCHAR fileName)
 {
 	char buf[1024];
-	TS_SSH FAR *settings = pvar->ts_SSH;
+	TS_SSH *settings = pvar->ts_SSH;
 
 #define READ_STD_STRING_OPTION(name) \
 	read_string_option(fileName, #name, "", settings->name, sizeof(settings->name))
@@ -536,7 +536,7 @@
 }
 
 static void write_ssh_options(PTInstVar pvar, PCHAR fileName,
-                              TS_SSH FAR * settings, BOOL copy_forward)
+                              TS_SSH *settings, BOOL copy_forward)
 {
 	char buf[1024];
 
@@ -664,8 +664,8 @@
 	int tries;
 	SOCKET connecter;
 	struct addrinfo hints;
-	struct addrinfo FAR *res;
-	struct addrinfo FAR *res0;
+	struct addrinfo *res;
+	struct addrinfo *res0;
 	unsigned short port;
 	char pname[NI_MAXHOST];
 
@@ -722,8 +722,8 @@
 	return 0;
 }
 
-static int PASCAL FAR TTXconnect(SOCKET s,
-                                 const struct sockaddr FAR * name,
+static int PASCAL TTXconnect(SOCKET s,
+                                 const struct sockaddr *name,
                                  int namelen)
 {
 	if (pvar->socket == INVALID_SOCKET || pvar->socket != s) {
@@ -736,17 +736,17 @@
 		switch (pvar->ts->ProtocolFamily) {
 		case AF_INET:
 			len = sizeof(struct sockaddr_in);
-			((struct sockaddr_in FAR *) &ss)->sin_family = AF_INET;
-			((struct sockaddr_in FAR *) &ss)->sin_addr.s_addr = INADDR_ANY;
-			((struct sockaddr_in FAR *) &ss)->sin_port =
+			((struct sockaddr_in *) &ss)->sin_family = AF_INET;
+			((struct sockaddr_in *) &ss)->sin_addr.s_addr = INADDR_ANY;
+			((struct sockaddr_in *) &ss)->sin_port =
 				htons(find_local_port(pvar));
 			break;
 		case AF_INET6:
 			len = sizeof(struct sockaddr_in6);
-			((struct sockaddr_in6 FAR *) &ss)->sin6_family = AF_INET6;
-			memset(&((struct sockaddr_in6 FAR *) &ss)->sin6_addr, 0,
+			((struct sockaddr_in6 *) &ss)->sin6_family = AF_INET6;
+			memset(&((struct sockaddr_in6 *) &ss)->sin6_addr, 0,
 			       sizeof(struct in_addr6));
-			((struct sockaddr_in6 FAR *) &ss)->sin6_port =
+			((struct sockaddr_in6 *) &ss)->sin6_port =
 				htons(find_local_port(pvar));
 			break;
 		default:
@@ -754,13 +754,13 @@
 			break;
 		}
 
-		bind(s, (struct sockaddr FAR *) &ss, len);
+		bind(s, (struct sockaddr *) &ss, len);
 	}
 
 	return (pvar->Pconnect) (s, name, namelen);
 }
 
-static int PASCAL FAR TTXWSAAsyncSelect(SOCKET s, HWND hWnd, u_int wMsg,
+static int PASCAL TTXWSAAsyncSelect(SOCKET s, HWND hWnd, u_int wMsg,
                                         long lEvent)
 {
 	if (s == pvar->socket) {
@@ -776,7 +776,7 @@
 	return (pvar->PWSAAsyncSelect) (s, hWnd, wMsg, lEvent);
 }
 
-static int PASCAL FAR TTXrecv(SOCKET s, char FAR * buf, int len, int flags)
+static int PASCAL TTXrecv(SOCKET s, char *buf, int len, int flags)
 {
 	if (s == pvar->socket) {
 		int ret;
@@ -791,7 +791,7 @@
 	}
 }
 
-static int PASCAL FAR TTXsend(SOCKET s, char const FAR * buf, int len,
+static int PASCAL TTXsend(SOCKET s, char const *buf, int len,
                               int flags)
 {
 	if (s == pvar->socket) {
@@ -850,7 +850,7 @@
 	                       LOG_LEVEL_VERBOSE);
 }
 
-void notify_closed_connection(PTInstVar pvar, char FAR * send_msg)
+void notify_closed_connection(PTInstVar pvar, char *send_msg)
 {
 	SSH_notify_disconnecting(pvar, send_msg);
 	AUTH_notify_disconnecting(pvar);
@@ -860,11 +860,11 @@
 	            pvar->socket, MAKELPARAM(FD_CLOSE, 0));
 }
 
-static void add_err_msg(PTInstVar pvar, char FAR * msg)
+static void add_err_msg(PTInstVar pvar, char *msg)
 {
 	if (pvar->err_msg != NULL) {
 		int buf_len = strlen(pvar->err_msg) + 3 + strlen(msg);
-		char FAR *buf = (char FAR *) malloc(buf_len);
+		char *buf = (char *) malloc(buf_len);
 
 		strncpy_s(buf, buf_len, pvar->err_msg, _TRUNCATE);
 		strncat_s(buf, buf_len, "\n\n", _TRUNCATE);
@@ -876,7 +876,7 @@
 	}
 }
 
-void notify_nonfatal_error(PTInstVar pvar, char FAR * msg)
+void notify_nonfatal_error(PTInstVar pvar, char *msg)
 {
 	if (!pvar->showing_err) {
 		// \x96\xA2\x90?\xB1\x82?\xF3\x91?ł??m\x90\xE6\x83E\x83B\x83\x93\x83h\x83E\x82\xAA\x82?\xA2\x82?ŁA\x83f\x83X\x83N\x83g\x83b\x83v\x82\xF0\x83I\x81[\x83i\x81[\x82?\xB5\x82\xC4
@@ -898,7 +898,7 @@
 	}
 }
 
-void notify_fatal_error(PTInstVar pvar, char FAR * msg, BOOL send_disconnect)
+void notify_fatal_error(PTInstVar pvar, char *msg, BOOL send_disconnect)
 {
 	if (msg[0] != 0) {
 		notify_verbose_message(pvar, msg, LOG_LEVEL_FATAL);
@@ -920,7 +920,7 @@
 	}
 }
 
-void notify_verbose_message(PTInstVar pvar, char FAR * msg, int level)
+void notify_verbose_message(PTInstVar pvar, char *msg, int level)
 {
 	if (level <= pvar->session_settings.LogLevel) {
 		char buf[1024];
@@ -1045,7 +1045,7 @@
 	}
 }
 
-static void PASCAL FAR TTXOpenTCP(TTXSockHooks FAR * hooks)
+static void PASCAL TTXOpenTCP(TTXSockHooks *hooks)
 {
 	if (pvar->settings.Enabled) {
 		// TCPLocalEcho/TCPCRSend \x82?\xF8\x82?\xB7\x82\xE9 (maya 2007.4.25)
@@ -1090,7 +1090,7 @@
 	}
 }
 
-static void PASCAL FAR TTXCloseTCP(TTXSockHooks FAR * hooks)
+static void PASCAL TTXCloseTCP(TTXSockHooks *hooks)
 {
 	if (pvar->session_settings.Enabled) {
 		pvar->socket = INVALID_SOCKET;
@@ -1644,18 +1644,18 @@
 	return FALSE;
 }
 
-static BOOL FAR PASCAL TTXGetHostName(HWND parent, PGetHNRec rec)
+static BOOL PASCAL TTXGetHostName(HWND parent, PGetHNRec rec)
 {
 	return (BOOL) DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_HOSTDLG),
 	                             parent, TTXHostDlg, (LONG) rec);
 }
 
-static void PASCAL FAR TTXGetUIHooks(TTXUIHooks FAR * hooks)
+static void PASCAL TTXGetUIHooks(TTXUIHooks *hooks)
 {
 	*hooks->GetHostName = TTXGetHostName;
 }
 
-static void FAR PASCAL TTXReadINIFile(PCHAR fileName, PTTSet ts)
+static void PASCAL TTXReadINIFile(PCHAR fileName, PTTSet ts)
 {
 	(pvar->ReadIniFile) (fileName, ts);
 	read_ssh_options(pvar, fileName);
@@ -1664,7 +1664,7 @@
 	FWDUI_load_settings(pvar);
 }
 
-static void FAR PASCAL TTXWriteINIFile(PCHAR fileName, PTTSet ts)
+static void PASCAL TTXWriteINIFile(PCHAR fileName, PTTSet ts)
 {
 	(pvar->WriteIniFile) (fileName, ts);
 	*pvar->ts_SSH = pvar->settings;
@@ -1674,7 +1674,7 @@
 }
 
 static void read_ssh_options_from_user_file(PTInstVar pvar,
-                                            char FAR * user_file_name)
+                                            char *user_file_name)
 {
 	if (user_file_name[0] == '.') {
 		read_ssh_options(pvar, user_file_name);
@@ -1727,7 +1727,7 @@
 	}
 }
 
-static void FAR PASCAL TTXParseParam(PCHAR param, PTTSet ts, PCHAR DDETopic) {
+static void PASCAL TTXParseParam(PCHAR param, PTTSet ts, PCHAR DDETopic) {
 	int param_len=strlen(param);
 	int opt_len = param_len+1;
 	char *option = (char *)calloc(opt_len, sizeof(char));
@@ -2098,7 +2098,7 @@
 	(pvar->ParseParam) (param, ts, DDETopic);
 }
 
-static void PASCAL FAR TTXGetSetupHooks(TTXSetupHooks FAR * hooks)
+static void PASCAL TTXGetSetupHooks(TTXSetupHooks *hooks)
 {
 	pvar->ReadIniFile = *hooks->ReadIniFile;
 	pvar->WriteIniFile = *hooks->WriteIniFile;
@@ -2109,13 +2109,13 @@
 	*hooks->ParseParam = TTXParseParam;
 }
 
-static void PASCAL FAR TTXSetWinSize(int rows, int cols)
+static void PASCAL TTXSetWinSize(int rows, int cols)
 {
 	SSH_notify_win_size(pvar, cols, rows);
 }
 
 static void insertMenuBeforeItem(HMENU menu, WORD beforeItemID, WORD flags,
-                                 WORD newItemID, char FAR * text)
+                                 WORD newItemID, char *text)
 {
 	int i, j;
 
@@ -2157,7 +2157,7 @@
   return NULL;
 }
 
-static void PASCAL FAR TTXModifyMenu(HMENU menu)
+static void PASCAL TTXModifyMenu(HMENU menu)
 {
 	pvar->FileMenu = GetFileMenu(menu);
 
@@ -2182,7 +2182,7 @@
 	insertMenuBeforeItem(menu, 50170, MF_GRAYED, ID_SSHSCPMENU, pvar->ts->UIMsg);
 }
 
-static void PASCAL FAR TTXModifyPopupMenu(HMENU menu) {
+static void PASCAL TTXModifyPopupMenu(HMENU menu) {
 	if (menu == pvar->FileMenu) {
 		if (pvar->cv->Ready && pvar->settings.Enabled)
 			EnableMenuItem(menu, ID_SSHSCPMENU, MF_BYCOMMAND | MF_ENABLED);
@@ -2405,7 +2405,7 @@
 		strncat_s(buf2, sizeof(buf2), fp, _TRUNCATE);
 		free(fp);
 
-		SendDlgItemMessage(dlg, IDC_ABOUTTEXT, WM_SETTEXT, 0, (LPARAM)(char FAR *)buf2);
+		SendDlgItemMessage(dlg, IDC_ABOUTTEXT, WM_SETTEXT, 0, (LPARAM)(char *)buf2);
 	}
 }
 
@@ -2605,7 +2605,7 @@
 	return FALSE;
 }
 
-static char FAR *get_cipher_name(int cipher)
+static char *get_cipher_name(int cipher)
 {
 	switch (cipher) {
 	case SSH_CIPHER_NONE:
@@ -2823,7 +2823,7 @@
 
 	for (i = 0; pvar->settings.CipherOrder[i] != 0; i++) {
 		int cipher = pvar->settings.CipherOrder[i] - '0';
-		char FAR *name = get_cipher_name(cipher);
+		char *name = get_cipher_name(cipher);
 
 		if (name != NULL) {
 			SendMessage(cipherControl, LB_ADDSTRING, 0, (LPARAM) name);
@@ -2837,7 +2837,7 @@
 	normalize_kex_order(pvar->settings.KexOrder);
 	for (i = 0; pvar->settings.KexOrder[i] != 0; i++) {
 		int index = pvar->settings.KexOrder[i] - '0';
-		char FAR *name = NULL;
+		char *name = NULL;
 
 		if (index == 0)	{
 			UTIL_get_lang_msg("DLG_SSHSETUP_KEX_BORDER", pvar,
@@ -2858,7 +2858,7 @@
 	normalize_host_key_order(pvar->settings.HostKeyOrder);
 	for (i = 0; pvar->settings.HostKeyOrder[i] != 0; i++) {
 		int index = pvar->settings.HostKeyOrder[i] - '0';
-		char FAR *name = NULL;
+		char *name = NULL;
 
 		if (index == 0)	{
 			UTIL_get_lang_msg("DLG_SSHSETUP_HOST_KEY_BORDER", pvar,
@@ -2879,7 +2879,7 @@
 	normalize_mac_order(pvar->settings.MacOrder);
 	for (i = 0; pvar->settings.MacOrder[i] != 0; i++) {
 		int index = pvar->settings.MacOrder[i] - '0';
-		char FAR *name = NULL;
+		char *name = NULL;
 
 		if (index == 0)	{
 			UTIL_get_lang_msg("DLG_SSHSETUP_MAC_BORDER", pvar,
@@ -2900,7 +2900,7 @@
 	normalize_comp_order(pvar->settings.CompOrder);
 	for (i = 0; pvar->settings.CompOrder[i] != 0; i++) {
 		int index = pvar->settings.CompOrder[i] - '0';
-		char FAR *name = NULL;
+		char *name = NULL;
 
 		if (index == 0)	{
 			UTIL_get_lang_msg("DLG_SSHSETUP_COMP_BORDER", pvar,
@@ -2977,8 +2977,8 @@
 
 }
 
-void get_teraterm_dir_relative_name(char FAR * buf, int bufsize,
-                                    char FAR * basename)
+void get_teraterm_dir_relative_name(char *buf, int bufsize,
+                                    char *basename)
 {
 	int filename_start = 0;
 	int i;
@@ -3002,8 +3002,8 @@
 	}
 }
 
-int copy_teraterm_dir_relative_path(char FAR * dest, int destsize,
-                                    char FAR * basename)
+int copy_teraterm_dir_relative_path(char *dest, int destsize,
+                                    char *basename)
 {
 	char buf[1024];
 	int filename_start = 0;
@@ -3254,13 +3254,13 @@
 			SendMessage(listbox, LB_GETTEXT, curPos, (LPARAM) buf);
 			SendMessage(listbox, LB_DELETESTRING, curPos, 0);
 			SendMessage(listbox, LB_INSERTSTRING, newPos,
-			            (LPARAM) (char FAR *) buf);
+			            (LPARAM) (char *) buf);
 			SendMessage(listbox, LB_SETCURSEL, newPos, 0);
 		}
 	}
 }
 
-static int get_keys_file_name(HWND parent, char FAR * buf, int bufsize,
+static int get_keys_file_name(HWND parent, char *buf, int bufsize,
                               int readonly)
 {
 	OPENFILENAME params;
@@ -5149,7 +5149,7 @@
 }
 
 
-static int PASCAL FAR TTXProcessCommand(HWND hWin, WORD cmd)
+static int PASCAL TTXProcessCommand(HWND hWin, WORD cmd)
 {
 	char uimsg[MAX_UIMSG];
 
@@ -5223,7 +5223,7 @@
 		return 1;
 	case ID_SSHASYNCMESSAGEBOX:
 		if (pvar->err_msg != NULL) {
-			char FAR *msg = pvar->err_msg;
+			char *msg = pvar->err_msg;
 
 			/* Could there be a buffer overrun bug anywhere in Win32
 			   MessageBox? Who knows? I'm paranoid. */
@@ -5323,7 +5323,7 @@
 	strncpy_s(dst, dst_len, str, _TRUNCATE);
 }
 
-static void PASCAL FAR TTXSetCommandLine(PCHAR cmd, int cmdlen,
+static void PASCAL TTXSetCommandLine(PCHAR cmd, int cmdlen,
                                          PGetHNRec rec)
 {
 	char tmpFile[MAX_PATH];
@@ -5442,7 +5442,7 @@
    This function is called for each extension, in reverse load order (see
    below).
 */
-static void PASCAL FAR TTXEnd(void)
+static void PASCAL TTXEnd(void)
 {
 	uninit_TTSSH(pvar);
 
@@ -5487,7 +5487,7 @@
 };
 
 BOOL __declspec(dllexport)
-PASCAL FAR TTXBind(WORD Version, TTXExports FAR * exports)
+PASCAL TTXBind(WORD Version, TTXExports *exports)
 {
 	int size = sizeof(Exports) - sizeof(exports->size);
 	/* do version checking if necessary */
@@ -5496,8 +5496,8 @@
 	if (size > exports->size) {
 		size = exports->size;
 	}
-	memcpy((char FAR *) exports + sizeof(exports->size),
-		   (char FAR *) &Exports + sizeof(exports->size), size);
+	memcpy((char *) exports + sizeof(exports->size),
+		   (char *) &Exports + sizeof(exports->size), size);
 	return TRUE;
 }
 

Modified: trunk/ttssh2/ttxssh/ttxssh.h
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.h	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/ttxssh.h	2017-06-13 10:30:12 UTC (rev 6801)
@@ -64,7 +64,7 @@
 #include "i18n.h"
 #include "ttlib.h"
 
-typedef struct _TInstVar FAR * PTInstVar;
+typedef struct _TInstVar *PTInstVar;
 
 #include "util.h"
 #include "pkt.h"
@@ -198,11 +198,11 @@
 
 	/* shared memory for settings across instances. Basically it's
 	   a cache for the INI file.*/
-	TS_SSH FAR * ts_SSH;
+	TS_SSH *ts_SSH;
 
 	int fatal_error;
 	int showing_err;
-	char FAR * err_msg;
+	char *err_msg;
 
 	Tconnect Pconnect;
 	Trecv Precv;
@@ -339,16 +339,16 @@
 #define SSHv2(pvar) ((pvar)->protocol_major == 2)
 
 void notify_established_secure_connection(PTInstVar pvar);
-void notify_closed_connection(PTInstVar pvar, char FAR * send_msg);
-void notify_nonfatal_error(PTInstVar pvar, char FAR * msg);
-void notify_fatal_error(PTInstVar pvar, char FAR * msg, BOOL send_disconnect);
-void notify_verbose_message(PTInstVar pvar, char FAR * msg, int level);
+void notify_closed_connection(PTInstVar pvar, char *send_msg);
+void notify_nonfatal_error(PTInstVar pvar, char *msg);
+void notify_fatal_error(PTInstVar pvar, char *msg, BOOL send_disconnect);
+void notify_verbose_message(PTInstVar pvar, char *msg, int level);
 void logprintf(PTInstVar pvar, int level, char *fmt, ...);
 void logprintf_hexdump(PTInstVar pvar, int level, char *data, int len, char *fmt, ...);
 
 
-void get_teraterm_dir_relative_name(char FAR * buf, int bufsize, char FAR * basename);
-int copy_teraterm_dir_relative_path(char FAR * dest, int destsize, char FAR * basename);
+void get_teraterm_dir_relative_name(char *buf, int bufsize, char *basename);
+int copy_teraterm_dir_relative_path(char *dest, int destsize, char *basename);
 void get_file_version(char *exefile, int *major, int *minor, int *release, int *build);
 int uuencode(unsigned char *src, int srclen, unsigned char *target, int targsize);
 

Modified: trunk/ttssh2/ttxssh/util.c
===================================================================
--- trunk/ttssh2/ttxssh/util.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/util.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -33,7 +33,7 @@
 
 #include "ttxssh.h"
 
-void UTIL_init_sock_write_buf(UTILSockWriteBuf FAR * buf)
+void UTIL_init_sock_write_buf(UTILSockWriteBuf *buf)
 {
 	buf_create(&buf->bufdata, &buf->buflen);
 	buf->datastart = 0;
@@ -41,7 +41,7 @@
 }
 
 static int send_until_block(PTInstVar pvar, SOCKET s,
-                            const char FAR * data, int len)
+                            const char *data, int len)
 {
 	int total_sent = 0;
 
@@ -91,9 +91,9 @@
  * return TRUE: \x91\x97\x90M\x90\xAC\x8C\xF7
  *        FALSE: \x91\x97\x90M\x83G\x83\x89\x81[
  */
-BOOL UTIL_sock_buffered_write(PTInstVar pvar, UTILSockWriteBuf FAR * buf,
+BOOL UTIL_sock_buffered_write(PTInstVar pvar, UTILSockWriteBuf *buf,
                               UTILBlockingWriteCallback blocking_write,
-                              SOCKET socket, const char FAR * data,
+                              SOCKET socket, const char *data,
                               int len)
 {
 	int curlen;
@@ -269,7 +269,7 @@
 	}
 }
 
-BOOL UTIL_sock_write_more(PTInstVar pvar, UTILSockWriteBuf FAR * buf,
+BOOL UTIL_sock_write_more(PTInstVar pvar, UTILSockWriteBuf *buf,
 						  SOCKET socket)
 {
 	int first_amount = min(buf->buflen - buf->datastart, buf->datalen);
@@ -302,13 +302,13 @@
 	return TRUE;
 }
 
-void UTIL_destroy_sock_write_buf(UTILSockWriteBuf FAR * buf)
+void UTIL_destroy_sock_write_buf(UTILSockWriteBuf *buf)
 {
 	SecureZeroMemory(buf->bufdata, buf->buflen);
 	buf_destroy(&buf->bufdata, &buf->buflen);
 }
 
-BOOL UTIL_is_sock_deeply_buffered(UTILSockWriteBuf FAR * buf)
+BOOL UTIL_is_sock_deeply_buffered(UTILSockWriteBuf *buf)
 {
 	return buf->buflen / 2 < buf->datalen;
 }

Modified: trunk/ttssh2/ttxssh/util.h
===================================================================
--- trunk/ttssh2/ttxssh/util.h	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/util.h	2017-06-13 10:30:12 UTC (rev 6801)
@@ -67,7 +67,7 @@
    (buf)[3] = (unsigned char)(uint32)(v))
 
 typedef struct _UTILSockWriteBuf {
-  char FAR * bufdata;
+  char *bufdata;
   int buflen;
   int datastart;
   int datalen;
@@ -74,14 +74,14 @@
 } UTILSockWriteBuf;
 
 typedef BOOL (* UTILBlockingWriteCallback)(PTInstVar pvar,
-  SOCKET socket, const char FAR * data, int len);
+  SOCKET socket, const char *data, int len);
 
-void UTIL_init_sock_write_buf(UTILSockWriteBuf FAR * buf);
-BOOL UTIL_sock_buffered_write(PTInstVar pvar, UTILSockWriteBuf FAR * buf,
-  UTILBlockingWriteCallback blocking_write, SOCKET socket, const char FAR * data, int len);
-BOOL UTIL_sock_write_more(PTInstVar pvar, UTILSockWriteBuf FAR * buf, SOCKET socket);
-void UTIL_destroy_sock_write_buf(UTILSockWriteBuf FAR * buf);
-BOOL UTIL_is_sock_deeply_buffered(UTILSockWriteBuf FAR * buf);
+void UTIL_init_sock_write_buf(UTILSockWriteBuf *buf);
+BOOL UTIL_sock_buffered_write(PTInstVar pvar, UTILSockWriteBuf *buf,
+  UTILBlockingWriteCallback blocking_write, SOCKET socket, const char *data, int len);
+BOOL UTIL_sock_write_more(PTInstVar pvar, UTILSockWriteBuf *buf, SOCKET socket);
+void UTIL_destroy_sock_write_buf(UTILSockWriteBuf *buf);
+BOOL UTIL_is_sock_deeply_buffered(UTILSockWriteBuf *buf);
 
 void UTIL_get_lang_msg(PCHAR key, PTInstVar pvar, PCHAR def);
 int UTIL_get_lang_font(PCHAR key, HWND dlg, PLOGFONT logfont, HFONT *font, PTInstVar pvar);

Modified: trunk/ttssh2/ttxssh/x11util.c
===================================================================
--- trunk/ttssh2/ttxssh/x11util.c	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/x11util.c	2017-06-13 10:30:12 UTC (rev 6801)
@@ -34,15 +34,15 @@
 
 typedef struct {
 	PTInstVar pvar;
-	X11AuthData FAR *auth_data;
+	X11AuthData *auth_data;
 
-	unsigned char FAR *init_buf;
+	unsigned char *init_buf;
 	int init_buf_len;
 	int init_data_len;
 } X11UnspoofingFilterClosure;
 
-void parse_DISPLAY_str(char FAR * name_buf, int name_buf_len,
-                          int FAR * port, int FAR * screen, char *DISPLAY)
+void parse_DISPLAY_str(char *name_buf, int name_buf_len,
+                          int *port, int *screen, char *DISPLAY)
 {
 	strncpy_s(name_buf, name_buf_len, "localhost", _TRUNCATE);
 	*port = 6000;
@@ -73,10 +73,10 @@
 	}
 }
 
-void X11_get_DISPLAY_info(PTInstVar pvar, char FAR * name_buf, int name_buf_len,
-                          int FAR * port, int FAR * screen)
+void X11_get_DISPLAY_info(PTInstVar pvar, char *name_buf, int name_buf_len,
+                          int *port, int *screen)
 {
-	char FAR *DISPLAY = getenv("DISPLAY");
+	char *DISPLAY = getenv("DISPLAY");
 
 	if (pvar->settings.X11Display[0] != 0) {
 		parse_DISPLAY_str(name_buf, name_buf_len, port, screen, pvar->settings.X11Display);
@@ -87,11 +87,11 @@
 }
 
 
-X11AuthData FAR *X11_load_local_auth_data(int screen_num)
+X11AuthData *X11_load_local_auth_data(int screen_num)
 {
-	X11AuthData FAR *auth_data =
-		(X11AuthData FAR *) malloc(sizeof(X11AuthData));
-	char FAR *local_auth_data_str;
+	X11AuthData *auth_data =
+		(X11AuthData *) malloc(sizeof(X11AuthData));
+	char *local_auth_data_str;
 
 	auth_data->local_protocol = getenv("TTSSH_XAUTH_PROTOCOL_NAME");
 
@@ -133,7 +133,7 @@
 	return auth_data;
 }
 
-void X11_dispose_auth_data(X11AuthData FAR * auth_data)
+void X11_dispose_auth_data(X11AuthData *auth_data)
 {
 	SecureZeroMemory(auth_data->local_data, auth_data->local_data_len);
 	free(auth_data->local_data);
@@ -144,9 +144,9 @@
 }
 
 void *X11_init_unspoofing_filter(PTInstVar pvar,
-                                 X11AuthData FAR * auth_data)
+                                 X11AuthData *auth_data)
 {
-	X11UnspoofingFilterClosure FAR *closure =
+	X11UnspoofingFilterClosure *closure =
 		malloc(sizeof(X11UnspoofingFilterClosure));
 
 	closure->pvar = pvar;
@@ -162,9 +162,9 @@
 #define MERGE_GOT_GOOD_DATA 1
 #define MERGE_GOT_BAD_DATA  2
 
-static int merge_into_X11_init_packet(X11UnspoofingFilterClosure FAR *
+static int merge_into_X11_init_packet(X11UnspoofingFilterClosure *
                                       closure, int length,
-                                      unsigned char FAR * buf)
+                                      unsigned char *buf)
 {
 	buf_ensure_size_growing(&closure->init_buf, &closure->init_buf_len,
 	                        closure->init_data_len + length);
@@ -214,9 +214,9 @@
 	}
 }
 
-static void insert_real_X11_auth_data(X11UnspoofingFilterClosure FAR *
-                                      closure, int FAR * length,
-                                      unsigned char FAR * FAR * buf)
+static void insert_real_X11_auth_data(X11UnspoofingFilterClosure *
+                                      closure, int *length,
+                                      unsigned char **buf)
 {
 	int name_len = closure->auth_data->local_protocol == NULL
 		? 0 : strlen(closure->auth_data->local_protocol);
@@ -248,11 +248,11 @@
 	       data_len);
 }
 
-int X11_unspoofing_filter(void FAR * void_closure, int direction,
-                          int FAR * length, unsigned char FAR * FAR * buf)
+int X11_unspoofing_filter(void *void_closure, int direction,
+                          int *length, unsigned char **buf)
 {
-	X11UnspoofingFilterClosure FAR *closure =
-		(X11UnspoofingFilterClosure FAR *) void_closure;
+	X11UnspoofingFilterClosure *closure =
+		(X11UnspoofingFilterClosure *) void_closure;
 
 	if (length == NULL) {
 		buf_destroy(&closure->init_buf, &closure->init_buf_len);

Modified: trunk/ttssh2/ttxssh/x11util.h
===================================================================
--- trunk/ttssh2/ttxssh/x11util.h	2017-06-12 10:43:31 UTC (rev 6800)
+++ trunk/ttssh2/ttxssh/x11util.h	2017-06-13 10:30:12 UTC (rev 6801)
@@ -37,11 +37,11 @@
 #include "ttxssh.h"
 
 typedef struct _X11AuthData {
-  char FAR * local_protocol;
-  unsigned char FAR * local_data;
+  char *local_protocol;
+  unsigned char *local_data;
   int local_data_len;
-  char FAR * spoofed_protocol;
-  unsigned char FAR * spoofed_data;
+  char *spoofed_protocol;
+  unsigned char *spoofed_data;
   int spoofed_data_len;
 } X11AuthData;
 
@@ -49,12 +49,12 @@
 #define X11_get_spoofed_protocol_data(d) ((d)->spoofed_data)
 #define X11_get_spoofed_protocol_data_len(d) ((d)->spoofed_data_len)
 
-void X11_get_DISPLAY_info(PTInstVar pvar, char FAR * name_buf, int name_buf_len, int FAR * port, int FAR * screen);
-X11AuthData FAR * X11_load_local_auth_data(int screen_num);
-void FAR * X11_init_unspoofing_filter(struct _TInstVar FAR * pvar,
-  X11AuthData FAR * auth_data);
-int X11_unspoofing_filter(void FAR * closure, int direction,
-  int FAR * length, unsigned char FAR * FAR * buf);
-void X11_dispose_auth_data(X11AuthData FAR * auth_data);
+void X11_get_DISPLAY_info(PTInstVar pvar, char *name_buf, int name_buf_len, int *port, int *screen);
+X11AuthData *X11_load_local_auth_data(int screen_num);
+void *X11_init_unspoofing_filter(struct _TInstVar *pvar,
+  X11AuthData *auth_data);
+int X11_unspoofing_filter(void *closure, int direction,
+  int *length, unsigned char **buf);
+void X11_dispose_auth_data(X11AuthData *auth_data);
 
 #endif

From svnnotify ＠ sourceforge.jp  Tue Jun 13 19:42:55 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 13 Jun 2017 19:42:55 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY4MDJdICDjgqTjg7Pjg4fjg7Pjg4jlpIk=?=
 =?utf-8?b?5pu0?=
Message-ID: <1497350575.254428.7044.nullmailer@users.sourceforge.jp>

Revision: 6802
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6802
Author:   doda
Date:     2017-06-13 19:42:54 +0900 (Tue, 13 Jun 2017)
Log Message:
-----------
インデント変更

Modified Paths:
--------------
    trunk/teraterm/teraterm/vtterm.c

-------------- next part --------------
Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c	2017-06-13 10:30:12 UTC (rev 6801)
+++ trunk/teraterm/teraterm/vtterm.c	2017-06-13 10:42:54 UTC (rev 6802)
@@ -80,11 +80,11 @@
 
 // save/restore cursor
 typedef struct {
-  int CursorX, CursorY;
-  TCharAttr Attr;
-  int Glr[2], Gn[4]; // G0-G3, GL & GR
-  BOOL AutoWrapMode;
-  BOOL RelativeOrgMode;
+	int CursorX, CursorY;
+	TCharAttr Attr;
+	int Glr[2], Gn[4]; // G0-G3, GL & GR
+	BOOL AutoWrapMode;
+	BOOL RelativeOrgMode;
 } TStatusBuff;
 typedef TStatusBuff *PStatusBuff;
 
@@ -112,8 +112,8 @@
 static int ChangeEmu;
 
 typedef struct tstack {
-    char *title;
-    struct tstack *next;
+	char *title;
+	struct tstack *next;
 } TStack;
 typedef TStack *PTStack;
 PTStack TitleStack = NULL;
@@ -144,7 +144,7 @@
 static BOOL MainCursor=TRUE;
 
 /* status for printer escape sequences */
-static BOOL PrintEX = TRUE;  // printing extent
+static BOOL PrintEX = TRUE; // printing extent
 			    // (TRUE: screen, FALSE: scroll region)
 static BOOL AutoPrintMode = FALSE;
 static BOOL PrinterMode = FALSE;
@@ -174,241 +174,239 @@
 
 void ClearParams()
 {
-    ICount = 0;
-    NParam = 1;
-    NSParam[1] = 0;
-    Param[1] = 0;
-    Prv = 0;
+	ICount = 0;
+	NParam = 1;
+	NSParam[1] = 0;
+	Param[1] = 0;
+	Prv = 0;
 }
 
 void ResetSBuffer(PStatusBuff sbuff)
 {
-  sbuff->CursorX = 0;
-  sbuff->CursorY = 0;
-  sbuff->Attr = DefCharAttr;
-  if (ts.Language==IdJapanese)
-  {
-    sbuff->Gn[0] = IdASCII;
-    sbuff->Gn[1] = IdKatakana;
-    sbuff->Gn[2] = IdKatakana;
-    sbuff->Gn[3] = IdKanji;
-    sbuff->Glr[0] = 0;
-    if ((ts.KanjiCode==IdJIS) &&
-	(ts.JIS7Katakana==0))
-      sbuff->Glr[1] = 2;  // 8-bit katakana
-    else
-      sbuff->Glr[1] = 3;
-  }
-  else {
-    sbuff->Gn[0] = IdASCII;
-    sbuff->Gn[1] = IdSpecial;
-    sbuff->Gn[2] = IdASCII;
-    sbuff->Gn[3] = IdASCII;
-    sbuff->Glr[0] = 0;
-    sbuff->Glr[1] = 0;
-  }
-  sbuff->AutoWrapMode = TRUE;
-  sbuff->RelativeOrgMode = FALSE;
+	sbuff->CursorX = 0;
+	sbuff->CursorY = 0;
+	sbuff->Attr = DefCharAttr;
+	if (ts.Language==IdJapanese) {
+		sbuff->Gn[0] = IdASCII;
+		sbuff->Gn[1] = IdKatakana;
+		sbuff->Gn[2] = IdKatakana;
+		sbuff->Gn[3] = IdKanji;
+		sbuff->Glr[0] = 0;
+		if ((ts.KanjiCode==IdJIS) && (ts.JIS7Katakana==0))
+			sbuff->Glr[1] = 2;	// 8-bit katakana
+		else
+			sbuff->Glr[1] = 3;
+	}
+	else {
+		sbuff->Gn[0] = IdASCII;
+		sbuff->Gn[1] = IdSpecial;
+		sbuff->Gn[2] = IdASCII;
+		sbuff->Gn[3] = IdASCII;
+		sbuff->Glr[0] = 0;
+		sbuff->Glr[1] = 0;
+	}
+	sbuff->AutoWrapMode = TRUE;
+	sbuff->RelativeOrgMode = FALSE;
 }
 
 void ResetAllSBuffers()
 {
-  ResetSBuffer(&SBuff1);
-  // copy SBuff1 to SBuff2
-  SBuff2 = SBuff1;
-  SBuff3 = SBuff1;
+	ResetSBuffer(&SBuff1);
+	// copy SBuff1 to SBuff2
+	SBuff2 = SBuff1;
+	SBuff3 = SBuff1;
 }
 
 void ResetCurSBuffer()
 {
-    PStatusBuff Buff;
+	PStatusBuff Buff;
 
-    if (AltScr) {
-	Buff = &SBuff3; // Alternate screen buffer
-    }
-    else {
-	Buff = &SBuff1; // Normal screen buffer
-    }
-    ResetSBuffer(Buff);
-    SBuff2 = *Buff;
+	if (AltScr) {
+		Buff = &SBuff3; // Alternate screen buffer
+	}
+	else {
+		Buff = &SBuff1; // Normal screen buffer
+	}
+	ResetSBuffer(Buff);
+	SBuff2 = *Buff;
 }
 
 void ResetTerminal() /*reset variables but don't update screen */
 {
-  DispReset();
-  BuffReset();
+	DispReset();
+	BuffReset();
 
-  /* Attribute */
-  CharAttr = DefCharAttr;
-  Special = FALSE;
-  BuffSetCurCharAttr(CharAttr);
+	/* Attribute */
+	CharAttr = DefCharAttr;
+	Special = FALSE;
+	BuffSetCurCharAttr(CharAttr);
 
-  /* Various modes */
-  InsertMode = FALSE;
-  LFMode = (ts.CRSend == IdCRLF);
-  AutoWrapMode = TRUE;
-  AppliKeyMode = FALSE;
-  AppliCursorMode = FALSE;
-  AppliEscapeMode = FALSE;
-  AcceptWheelToCursor = ts.TranslateWheelToCursor;
-  RelativeOrgMode = FALSE;
-  ts.ColorFlag &= ~CF_REVERSEVIDEO;
-  AutoRepeatMode = TRUE;
-  FocusReportMode = FALSE;
-  MouseReportMode = IdMouseTrackNone;
-  MouseReportExtMode = IdMouseTrackExtNone;
-  DecLocatorFlag = 0;
-  ClearThenHome = FALSE;
+	/* Various modes */
+	InsertMode = FALSE;
+	LFMode = (ts.CRSend == IdCRLF);
+	AutoWrapMode = TRUE;
+	AppliKeyMode = FALSE;
+	AppliCursorMode = FALSE;
+	AppliEscapeMode = FALSE;
+	AcceptWheelToCursor = ts.TranslateWheelToCursor;
+	RelativeOrgMode = FALSE;
+	ts.ColorFlag &= ~CF_REVERSEVIDEO;
+	AutoRepeatMode = TRUE;
+	FocusReportMode = FALSE;
+	MouseReportMode = IdMouseTrackNone;
+	MouseReportExtMode = IdMouseTrackExtNone;
+	DecLocatorFlag = 0;
+	ClearThenHome = FALSE;
 
-  ChangeTerminalID();
+	ChangeTerminalID();
 
-  LastX = 0;
-  LastY = 0;
-  ButtonStat = 0;
+	LastX = 0;
+	LastY = 0;
+	ButtonStat = 0;
 
-  if (CLocale == NULL) {
-    CLocale = _create_locale(LC_ALL, "C");
-  }
+	if (CLocale == NULL) {
+		CLocale = _create_locale(LC_ALL, "C");
+	}
 
-  /* Character sets */
-  ResetCharSet();
+	/* Character sets */
+	ResetCharSet();
 
-  /* ESC flag for device control sequence */
-  ESCFlag = FALSE;
-  /* for TEK sequence */
-  JustAfterESC = FALSE;
+	/* ESC flag for device control sequence */
+	ESCFlag = FALSE;
+	/* for TEK sequence */
+	JustAfterESC = FALSE;
 
-  /* Parse mode */
-  ParseMode = ModeFirst;
+	/* Parse mode */
+	ParseMode = ModeFirst;
 
-  /* Clear printer mode */
-  PrinterMode = FALSE;
+	/* Clear printer mode */
+	PrinterMode = FALSE;
 
-  // status buffers
-  ResetAllSBuffers();
+	// status buffers
+	ResetAllSBuffers();
 
-  // Alternate Screen Buffer
-  AltScr = FALSE;
+	// Alternate Screen Buffer
+	AltScr = FALSE;
 
-  // Left/Right Margin Mode
-  LRMarginMode = FALSE;
+	// Left/Right Margin Mode
+	LRMarginMode = FALSE;
 
-  // Bracketed Paste Mode
-  BracketedPaste = FALSE;
+	// Bracketed Paste Mode
+	BracketedPaste = FALSE;
 
-  // Saved IME Status
-  IMEstat = FALSE;
+	// Saved IME Status
+	IMEstat = FALSE;
 
-  // previous received character
-  PrevCharacter = -1;	// none
-  PrevCRorLFGeneratedCRLF = FALSE;
+	// previous received character
+	PrevCharacter = -1;	// none
+	PrevCRorLFGeneratedCRLF = FALSE;
 
-  // Beep over-used
-  BeepStartTime = GetTickCount();
-  BeepSuppressTime = BeepStartTime - ts.BeepSuppressTime * 1000;
-  BeepStartTime -= (ts.BeepOverUsedTime * 1000);
-  BeepOverUsedCount = ts.BeepOverUsedCount;
+	// Beep over-used
+	BeepStartTime = GetTickCount();
+	BeepSuppressTime = BeepStartTime - ts.BeepSuppressTime * 1000;
+	BeepStartTime -= (ts.BeepOverUsedTime * 1000);
+	BeepOverUsedCount = ts.BeepOverUsedCount;
 }
 
 void ResetCharSet()
 {
-  if (ts.Language==IdJapanese)
-  {
-    Gn[0] = IdASCII;
-    Gn[1] = IdKatakana;
-    Gn[2] = IdKatakana;
-    Gn[3] = IdKanji;
-    Glr[0] = 0;
-    if ((ts.KanjiCode==IdJIS) &&
-	(ts.JIS7Katakana==0))
-      Glr[1] = 2;  // 8-bit katakana
-    else
-      Glr[1] = 3;
-  }
-  else {
-    Gn[0] = IdASCII;
-    Gn[1] = IdSpecial;
-    Gn[2] = IdASCII;
-    Gn[3] = IdASCII;
-    Glr[0] = 0;
-    Glr[1] = 0;
-    cv.SendCode = IdASCII;
-    cv.SendKanjiFlag = FALSE;
-    cv.EchoCode = IdASCII;
-    cv.EchoKanjiFlag = FALSE;
-  }
-  /* Kanji flag */
-  KanjiIn = FALSE;
-  EUCkanaIn = FALSE;
-  EUCsupIn = FALSE;
-  SSflag = FALSE;
-  ConvJIS = FALSE;
-  Fallbacked = FALSE;
+	if (ts.Language==IdJapanese) {
+		Gn[0] = IdASCII;
+		Gn[1] = IdKatakana;
+		Gn[2] = IdKatakana;
+		Gn[3] = IdKanji;
+		Glr[0] = 0;
+		if ((ts.KanjiCode==IdJIS) && (ts.JIS7Katakana==0))
+			Glr[1] = 2;	// 8-bit katakana
+		else
+			Glr[1] = 3;
+	}
+	else {
+		Gn[0] = IdASCII;
+		Gn[1] = IdSpecial;
+		Gn[2] = IdASCII;
+		Gn[3] = IdASCII;
+		Glr[0] = 0;
+		Glr[1] = 0;
+		cv.SendCode = IdASCII;
+		cv.SendKanjiFlag = FALSE;
+		cv.EchoCode = IdASCII;
+		cv.EchoKanjiFlag = FALSE;
+	}
+	/* Kanji flag */
+	KanjiIn = FALSE;
+	EUCkanaIn = FALSE;
+	EUCsupIn = FALSE;
+	SSflag = FALSE;
+	ConvJIS = FALSE;
+	Fallbacked = FALSE;
 
-  cv.Language = ts.Language;
-  cv.CRSend = ts.CRSend;
-  cv.KanjiCodeEcho = ts.KanjiCode;
-  cv.JIS7KatakanaEcho = ts.JIS7Katakana;
-  cv.KanjiCodeSend = ts.KanjiCodeSend;
-  cv.JIS7KatakanaSend = ts.JIS7KatakanaSend;
-  cv.KanjiIn = ts.KanjiIn;
-  cv.KanjiOut = ts.KanjiOut;
+	cv.Language = ts.Language;
+	cv.CRSend = ts.CRSend;
+	cv.KanjiCodeEcho = ts.KanjiCode;
+	cv.JIS7KatakanaEcho = ts.JIS7Katakana;
+	cv.KanjiCodeSend = ts.KanjiCodeSend;
+	cv.JIS7KatakanaSend = ts.JIS7KatakanaSend;
+	cv.KanjiIn = ts.KanjiIn;
+	cv.KanjiOut = ts.KanjiOut;
 }
 
 void ResetKeypadMode(BOOL DisabledModeOnly)
 {
-  if (!DisabledModeOnly || ts.DisableAppKeypad) AppliKeyMode = FALSE;
-  if (!DisabledModeOnly || ts.DisableAppCursor) AppliCursorMode = FALSE;
+	if (!DisabledModeOnly || ts.DisableAppKeypad)
+		AppliKeyMode = FALSE;
+	if (!DisabledModeOnly || ts.DisableAppCursor)
+		AppliCursorMode = FALSE;
 }
 
 void MoveToMainScreen()
 {
-  StatusX = CursorX;
-  StatusWrap = Wrap;
-  StatusCursor = IsCaretEnabled();
+	StatusX = CursorX;
+	StatusWrap = Wrap;
+	StatusCursor = IsCaretEnabled();
 
-  CursorTop = MainTop;
-  CursorBottom = MainBottom;
-  Wrap = MainWrap;
-  DispEnableCaret(MainCursor);
-  MoveCursor(MainX,MainY); // move to main screen
+	CursorTop = MainTop;
+	CursorBottom = MainBottom;
+	Wrap = MainWrap;
+	DispEnableCaret(MainCursor);
+	MoveCursor(MainX, MainY); // move to main screen
 }
 
 void MoveToStatusLine()
 {
-  MainX = CursorX;
-  MainY = CursorY;
-  MainTop = CursorTop;
-  MainBottom = CursorBottom;
-  MainWrap = Wrap;
-  MainCursor = IsCaretEnabled();
+	MainX = CursorX;
+	MainY = CursorY;
+	MainTop = CursorTop;
+	MainBottom = CursorBottom;
+	MainWrap = Wrap;
+	MainCursor = IsCaretEnabled();
 
-  DispEnableCaret(StatusCursor);
-  MoveCursor(StatusX,NumOfLines-1); // move to status line
-  CursorTop = NumOfLines-1;
-  CursorBottom = CursorTop;
-  Wrap = StatusWrap;
+	DispEnableCaret(StatusCursor);
+	MoveCursor(StatusX, NumOfLines-1); // move to status line
+	CursorTop = NumOfLines-1;
+	CursorBottom = CursorTop;
+	Wrap = StatusWrap;
 }
 
 void HideStatusLine()
 {
-  if (isCursorOnStatusLine)
-    MoveToMainScreen();
-  StatusX = 0;
-  StatusWrap = FALSE;
-  StatusCursor = TRUE;
-  ShowStatusLine(0); //hide
+	if (isCursorOnStatusLine)
+		MoveToMainScreen();
+	StatusX = 0;
+	StatusWrap = FALSE;
+	StatusCursor = TRUE;
+	ShowStatusLine(0); //hide
 }
 
 void ChangeTerminalSize(int Nx, int Ny)
 {
-  BuffChangeTerminalSize(Nx,Ny);
-  StatusX = 0;
-  MainX = 0;
-  MainY = 0;
-  MainTop = 0;
-  MainBottom = NumOfColumns-1;
-  LRMarginMode = FALSE;
+	BuffChangeTerminalSize(Nx, Ny);
+	StatusX = 0;
+	MainX = 0;
+	MainY = 0;
+	MainTop = 0;
+	MainBottom = NumOfColumns-1;
+	LRMarginMode = FALSE;
 }
 
 void SendCSIstr(char *str, int len) {
@@ -508,7 +506,7 @@
 #ifndef NO_COPYLINE_FIX
 	if (!ts.EnableContinuedLineCopy || logFlag)
 #endif /* NO_COPYLINE_FIX */
-        if (cv.HLogBuf!=0) Log1Byte(CR);
+	if (cv.HLogBuf!=0) Log1Byte(CR);
 
 	if (RelativeOrgMode || CursorX > CursorLeftM)
 		MoveCursor(CursorLeftM, CursorY);
@@ -547,230 +545,219 @@
 
 void Tab()
 {
-  if (Wrap && !ts.VTCompatTab) {
-      CarriageReturn(FALSE);
-      LineFeed(LF,FALSE);
+	if (Wrap && !ts.VTCompatTab) {
+		CarriageReturn(FALSE);
+		LineFeed(LF,FALSE);
 #ifndef NO_COPYLINE_FIX
-      if (ts.EnableContinuedLineCopy) {
-	SetLineContinued();
-      }
+		if (ts.EnableContinuedLineCopy) {
+			SetLineContinued();
+		}
 #endif /* NO_COPYLINE_FIX */
-      Wrap = FALSE;
-  }
-  CursorForwardTab(1, AutoWrapMode);
-  if (cv.HLogBuf!=0) Log1Byte(HT);
+		Wrap = FALSE;
+	}
+	CursorForwardTab(1, AutoWrapMode);
+	if (cv.HLogBuf!=0) Log1Byte(HT);
 }
 
 void PutChar(BYTE b)
 {
-  BOOL SpecialNew;
-  TCharAttr CharAttrTmp;
+	BOOL SpecialNew;
+	TCharAttr CharAttrTmp;
 
-  CharAttrTmp = CharAttr;
+	CharAttrTmp = CharAttr;
 
-  if (PrinterMode) { // printer mode
-    WriteToPrnFile(b,TRUE);
-    return;
-  }
+	if (PrinterMode) { // printer mode
+		WriteToPrnFile(b,TRUE);
+		return;
+	}
 
-  if (Wrap)
-  {
-    CarriageReturn(FALSE);
-    LineFeed(LF,FALSE);
+	if (Wrap) {
+		CarriageReturn(FALSE);
+		LineFeed(LF,FALSE);
 #ifndef NO_COPYLINE_FIX
-    CharAttrTmp.Attr |= ts.EnableContinuedLineCopy ? AttrLineContinued : 0;
+		CharAttrTmp.Attr |= ts.EnableContinuedLineCopy ? AttrLineContinued : 0;
 #endif /* NO_COPYLINE_FIX */
-  }
+	}
 
-//  if (cv.HLogBuf!=0) Log1Byte(b);
+//	if (cv.HLogBuf!=0) Log1Byte(b);
 // (2005.2.20 yutaka)
-  if (ts.LogTypePlainText) {
-	  if (__isascii(b) && !isprint(b)) {
-		  // ASCII\x95\xB6\x8E\x9A\x82ŁA\x94\xF1\x95\\x8E\xA6\x82?\xB6\x8E\x9A\x82?\x8D\x83O\x8D?悵\x82?\xA2\x81B
-	  } else {
+	if (ts.LogTypePlainText) {
+		if (__isascii(b) && !isprint(b)) {
+			// ASCII\x95\xB6\x8E\x9A\x82ŁA\x94\xF1\x95\\x8E\xA6\x82?\xB6\x8E\x9A\x82?\x8D\x83O\x8D?悵\x82?\xA2\x81B
+		} else {
+			if (cv.HLogBuf!=0) Log1Byte(b);
+		}
+	} else {
 		if (cv.HLogBuf!=0) Log1Byte(b);
-	  }
-  } else {
-	  if (cv.HLogBuf!=0) Log1Byte(b);
-  }
+	}
 
-  Wrap = FALSE;
+	Wrap = FALSE;
 
-  SpecialNew = FALSE;
-  if ((b>0x5F) && (b<0x80))
-  {
-    if (SSflag)
-      SpecialNew = (Gn[GLtmp]==IdSpecial);
-    else
-      SpecialNew = (Gn[Glr[0]]==IdSpecial);
-  }
-  else if (b>0xDF)
-  {
-    if (SSflag)
-      SpecialNew = (Gn[GLtmp]==IdSpecial);
-    else
-      SpecialNew = (Gn[Glr[1]]==IdSpecial);
-  }
+	SpecialNew = FALSE;
+	if ((b>0x5F) && (b<0x80)) {
+		if (SSflag)
+			SpecialNew = (Gn[GLtmp]==IdSpecial);
+		else
+			SpecialNew = (Gn[Glr[0]]==IdSpecial);
+	}
+	else if (b>0xDF) {
+		if (SSflag)
+			SpecialNew = (Gn[GLtmp]==IdSpecial);
+		else
+			SpecialNew = (Gn[Glr[1]]==IdSpecial);
+	}
 
-  if (SpecialNew != Special)
-  {
-    UpdateStr();
-    Special = SpecialNew;
-  }
+	if (SpecialNew != Special) {
+		UpdateStr();
+		Special = SpecialNew;
+	}
 
-  if (Special)
-  {
-    b = b & 0x7F;
-    CharAttrTmp.Attr |= AttrSpecial;
-  }
-  else
-    CharAttrTmp.Attr |= CharAttr.Attr;
+	if (Special) {
+		b = b & 0x7F;
+		CharAttrTmp.Attr |= AttrSpecial;
+	}
+	else
+		CharAttrTmp.Attr |= CharAttr.Attr;
 
-  BuffPutChar(b, CharAttrTmp, InsertMode);
+	BuffPutChar(b, CharAttrTmp, InsertMode);
 
-  if (CursorX == CursorRightM || CursorX >= NumOfColumns-1) {
-    UpdateStr();
-    Wrap = AutoWrapMode;
-  }
-  else {
-    MoveRight();
-  }
+	if (CursorX == CursorRightM || CursorX >= NumOfColumns-1) {
+		UpdateStr();
+		Wrap = AutoWrapMode;
+	}
+	else {
+		MoveRight();
+	}
 }
 
 void PutDecSp(BYTE b)
 {
-  TCharAttr CharAttrTmp;
+	TCharAttr CharAttrTmp;
 
-  CharAttrTmp = CharAttr;
+	CharAttrTmp = CharAttr;
 
-  if (PrinterMode) { // printer mode
-    WriteToPrnFile(b, TRUE);
-    return;
-  }
+	if (PrinterMode) { // printer mode
+		WriteToPrnFile(b, TRUE);
+		return;
+	}
 
-  if (Wrap) {
-    CarriageReturn(FALSE);
-    LineFeed(LF, FALSE);
+	if (Wrap) {
+		CarriageReturn(FALSE);
+		LineFeed(LF, FALSE);
 #ifndef NO_COPYLINE_FIX
-    CharAttrTmp.Attr |= ts.EnableContinuedLineCopy ? AttrLineContinued : 0;
+		CharAttrTmp.Attr |= ts.EnableContinuedLineCopy ? AttrLineContinued : 0;
 #endif /* NO_COPYLINE_FIX */
-  }
+	}
 
-  if (cv.HLogBuf!=0) Log1Byte(b);
+	if (cv.HLogBuf!=0) Log1Byte(b);
 /*
-  if (ts.LogTypePlainText && __isascii(b) && !isprint(b)) {
-    // ASCII\x95\xB6\x8E\x9A\x82ŁA\x94\xF1\x95\\x8E\xA6\x82?\xB6\x8E\x9A\x82?\x8D\x83O\x8D?悵\x82?\xA2\x81B
-  } else {
-    if (cv.HLogBuf!=0) Log1Byte(b);
-  }
+	if (ts.LogTypePlainText && __isascii(b) && !isprint(b)) {
+		// ASCII\x95\xB6\x8E\x9A\x82ŁA\x94\xF1\x95\\x8E\xA6\x82?\xB6\x8E\x9A\x82?\x8D\x83O\x8D?悵\x82?\xA2\x81B
+	} else {
+		if (cv.HLogBuf!=0) Log1Byte(b);
+	}
  */
 
-  Wrap = FALSE;
+	Wrap = FALSE;
 
-  if (!Special) {
-    UpdateStr();
-    Special = TRUE;
-  }
+	if (!Special) {
+		UpdateStr();
+		Special = TRUE;
+	}
 
-  CharAttrTmp.Attr |= AttrSpecial;
-  BuffPutChar(b, CharAttrTmp, InsertMode);
+	CharAttrTmp.Attr |= AttrSpecial;
+	BuffPutChar(b, CharAttrTmp, InsertMode);
 
-  if (CursorX == CursorRightM || CursorX >= NumOfColumns-1) {
-    UpdateStr();
-    Wrap = AutoWrapMode;
-  }
-  else {
-    MoveRight();
-  }
+	if (CursorX == CursorRightM || CursorX >= NumOfColumns-1) {
+		UpdateStr();
+		Wrap = AutoWrapMode;
+	}
+	else {
+		MoveRight();
+	}
 }
 
 void PutKanji(BYTE b)
 {
-  int LineEnd;
+	int LineEnd;
 #ifndef NO_COPYLINE_FIX
-  TCharAttr CharAttrTmp;
+	TCharAttr CharAttrTmp;
 
-  CharAttrTmp = CharAttr;
+	CharAttrTmp = CharAttr;
 #endif /* NO_COPYLINE_FIX */
-  Kanji = Kanji + b;
+	Kanji = Kanji + b;
 
-  if (PrinterMode && DirectPrn)
-  {
-    WriteToPrnFile(HIBYTE(Kanji),FALSE);
-    WriteToPrnFile(LOBYTE(Kanji),TRUE);
-    return;
-  }
+	if (PrinterMode && DirectPrn) {
+		WriteToPrnFile(HIBYTE(Kanji),FALSE);
+		WriteToPrnFile(LOBYTE(Kanji),TRUE);
+		return;
+	}
 
-  if (ConvJIS)
-    Kanji = JIS2SJIS((WORD)(Kanji & 0x7f7f));
+	if (ConvJIS)
+		Kanji = JIS2SJIS((WORD)(Kanji & 0x7f7f));
 
-  if (PrinterMode) { // printer mode
-    WriteToPrnFile(HIBYTE(Kanji),FALSE);
-    WriteToPrnFile(LOBYTE(Kanji),TRUE);
-    return;
-  }
+	if (PrinterMode) { // printer mode
+		WriteToPrnFile(HIBYTE(Kanji),FALSE);
+		WriteToPrnFile(LOBYTE(Kanji),TRUE);
+		return;
+	}
 
-  if (CursorX > CursorRightM)
-    LineEnd = NumOfColumns - 1;
-  else
-    LineEnd = CursorRightM;
+	if (CursorX > CursorRightM)
+		LineEnd = NumOfColumns - 1;
+	else
+		LineEnd = CursorRightM;
 
-  if (Wrap)
-  {
-    CarriageReturn(FALSE);
-    LineFeed(LF,FALSE);
+	if (Wrap) {
+		CarriageReturn(FALSE);
+		LineFeed(LF,FALSE);
 #ifndef NO_COPYLINE_FIX
-    if (ts.EnableContinuedLineCopy)
-      CharAttrTmp.Attr |= AttrLineContinued;
+		if (ts.EnableContinuedLineCopy)
+			CharAttrTmp.Attr |= AttrLineContinued;
 #endif /* NO_COPYLINE_FIX */
-  }
-  else if (CursorX > LineEnd - 1) {
-    if (AutoWrapMode)
-    {
+	}
+	else if (CursorX > LineEnd - 1) {
+		if (AutoWrapMode) {
 #ifndef NO_COPYLINE_FIX
-      if (ts.EnableContinuedLineCopy)
-      {
-      CharAttrTmp.Attr |= AttrLineContinued;
-      if (CursorX == LineEnd)
-	BuffPutChar(0x20, CharAttr, FALSE);
-      }
+			if (ts.EnableContinuedLineCopy) {
+				CharAttrTmp.Attr |= AttrLineContinued;
+				if (CursorX == LineEnd)
+					BuffPutChar(0x20, CharAttr, FALSE);
+			}
 #endif /* NO_COPYLINE_FIX */
-      CarriageReturn(FALSE);
-      LineFeed(LF,FALSE);
-    }
-    else {
-      return;
-    }
-  }
+			CarriageReturn(FALSE);
+			LineFeed(LF,FALSE);
+		}
+		else {
+			return;
+		}
+	}
 
-  Wrap = FALSE;
+	Wrap = FALSE;
 
-  if (cv.HLogBuf!=0)
-  {
-    Log1Byte(HIBYTE(Kanji));
-    Log1Byte(LOBYTE(Kanji));
-  }
+	if (cv.HLogBuf!=0) {
+		Log1Byte(HIBYTE(Kanji));
+		Log1Byte(LOBYTE(Kanji));
+	}
 
-  if (Special)
-  {
-    UpdateStr();
-    Special = FALSE;
-  }
+	if (Special) {
+		UpdateStr();
+		Special = FALSE;
+	}
 
 #ifndef NO_COPYLINE_FIX
-  BuffPutKanji(Kanji, CharAttrTmp, InsertMode);
+	BuffPutKanji(Kanji, CharAttrTmp, InsertMode);
 #else
-  BuffPutKanji(Kanji, CharAttr, InsertMode);
+	BuffPutKanji(Kanji, CharAttr, InsertMode);
 #endif /* NO_COPYLINE_FIX */
 
-  if (CursorX < LineEnd - 1) {
-    MoveRight();
-    MoveRight();
-  }
-  else {
-    UpdateStr();
-    Wrap = AutoWrapMode;
-  }
+	if (CursorX < LineEnd - 1) {
+		MoveRight();
+		MoveRight();
+	}
+	else {
+		UpdateStr();
+		Wrap = AutoWrapMode;
+	}
 }
 
 void PutDebugChar(BYTE b)
@@ -833,90 +820,93 @@
 
 void PrnParseControl(BYTE b) // printer mode
 {
-  switch (b) {
-    case NUL: return;
-    case SO:
-      if (! DirectPrn)
-      {
-	if ((ts.Language==IdJapanese) &&
-	    (ts.KanjiCode==IdJIS) &&
-	    (ts.JIS7Katakana==1) &&
-	    ((ts.TermFlag & TF_FIXEDJIS)!=0))
-	  Gn[1] = IdKatakana;
-	Glr[0] = 1; /* LS1 */
-	return;
-      }
-      break;
-    case SI:
-      if (! DirectPrn)
-      {
-	Glr[0] = 0; /* LS0 */
-	return;
-      }
-      break;
-    case DC1:
-    case DC3: return;
-    case ESC:
-      ICount = 0;
-      JustAfterESC = TRUE;
-      ParseMode = ModeESC;
-      WriteToPrnFile(0,TRUE); // flush prn buff
-      return;
-    case CSI:
-      if (! Accept8BitCtrl) {
-	PutChar(b); /* Disp C1 char in VT100 mode */
-	return;
-      }
-      ClearParams();
-      FirstPrm = TRUE;
-      ParseMode = ModeCSI;
-      WriteToPrnFile(0,TRUE); // flush prn buff
-      WriteToPrnFile(b,FALSE);
-      return;
-  }
-  /* send the uninterpreted character to printer */
-  WriteToPrnFile(b,TRUE);
+	switch (b) {
+	case NUL:
+		return;
+	case SO:
+		if (! DirectPrn) {
+			if ((ts.Language==IdJapanese) &&
+			    (ts.KanjiCode==IdJIS) &&
+			    (ts.JIS7Katakana==1) &&
+			    ((ts.TermFlag & TF_FIXEDJIS)!=0))
+			{
+				Gn[1] = IdKatakana;
+			}
+			Glr[0] = 1; /* LS1 */
+			return;
+		}
+		break;
+	case SI:
+		if (! DirectPrn) {
+			Glr[0] = 0; /* LS0 */
+			return;
+		}
+		break;
+	case DC1:
+	case DC3:
+		return;
+	case ESC:
+		ICount = 0;
+		JustAfterESC = TRUE;
+		ParseMode = ModeESC;
+		WriteToPrnFile(0, TRUE); // flush prn buff
+		return;
+	case CSI:
+		if (! Accept8BitCtrl) {
+			PutChar(b); /* Disp C1 char in VT100 mode */
+			return;
+		}
+		ClearParams();
+		FirstPrm = TRUE;
+		ParseMode = ModeCSI;
+		WriteToPrnFile(0, TRUE); // flush prn buff
+		WriteToPrnFile(b, FALSE);
+		return;
+	}
+	/* send the uninterpreted character to printer */
+	WriteToPrnFile(b, TRUE);
 }
 
 void ParseControl(BYTE b)
 {
-  if (PrinterMode) { // printer mode
-    PrnParseControl(b);
-    return;
-  }
+	if (PrinterMode) { // printer mode
+		PrnParseControl(b);
+		return;
+	}
 
-  if (b>=0x80) /* C1 char */
-  {
-    /* English mode */
-    if (ts.Language==IdEnglish)
-    {
-      if (!Accept8BitCtrl) {
-	PutChar(b); /* Disp C1 char in VT100 mode */
-	return;
-      }
-    }
-    else { /* Japanese mode */
-      if ((ts.TermFlag & TF_ACCEPT8BITCTRL)==0)
-	return; /* ignore C1 char */
-      /* C1 chars are interpreted as C0 chars in VT100 mode */
-      if (VTlevel < 2)
-	b = b & 0x7F;
-    }
-  }
-  switch (b) {
-    /* C0 group */
-    case ENQ:
-      CommBinaryOut(&cv,&(ts.Answerback[0]),ts.AnswerbackLen);
-      break;
-    case BEL:
-      if (ts.Beep != IdBeepOff) {
-	RingBell(ts.Beep);
-      }
-      break;
-    case BS: BackSpace(); break;
-    case HT: Tab(); break;
-
-    case LF:
+	if (b>=0x80) { /* C1 char */
+		if (ts.Language==IdEnglish) { /* English mode */
+			if (!Accept8BitCtrl) {
+				PutChar(b); /* Disp C1 char in VT100 mode */
+				return;
+			}
+		}
+		else { /* Japanese mode */
+			if ((ts.TermFlag & TF_ACCEPT8BITCTRL)==0) {
+				return; /* ignore C1 char */
+			}
+			/* C1 chars are interpreted as C0 chars in VT100 mode */
+			if (VTlevel < 2) {
+				b = b & 0x7F;
+			}
+		}
+	}
+	switch (b) {
+	/* C0 group */
+	case ENQ:
+		CommBinaryOut(&cv, &(ts.Answerback[0]), ts.AnswerbackLen);
+		break;
+	case BEL:
+		if (ts.Beep != IdBeepOff)
+			RingBell(ts.Beep);
+		break;
+	case BS:
+		BackSpace();
+		break;
+	case HT:
+		Tab();
+		break;
+	case LF:
 		if (ts.CRReceive == IdLF) {
 			// \x8E\xF3\x90M\x8E\x9E\x82?\xFC\x8Ds\x83R\x81[\x83h\x82\xAA LF \x82??\x82?A\x83T\x81[\x83o\x82\xA9\x82\xE7 LF \x82??\xAA\x91\x97\x82\xE7\x82\xEA\x82Ă\xAD\x82\xE9\x82?\xBC\x92?\x81A
 			// CR+LF\x82?\xB5\x82Ĉ\xB5\x82\xA4\x82悤\x82?\xB7\x82\xE9\x81B
@@ -940,506 +930,515 @@
 			break;
 		}
 
-    case VT: LineFeed(b,TRUE); break;
+	case VT:
+		LineFeed(b, TRUE);
+		break;
 
-    case FF:
-      if ((ts.AutoWinSwitch>0) && JustAfterESC)
-      {
-	CommInsert1Byte(&cv,b);
-	CommInsert1Byte(&cv,ESC);
-	ChangeEmu = IdTEK;  /* Enter TEK Mode */
-      }
-      else
-	LineFeed(b,TRUE);
-      break;
-    case CR:
-      if (ts.CRReceive == IdAUTO) {
-	// 9th Apr 2012: AUTO CR/LF mode (tentner)
-	// a CR or LF will generated a CR+LF, if the next character is the opposite, it will be ignored
-	if(PrevCharacter != LF || !PrevCRorLFGeneratedCRLF) {
-	  CarriageReturn(TRUE);
-	  LineFeed(b, TRUE);
-	  PrevCRorLFGeneratedCRLF = TRUE;
-	}
-	else {
-	  PrevCRorLFGeneratedCRLF = FALSE;
-	}
-      }
-      else {
-	CarriageReturn(TRUE);
-	if (ts.CRReceive==IdCRLF) {
-	  CommInsert1Byte(&cv,LF);
-	}
-      }
-      break;
-    case SO:
-      if ((ts.Language==IdJapanese) &&
-	  (ts.KanjiCode==IdJIS) &&
-	  (ts.JIS7Katakana==1) &&
-	  ((ts.TermFlag & TF_FIXEDJIS)!=0))
-	Gn[1] = IdKatakana;
+	case FF:
+		if ((ts.AutoWinSwitch>0) && JustAfterESC) {
+			CommInsert1Byte(&cv, b);
+			CommInsert1Byte(&cv, ESC);
+			ChangeEmu = IdTEK;	/* Enter TEK Mode */
+		}
+		else
+			LineFeed(b, TRUE);
+		break;
+	case CR:
+		if (ts.CRReceive == IdAUTO) {
+			// 9th Apr 2012: AUTO CR/LF mode (tentner)
+			// a CR or LF will generated a CR+LF, if the next character is the opposite, it will be ignored
+			if(PrevCharacter != LF || !PrevCRorLFGeneratedCRLF) {
+				CarriageReturn(TRUE);
+				LineFeed(b, TRUE);
+				PrevCRorLFGeneratedCRLF = TRUE;
+			}
+			else {
+				PrevCRorLFGeneratedCRLF = FALSE;
+			}
+		}
+		else {
+			CarriageReturn(TRUE);
+			if (ts.CRReceive==IdCRLF) {
+				CommInsert1Byte(&cv, LF);
+			}
+		}
+		break;
+	case SO: /* LS1 */
+		if ((ts.Language==IdJapanese) &&
+		    (ts.KanjiCode==IdJIS) &&
+		    (ts.JIS7Katakana==1) &&
+		    ((ts.TermFlag & TF_FIXEDJIS)!=0))
+			Gn[1] = IdKatakana;
 
-      Glr[0] = 1; /* LS1 */
-      break;
-    case SI: Glr[0] = 0; break; /* LS0 */
-    case DLE:
-      if ((ts.FTFlag & FT_BPAUTO)!=0)
-	ParseMode = ModeDLE; /* Auto B-Plus activation */
-      break;
-    case CAN:
-      if ((ts.FTFlag & FT_ZAUTO)!=0)
-	ParseMode = ModeCAN; /* Auto ZMODEM activation */
-//	else if (ts.AutoWinSwitch>0)
-//		ChangeEmu = IdTEK;  /* Enter TEK Mode */
-      else
-	ParseMode = ModeFirst;
-      break;
-    case SUB: ParseMode = ModeFirst; break;
-    case ESC:
-      ICount = 0;
-      JustAfterESC = TRUE;
-      ParseMode = ModeESC;
-      break;
-    case FS:
-    case GS:
-    case RS:
-    case US:
-      if (ts.AutoWinSwitch>0)
-      {
-	CommInsert1Byte(&cv,b);
-	ChangeEmu = IdTEK;  /* Enter TEK Mode */
-      }
-      break;
+		Glr[0] = 1;
+		break;
+	case SI: /* LS0 */
+		Glr[0] = 0;
+		break;
+	case DLE:
+		if ((ts.FTFlag & FT_BPAUTO)!=0)
+			ParseMode = ModeDLE; /* Auto B-Plus activation */
+		break;
+	case CAN:
+		if ((ts.FTFlag & FT_ZAUTO)!=0)
+			ParseMode = ModeCAN; /* Auto ZMODEM activation */
+//		else if (ts.AutoWinSwitch>0)
+//			ChangeEmu = IdTEK;	/* Enter TEK Mode */
+		else
+			ParseMode = ModeFirst;
+		break;
+	case SUB:
+		ParseMode = ModeFirst;
+		break;
+	case ESC:
+		ICount = 0;
+		JustAfterESC = TRUE;
+		ParseMode = ModeESC;
+		break;
+	case FS:
+	case GS:
+	case RS:
+	case US:
+		if (ts.AutoWinSwitch>0) {
+			CommInsert1Byte(&cv, b);
+			ChangeEmu = IdTEK;	/* Enter TEK Mode */
+		}
+		break;
 
-    /* C1 char */
-    case IND: LineFeed(0,TRUE); break;
-    case NEL:
-      LineFeed(0,TRUE);
-      CarriageReturn(TRUE);
-      break;
-    case HTS: if (ts.TabStopFlag & TABF_HTS8) SetTabStop(); break;
-    case RI: CursorUpWithScroll(); break;
-    case SS2:
-      GLtmp = 2;
-      SSflag = TRUE;
-      break;
-    case SS3:
-      GLtmp = 3;
-      SSflag = TRUE;
-      break;
-    case DCS:
-      ClearParams();
-      ESCFlag = FALSE;
-      ParseMode = ModeDCS;
-      break;
-    case SOS:
-      ESCFlag = FALSE;
-      ParseMode = ModeIgnore;
-      break;
-    case CSI:
-      ClearParams();
-      FirstPrm = TRUE;
-      ParseMode = ModeCSI;
-      break;
-    case OSC:
-      ClearParams();
-      ParseMode = ModeXS;
-      break;
-    case PM:
-    case APC:
-      ESCFlag = FALSE;
-      ParseMode = ModeIgnore;
-      break;
-  }
+	/* C1 char */
+	case IND:
+		LineFeed(0, TRUE);
+		break;
+	case NEL:
+		LineFeed(0, TRUE);
+		CarriageReturn(TRUE);
+		break;
+	case HTS:
+		if (ts.TabStopFlag & TABF_HTS8)
+			SetTabStop();
+		break;
+	case RI:
+		CursorUpWithScroll();
+		break;
+	case SS2:
+		GLtmp = 2;
+		SSflag = TRUE;
+		break;
+	case SS3:
+		GLtmp = 3;
+		SSflag = TRUE;
+		break;
+	case DCS:
+		ClearParams();
+		ESCFlag = FALSE;
+		ParseMode = ModeDCS;
+		break;
+	case SOS:
+		ESCFlag = FALSE;
+		ParseMode = ModeIgnore;
+		break;
+	case CSI:
+		ClearParams();
+		FirstPrm = TRUE;
+		ParseMode = ModeCSI;
+		break;
+	case OSC:
+		ClearParams();
+		ParseMode = ModeXS;
+		break;
+	case PM:
+	case APC:
+		ESCFlag = FALSE;
+		ParseMode = ModeIgnore;
+		break;
+	}
 }
 
 void SaveCursor()
 {
-  int i;
-  PStatusBuff Buff;
+	int i;
+	PStatusBuff Buff;
 
-  if (isCursorOnStatusLine)
-    Buff = &SBuff2; // for status line
-  else if (AltScr)
-    Buff = &SBuff3; // for alternate screen
-  else
-    Buff = &SBuff1; // for main screen
+	if (isCursorOnStatusLine)
+		Buff = &SBuff2; // for status line
+	else if (AltScr)
+		Buff = &SBuff3; // for alternate screen
+	else
+		Buff = &SBuff1; // for main screen
 
-  Buff->CursorX = CursorX;
-  Buff->CursorY = CursorY;
-  Buff->Attr = CharAttr;
-  Buff->Glr[0] = Glr[0];
-  Buff->Glr[1] = Glr[1];
-  for (i=0 ; i<=3; i++)
-    Buff->Gn[i] = Gn[i];
-  Buff->AutoWrapMode = AutoWrapMode;
-  Buff->RelativeOrgMode = RelativeOrgMode;
+	Buff->CursorX = CursorX;
+	Buff->CursorY = CursorY;
+	Buff->Attr = CharAttr;
+
+	Buff->Glr[0] = Glr[0];
+	Buff->Glr[1] = Glr[1];
+	for (i=0 ; i<=3; i++)
+		Buff->Gn[i] = Gn[i];
+
+	Buff->AutoWrapMode = AutoWrapMode;
+	Buff->RelativeOrgMode = RelativeOrgMode;
 }
 
-void  RestoreCursor()
+void RestoreCursor()
 {
-  int i;
-  PStatusBuff Buff;
-  UpdateStr();
+	int i;
+	PStatusBuff Buff;
 
-  if (isCursorOnStatusLine)
-    Buff = &SBuff2; // for status line
-  else if (AltScr)
-    Buff = &SBuff3; // for alternate screen
-  else
-    Buff = &SBuff1; // for main screen
+	UpdateStr();
 
-  if (Buff->CursorX > NumOfColumns-1)
-    Buff->CursorX = NumOfColumns-1;
-  if (Buff->CursorY > NumOfLines-1-StatusLine)
-    Buff->CursorY = NumOfLines-1-StatusLine;
-  MoveCursor(Buff->CursorX,Buff->CursorY);
-  CharAttr = Buff->Attr;
-  BuffSetCurCharAttr(CharAttr);
-  Glr[0] = Buff->Glr[0];
-  Glr[1] = Buff->Glr[1];
-  for (i=0 ; i<=3; i++)
-    Gn[i] = Buff->Gn[i];
-  AutoWrapMode = Buff->AutoWrapMode;
-  RelativeOrgMode = Buff->RelativeOrgMode;
+	if (isCursorOnStatusLine)
+		Buff = &SBuff2; // for status line
+	else if (AltScr)
+		Buff = &SBuff3; // for alternate screen
+	else
+		Buff = &SBuff1; // for main screen
+
+	if (Buff->CursorX > NumOfColumns-1)
+		Buff->CursorX = NumOfColumns-1;
+	if (Buff->CursorY > NumOfLines-1-StatusLine)
+		Buff->CursorY = NumOfLines-1-StatusLine;
+	MoveCursor(Buff->CursorX, Buff->CursorY);
+
+	CharAttr = Buff->Attr;
+	BuffSetCurCharAttr(CharAttr);
+
+	Glr[0] = Buff->Glr[0];
+	Glr[1] = Buff->Glr[1];
+	for (i=0 ; i<=3; i++)
+		Gn[i] = Buff->Gn[i];
+
+	AutoWrapMode = Buff->AutoWrapMode;
+	RelativeOrgMode = Buff->RelativeOrgMode;
 }
 
 void AnswerTerminalType()
 {
-  char Tmp[50];
+	char Tmp[50];
 
-  if (ts.TerminalID<IdVT320 || !Send8BitMode)
-    strncpy_s(Tmp, sizeof(Tmp),"\033[?", _TRUNCATE);
-  else
-    strncpy_s(Tmp, sizeof(Tmp),"\233?", _TRUNCATE);
+	if (ts.TerminalID<IdVT320 || !Send8BitMode)
+		strncpy_s(Tmp, sizeof(Tmp),"\033[?", _TRUNCATE);
+	else
+		strncpy_s(Tmp, sizeof(Tmp),"\233?", _TRUNCATE);
 
-  switch (ts.TerminalID) {
-    case IdVT100:
-      strncat_s(Tmp,sizeof(Tmp),"1;2",_TRUNCATE);
-      break;
-    case IdVT100J:
-      strncat_s(Tmp,sizeof(Tmp),"5;2",_TRUNCATE);
-      break;
-    case IdVT101:
-      strncat_s(Tmp,sizeof(Tmp),"1;0",_TRUNCATE);
-      break;
-    case IdVT102:
-      strncat_s(Tmp,sizeof(Tmp),"6",_TRUNCATE);
-      break;
-    case IdVT102J:
-      strncat_s(Tmp,sizeof(Tmp),"15",_TRUNCATE);
-      break;
-    case IdVT220J:
-      strncat_s(Tmp,sizeof(Tmp),"62;1;2;5;6;7;8",_TRUNCATE);
-      break;
-    case IdVT282:
-      strncat_s(Tmp,sizeof(Tmp),"62;1;2;4;5;6;7;8;10;11",_TRUNCATE);
-      break;
-    case IdVT320:
-      strncat_s(Tmp,sizeof(Tmp),"63;1;2;6;7;8",_TRUNCATE);
-      break;
-    case IdVT382:
-      strncat_s(Tmp,sizeof(Tmp),"63;1;2;4;5;6;7;8;10;15",_TRUNCATE);
-      break;
-    case IdVT420:
-      strncat_s(Tmp,sizeof(Tmp),"64;1;2;7;8;9;15;18;21",_TRUNCATE);
-      break;
-    case IdVT520:
-      strncat_s(Tmp,sizeof(Tmp),"65;1;2;7;8;9;12;18;19;21;23;24;42;44;45;46",_TRUNCATE);
-      break;
-    case IdVT525:
-      strncat_s(Tmp,sizeof(Tmp),"65;1;2;7;9;12;18;19;21;22;23;24;42;44;45;46",_TRUNCATE);
-      break;
-  }
-  strncat_s(Tmp,sizeof(Tmp),"c",_TRUNCATE);
+	switch (ts.TerminalID) {
+	case IdVT100:
+		strncat_s(Tmp,sizeof(Tmp),"1;2",_TRUNCATE);
+		break;
+	case IdVT100J:
+		strncat_s(Tmp,sizeof(Tmp),"5;2",_TRUNCATE);
+		break;
+	case IdVT101:
+		strncat_s(Tmp,sizeof(Tmp),"1;0",_TRUNCATE);
+		break;
+	case IdVT102:
+		strncat_s(Tmp,sizeof(Tmp),"6",_TRUNCATE);
+		break;
+	case IdVT102J:
+		strncat_s(Tmp,sizeof(Tmp),"15",_TRUNCATE);
+		break;
+	case IdVT220J:
+		strncat_s(Tmp,sizeof(Tmp),"62;1;2;5;6;7;8",_TRUNCATE);
+		break;
+	case IdVT282:
+		strncat_s(Tmp,sizeof(Tmp),"62;1;2;4;5;6;7;8;10;11",_TRUNCATE);
+		break;
+	case IdVT320:
+		strncat_s(Tmp,sizeof(Tmp),"63;1;2;6;7;8",_TRUNCATE);
+		break;
+	case IdVT382:
+		strncat_s(Tmp,sizeof(Tmp),"63;1;2;4;5;6;7;8;10;15",_TRUNCATE);
+		break;
+	case IdVT420:
+		strncat_s(Tmp,sizeof(Tmp),"64;1;2;7;8;9;15;18;21",_TRUNCATE);
+		break;
+	case IdVT520:
+		strncat_s(Tmp,sizeof(Tmp),"65;1;2;7;8;9;12;18;19;21;23;24;42;44;45;46",_TRUNCATE);
+		break;
+	case IdVT525:
+		strncat_s(Tmp,sizeof(Tmp),"65;1;2;7;9;12;18;19;21;22;23;24;42;44;45;46",_TRUNCATE);
+		break;
+	}
+	strncat_s(Tmp,sizeof(Tmp),"c",_TRUNCATE);
 
-  CommBinaryOut(&cv,Tmp,strlen(Tmp)); /* Report terminal ID */
+	CommBinaryOut(&cv,Tmp,strlen(Tmp)); /* Report terminal ID */
 }
 
 void ESCSpace(BYTE b)
 {
-  switch (b) {
-    case 'F':	// S7C1T
-      Send8BitMode = FALSE;
-      break;
-    case 'G':	// S8C1T
-      if (VTlevel >= 2) {
-	Send8BitMode = TRUE;
-      }
-      break;
-  }
+	switch (b) {
+	case 'F':  // S7C1T
+		Send8BitMode = FALSE;
+		break;
+	case 'G':  // S8C1T
+		if (VTlevel >= 2) {
+			Send8BitMode = TRUE;
+		}
+		break;
+	}
 }
 
 void ESCSharp(BYTE b)
 {
-  switch (b) {
-    case '8':  /* Fill screen with "E" (DECALN) */
-      BuffUpdateScroll();
-      BuffFillWithE();
-      CursorTop = 0;
-      CursorBottom = NumOfLines-1-StatusLine;
-      CursorLeftM = 0;
-      CursorRightM = NumOfColumns - 1;
-      MoveCursor(0,0);
-      ParseMode = ModeFirst;
-      break;
-  }
+	switch (b) {
+	case '8':  /* Fill screen with "E" (DECALN) */
+		BuffUpdateScroll();
+		BuffFillWithE();
+		CursorTop = 0;
+		CursorBottom = NumOfLines-1-StatusLine;
+		CursorLeftM = 0;
+		CursorRightM = NumOfColumns - 1;
+		MoveCursor(0, 0);
+		ParseMode = ModeFirst;
+		break;
+	}
 }
 
 /* select double byte code set */
 void ESCDBCSSelect(BYTE b)
 {
-  int Dist;
+	int Dist;
 
-  if (ts.Language!=IdJapanese) return;
+	if (ts.Language!=IdJapanese) return;
 
-  switch (ICount) {
-    case 1:
-      if ((b=='@') || (b=='B'))
-      {
-	Gn[0] = IdKanji; /* Kanji -> G0 */
-	if ((ts.TermFlag & TF_AUTOINVOKE)!=0)
-	  Glr[0] = 0; /* G0->GL */
-      }
-      break;
-    case 2:
-      /* Second intermediate char must be
-	 '(' or ')' or '*' or '+'. */
-      Dist = (IntChar[2]-'(') & 3; /* G0 - G3 */
-      if ((b=='1') || (b=='3') ||
-	  (b=='@') || (b=='B'))
-      {
-	Gn[Dist] = IdKanji; /* Kanji -> G0-3 */
-	if (((ts.TermFlag & TF_AUTOINVOKE)!=0) &&
-	    (Dist==0))
-	  Glr[0] = 0; /* G0->GL */
-      }
-      break;
-  }
+	switch (ICount) {
+		case 1:
+			if ((b=='@') || (b=='B'))
+			{
+				Gn[0] = IdKanji; /* Kanji -> G0 */
+				if ((ts.TermFlag & TF_AUTOINVOKE)!=0)
+					Glr[0] = 0; /* G0->GL */
+			}
+			break;
+		case 2:
+			/* Second intermediate char must be
+				 '(' or ')' or '*' or '+'. */
+			Dist = (IntChar[2]-'(') & 3; /* G0 - G3 */
+			if ((b=='1') || (b=='3') ||
+					(b=='@') || (b=='B'))
+			{
+				Gn[Dist] = IdKanji; /* Kanji -> G0-3 */
+				if (((ts.TermFlag & TF_AUTOINVOKE)!=0) &&
+						(Dist==0))
+					Glr[0] = 0; /* G0->GL */
+			}
+			break;
+	}
 }
 
 void ESCSelectCode(BYTE b)
 {
-  switch (b) {
-    case '0':
-      if (ts.AutoWinSwitch>0)
-	ChangeEmu = IdTEK; /* enter TEK mode */
-      break;
-  }
+	switch (b) {
+		case '0':
+			if (ts.AutoWinSwitch>0)
+				ChangeEmu = IdTEK; /* enter TEK mode */
+			break;
+	}
 }
 
-  /* select single byte code set */
+	/* select single byte code set */
 void ESCSBCSSelect(BYTE b)
 {
-  int Dist;
+	int Dist;
 
-  /* Intermediate char must be
-     '(' or ')' or '*' or '+'.	*/
-  Dist = (IntChar[1]-'(') & 3; /* G0 - G3 */
+	/* Intermediate char must be '(' or ')' or '*' or '+'. */
+	Dist = (IntChar[1]-'(') & 3; /* G0 - G3 */
 
-  switch (b) {
-    case '0': Gn[Dist] = IdSpecial; break;
-    case '<': Gn[Dist] = IdASCII; break;
-    case '>': Gn[Dist] = IdASCII; break;
-    case 'A': Gn[Dist] = IdASCII; break;
-    case 'B': Gn[Dist] = IdASCII; break;
-    case 'H': Gn[Dist] = IdASCII; break;
-    case 'I':
-      if (ts.Language==IdJapanese)
-	Gn[Dist] = IdKatakana;
-      break;
-    case 'J': Gn[Dist] = IdASCII; break;
-  }
+	switch (b) {
+	case '0': Gn[Dist] = IdSpecial; break;
+	case '<': Gn[Dist] = IdASCII; break;
+	case '>': Gn[Dist] = IdASCII; break;
+	case 'A': Gn[Dist] = IdASCII; break;
+	case 'B': Gn[Dist] = IdASCII; break;
+	case 'H': Gn[Dist] = IdASCII; break;
+	case 'I':
+		if (ts.Language==IdJapanese)
+			Gn[Dist] = IdKatakana;
+		break;
+	case 'J': Gn[Dist] = IdASCII; break;
+	}
 
-  if (((ts.TermFlag & TF_AUTOINVOKE)!=0) &&
-      (Dist==0))
-    Glr[0] = 0;  /* G0->GL */
+	if (((ts.TermFlag & TF_AUTOINVOKE)!=0) && (Dist==0))
+		Glr[0] = 0;  /* G0->GL */
 }
 
 void PrnParseEscape(BYTE b) // printer mode
 {
-  int i;
+	int i;
 
-  ParseMode = ModeFirst;
-  switch (ICount) {
-    /* no intermediate char */
-    case 0:
-      switch (b) {
-	case '[': /* CSI */
-	  ClearParams();
-	  FirstPrm = TRUE;
-	  WriteToPrnFile(ESC,FALSE);
-	  WriteToPrnFile('[',FALSE);
-	  ParseMode = ModeCSI;
-	  return;
-      } /* end of case Icount=0 */
-      break;
-    /* one intermediate char */
-    case 1:
-      switch (IntChar[1]) {
-	case '$':
-	  if (! DirectPrn)
-	  {
-	    ESCDBCSSelect(b);
-	    return;
-	  }
-	  break;
-	case '(':
-	case ')':
-	case '*':
-	case '+':
-	  if (! DirectPrn)
-	  {
-	    ESCSBCSSelect(b);
-	    return;
-	  }
-	  break;
-      }
-      break;
-    /* two intermediate char */
-    case 2:
-      if ((! DirectPrn) &&
-	  (IntChar[1]=='$') &&
-	  ('('<=IntChar[2]) &&
-	  (IntChar[2]<='+'))
-      {
-	ESCDBCSSelect(b);
-	return;
-      }
-      break;
-  }
-  // send the uninterpreted sequence to printer
-  WriteToPrnFile(ESC,FALSE);
-  for (i=1; i<=ICount; i++)
-    WriteToPrnFile(IntChar[i],FALSE);
-  WriteToPrnFile(b,TRUE);
+	ParseMode = ModeFirst;
+	switch (ICount) {
+	/* no intermediate char */
+	case 0:
+		switch (b) {
+		case '[': /* CSI */
+			ClearParams();
+			FirstPrm = TRUE;
+			WriteToPrnFile(ESC,FALSE);
+			WriteToPrnFile('[',FALSE);
+			ParseMode = ModeCSI;
+			return;
+		} /* end of case Icount=0 */
+		break;
+	/* one intermediate char */
+	case 1:
+		switch (IntChar[1]) {
+		case '$':
+			if (! DirectPrn) {
+				ESCDBCSSelect(b);
+				return;
+			}
+			break;
+		case '(':
+		case ')':
+		case '*':
+		case '+':
+			if (! DirectPrn) {
+				ESCSBCSSelect(b);
+				return;
+			}
+			break;
+		}
+		break;
+	/* two intermediate char */
+	case 2:
+		if ((! DirectPrn) &&
+		    (IntChar[1]=='$') &&
+		    ('('<=IntChar[2]) &&
+		    (IntChar[2]<='+'))
+		{
+			ESCDBCSSelect(b);
+			return;
+		}
+		break;
+	}
+	// send the uninterpreted sequence to printer
+	WriteToPrnFile(ESC,FALSE);
+	for (i=1; i<=ICount; i++)
+		WriteToPrnFile(IntChar[i],FALSE);
+	WriteToPrnFile(b,TRUE);
 }
 
 void ParseEscape(BYTE b) /* b is the final char */
 {
-  if (PrinterMode) { // printer mode
-    PrnParseEscape(b);
-    return;
-  }
+	if (PrinterMode) { // printer mode
+		PrnParseEscape(b);
+		return;
+	}
 
-  switch (ICount) {
-    /* no intermediate char */
-    case 0:
-      switch (b) {
-        case '6': // DECBI
-	  if (CursorY >= CursorTop && CursorY <= CursorBottom
-	    && CursorX >= CursorLeftM && CursorX <= CursorRightM)
-	  {
-	    if (CursorX == CursorLeftM)
-	      BuffScrollRight(1);
-	    else
-	      MoveCursor(CursorX-1, CursorY);
-	  }
-	  break;
-	case '7': SaveCursor(); break;
-	case '8': RestoreCursor(); break;
-	case '9': // DECFI
-	  if (CursorY >= CursorTop && CursorY <= CursorBottom
-	    && CursorX >= CursorLeftM && CursorX <= CursorRightM)
-	  {
-	    if (CursorX == CursorRightM)
-	      BuffScrollLeft(1);
-	    else
-	      MoveCursor(CursorX+1, CursorY);
-	  }
-	  break;
-	case '=': AppliKeyMode = TRUE; break;
-	case '>': AppliKeyMode = FALSE; break;
-	case 'D': /* IND */
-	  LineFeed(0,TRUE);
-	  break;
-	case 'E': /* NEL */
-	  MoveCursor(0,CursorY);
-	  LineFeed(0,TRUE);
-	  break;
-	case 'H': /* HTS */
-	  if (ts.TabStopFlag & TABF_HTS7) SetTabStop();
-	  break;
-	case 'M': /* RI */
-	  CursorUpWithScroll();
-	  break;
-	case 'N': /* SS2 */
-	  GLtmp = 2;
-	  SSflag = TRUE;
-	  break;
-	case 'O': /* SS3 */
-	  GLtmp = 3;
-	  SSflag = TRUE;
-	  break;
-	case 'P': /* DCS */
-	  ClearParams();
-	  ESCFlag = FALSE;
-	  ParseMode = ModeDCS;
-	  return;
-	case 'X': /* SOS */
-	case '^': /* APC */
-	case '_': /* PM  */
-	  ESCFlag = FALSE;
-	  ParseMode = ModeIgnore;
-	  return;
-	case 'Z': /* DECID */
-	  AnswerTerminalType();
-	  break;
-	case '[': /* CSI */
-	  ClearParams();
-	  FirstPrm = TRUE;
-	  ParseMode = ModeCSI;
-	  return;
-	case '\\': break; /* ST */
-	case ']': /* XTERM sequence (OSC) */
-	  ClearParams();
-	  ParseMode = ModeXS;
-	  return;
-	case 'c': /* Hardware reset */
-	  HideStatusLine();
-	  ResetTerminal();
-	  ClearUserKey();
-	  ClearBuffer();
-	  if (ts.PortType==IdSerial) // reset serial port
-	    CommResetSerial(&ts, &cv, TRUE);
-	  break;
-	case 'g': /* Visual Bell (screen original?) */
-	  RingBell(IdBeepVisual);
-	  break;
-	case 'n': Glr[0] = 2; break; /* LS2 */
-	case 'o': Glr[0] = 3; break; /* LS3 */
-	case '|': Glr[1] = 3; break; /* LS3R */
-	case '}': Glr[1] = 2; break; /* LS2R */
-	case '~': Glr[1] = 1; break; /* LS1R */
-      } /* end of case Icount=0 */
-      break;
-    /* one intermediate char */
-    case 1:
-      switch (IntChar[1]) {
-	case ' ': ESCSpace(b); break;
-	case '#': ESCSharp(b); break;
-	case '$': ESCDBCSSelect(b); break;
-	case '%': break;
-	case '(':
-	case ')':
-	case '*':
-	case '+':
-	  ESCSBCSSelect(b);
-	  break;
-      }
-      break;
-    /* two intermediate char */
-    case 2:
-      if ((IntChar[1]=='$') &&
-	  ('('<=IntChar[2]) &&
-	  (IntChar[2]<='+'))
-	ESCDBCSSelect(b);
-      else if ((IntChar[1]=='%') &&
-	       (IntChar[2]=='!'))
-	ESCSelectCode(b);
-      break;
-  }
-  ParseMode = ModeFirst;
+	switch (ICount) {
+	case 0: /* no intermediate char */
+		switch (b) {
+		case '6': // DECBI
+			if (CursorY >= CursorTop && CursorY <= CursorBottom &&
+			    CursorX >= CursorLeftM && CursorX <= CursorRightM) {
+				if (CursorX == CursorLeftM)
+					BuffScrollRight(1);
+				else
+					MoveCursor(CursorX-1, CursorY);
+			}
+		break;
+		case '7': SaveCursor(); break;
+		case '8': RestoreCursor(); break;
+		case '9': // DECFI
+			if (CursorY >= CursorTop && CursorY <= CursorBottom &&
+			    CursorX >= CursorLeftM && CursorX <= CursorRightM) {
+				if (CursorX == CursorRightM)
+					BuffScrollLeft(1);
+				else
+					MoveCursor(CursorX+1, CursorY);
+			}
+			break;
+		case '=': AppliKeyMode = TRUE; break;
+		case '>': AppliKeyMode = FALSE; break;
+		case 'D': /* IND */
+			LineFeed(0,TRUE);
+			break;
+		case 'E': /* NEL */
+			MoveCursor(0,CursorY);
+			LineFeed(0,TRUE);
+			break;
+		case 'H': /* HTS */
+			if (ts.TabStopFlag & TABF_HTS7)
+				SetTabStop();
+			break;
+		case 'M': /* RI */
+			CursorUpWithScroll();
+			break;
+		case 'N': /* SS2 */
+			GLtmp = 2;
+			SSflag = TRUE;
+			break;
+		case 'O': /* SS3 */
+			GLtmp = 3;
+			SSflag = TRUE;
+			break;
+		case 'P': /* DCS */
+			ClearParams();
+			ESCFlag = FALSE;
+			ParseMode = ModeDCS;
+			return;
+		case 'X': /* SOS */
+		case '^': /* APC */
+		case '_': /* PM  */
+			ESCFlag = FALSE;
+			ParseMode = ModeIgnore;
+			return;
+		case 'Z': /* DECID */
+			AnswerTerminalType();
+			break;
+		case '[': /* CSI */
+			ClearParams();
+			FirstPrm = TRUE;
+			ParseMode = ModeCSI;
+			return;
+		case '\\': break; /* ST */
+		case ']': /* XTERM sequence (OSC) */
+			ClearParams();
+			ParseMode = ModeXS;
+			return;
+		case 'c': /* Hardware reset */
+			HideStatusLine();
+			ResetTerminal();
+			ClearUserKey();
+			ClearBuffer();
+			if (ts.PortType==IdSerial) // reset serial port
+				CommResetSerial(&ts, &cv, TRUE);
+			break;
+		case 'g': /* Visual Bell (screen original?) */
+			RingBell(IdBeepVisual);
+			break;
+		case 'n': Glr[0] = 2; break; /* LS2 */
+		case 'o': Glr[0] = 3; break; /* LS3 */
+		case '|': Glr[1] = 3; break; /* LS3R */
+		case '}': Glr[1] = 2; break; /* LS2R */
+		case '~': Glr[1] = 1; break; /* LS1R */
+		}
+		break;
+		/* end of case Icount=0 */
+
+	case 1: /* one intermediate char */
+		switch (IntChar[1]) {
+		case ' ': ESCSpace(b); break;
+		case '#': ESCSharp(b); break;
+		case '$': ESCDBCSSelect(b); break;
+		case '%': break;
+		case '(':
+		case ')':
+		case '*':
+		case '+':
+			ESCSBCSSelect(b);
+			break;
+		}
+		break;
+
+	case 2: /* two intermediate char */
+		if ((IntChar[1]=='$') && ('('<=IntChar[2]) && (IntChar[2]<='+'))
+			ESCDBCSSelect(b);
+		else if ((IntChar[1]=='%') && (IntChar[2]=='!'))
+			ESCSelectCode(b);
+		break;
+	}
+	ParseMode = ModeFirst;
 }
 
 void EscapeSequence(BYTE b)
@@ -3784,11 +3783,11 @@
 			// Private Sequence
 			  case 'r': CSSetScrollRegion(); break;   // DECSTBM
 			  case 's':
-			    if (LRMarginMode)
-			      CSSetLRScrollRegion();              // DECSLRM
-			    else
-			      SaveCursor();                       // SCP (Save cursor (ANSI.SYS/SCO?))
-			    break;
+				if (LRMarginMode)
+					CSSetLRScrollRegion();    // DECSLRM
+				else
+					SaveCursor();             // SCP (Save cursor (ANSI.SYS/SCO?))
+				break;
 			  case 't': CSSunSequence(); break;       // DECSLPP / Window manipulation(dtterm?)
 			  case 'u': RestoreCursor(); break;       // RCP (Restore cursor (ANSI.SYS/SCO))
 			}
@@ -4911,10 +4910,10 @@
 
 void DLESeen(BYTE b)
 {
-  ParseMode = ModeFirst;
-  if (((ts.FTFlag & FT_BPAUTO)!=0) && (b=='B'))
-    BPStart(IdBPAuto); /* Auto B-Plus activation */
-  ChangeEmu = -1;
+	ParseMode = ModeFirst;
+	if (((ts.FTFlag & FT_BPAUTO)!=0) && (b=='B'))
+		BPStart(IdBPAuto); /* Auto B-Plus activation */
+	ChangeEmu = -1;
 }
 
 void CANSeen(BYTE b)
@@ -5303,12 +5302,6 @@
 	unsigned char wchar[32];
 	unsigned short cset = 0;
 
-#if 0
-	Kanji = code & 0xff00;
-	PutKanji(code & 0x00ff);
-	return;
-#else
-
 	wchar[0] = code & 0xff;
 	wchar[1] = (code >> 8) & 0xff;
 
@@ -5348,7 +5341,6 @@
 			break;
 		}
 	}
-#endif
 }
 
 // UTF-8\x82?\xF3\x90M\x83f\x81[\x83^\x82\xF0\x8F\x88\x97\x9D\x82\xB7\x82\xE9
@@ -5494,13 +5486,12 @@
 BOOL ParseFirstRus(BYTE b)
 // returns if b is processed
 {
-  if (b>=128)
-  {
-    b = RussConv(ts.RussHost,ts.RussClient,b);
-    PutChar(b);
-    return TRUE;
-  }
-  return FALSE;
+	if (b>=128) {
+		b = RussConv(ts.RussHost,ts.RussClient,b);
+		PutChar(b);
+		return TRUE;
+	}
+	return FALSE;
 }
 
 void ParseFirst(BYTE b)
@@ -5574,136 +5565,157 @@
 
 int VTParse()
 {
-  BYTE b;
-  int c;
+	BYTE b;
+	int c;
 
-  c = CommRead1Byte(&cv,&b);
+	c = CommRead1Byte(&cv,&b);
 
-  if (c==0) return 0;
+	if (c==0) return 0;
 
-  CaretOff();
-  UpdateCaretPosition(FALSE);  // \x94\xF1\x83A\x83N\x83e\x83B\x83u\x82??\x82???`\x89悷\x82\xE9
+	CaretOff();
+	UpdateCaretPosition(FALSE);	// \x94\xF1\x83A\x83N\x83e\x83B\x83u\x82??\x82???`\x89悷\x82\xE9
 
-  ChangeEmu = 0;
+	ChangeEmu = 0;
 
-  /* Get Device Context */
-  DispInitDC();
+	/* Get Device Context */
+	DispInitDC();
 
-  LockBuffer();
+	LockBuffer();
 
-  while ((c>0) && (ChangeEmu==0))
-  {
-    if (DebugFlag!=DEBUG_FLAG_NONE)
-      PutDebugChar(b);
-    else {
-      switch (ParseMode) {
-	case ModeFirst: ParseFirst(b); break;
-	case ModeESC: EscapeSequence(b); break;
-	case ModeDCS: DeviceControl(b); break;
-	case ModeDCUserKey: DCUserKey(b); break;
-	case ModeSOS: IgnoreString(b); break;
-	case ModeCSI: ControlSequence(b); break;
-	case ModeXS:  XSequence(b); break;
-	case ModeDLE: DLESeen(b); break;
-	case ModeCAN: CANSeen(b); break;
-	case ModeIgnore: IgnoreString(b); break;
-	default:
-	  ParseMode = ModeFirst;
-	  ParseFirst(b);
-      }
-    }
+	while ((c>0) && (ChangeEmu==0)) {
+		if (DebugFlag!=DEBUG_FLAG_NONE)
+			PutDebugChar(b);
+		else {
+			switch (ParseMode) {
+			case ModeFirst:
+				ParseFirst(b);
+				break;
+			case ModeESC:
+				EscapeSequence(b);
+				break;
+			case ModeDCS:
+				DeviceControl(b);
+				break;
+			case ModeDCUserKey:
+				DCUserKey(b);
+				break;
+			case ModeSOS:
+				IgnoreString(b);
+				break;
+			case ModeCSI:
+				ControlSequence(b);
+				break;
+			case ModeXS:
+				XSequence(b);
+				break;
+			case ModeDLE:
+				DLESeen(b);
+				break;
+			case ModeCAN:
+				CANSeen(b);
+				break;
+			case ModeIgnore:
+				IgnoreString(b);
+				break;
+			default:
+				ParseMode = ModeFirst;
+				ParseFirst(b);
+			}
+		}
 
-    PrevCharacter = b;		// memorize previous character for AUTO CR/LF-receive mode
+		PrevCharacter = b;		// memorize previous character for AUTO CR/LF-receive mode
 
-    if (ChangeEmu==0)
-      c = CommRead1Byte(&cv,&b);
-  }
+		if (ChangeEmu==0)
+			c = CommRead1Byte(&cv,&b);
+	}
 
-  BuffUpdateScroll();
+	BuffUpdateScroll();
 
-  BuffSetCaretWidth();
-  UnlockBuffer();
+	BuffSetCaretWidth();
+	UnlockBuffer();
 
-  /* release device context */
-  DispReleaseDC();
+	/* release device context */
+	DispReleaseDC();
 
-  CaretOn();
+	CaretOn();
 
-  if (ChangeEmu > 0) ParseMode = ModeFirst;
-  return ChangeEmu;
+	if (ChangeEmu > 0)
+		ParseMode = ModeFirst;
+
+	return ChangeEmu;
 }
 
 int MakeLocatorReportStr(char *buff, size_t buffsize, int event, int x, int y) {
-  if (x < 0) {
-    return _snprintf_s_l(buff, buffsize, _TRUNCATE, "%d;%d&w", CLocale, event, ButtonStat);
-  }
-  else {
-    return _snprintf_s_l(buff, buffsize, _TRUNCATE, "%d;%d;%d;%d;0&w", CLocale, event, ButtonStat, y, x);
-  }
+	if (x < 0) {
+		return _snprintf_s_l(buff, buffsize, _TRUNCATE, "%d;%d&w", CLocale, event, ButtonStat);
+	}
+	else {
+		return _snprintf_s_l(buff, buffsize, _TRUNCATE, "%d;%d;%d;%d;0&w", CLocale, event, ButtonStat, y, x);
+	}
 }
 
 BOOL DecLocatorReport(int Event, int Button) {
-  int x, y, MaxX, MaxY, len = 0;
-  char buff[24];
+	int x, y, MaxX, MaxY, len = 0;
+	char buff[24];
 
-  if (DecLocatorFlag & DecLocatorPixel) {
-    x = LastX + 1;
-    y = LastY + 1;
-    DispConvScreenToWin(NumOfColumns+1, NumOfLines+1, &MaxX, &MaxY);
-    if (x < 1 || x > MaxX || y < 1 || y > MaxY) {
-      x = -1;
-    }
-  }
-  else {
-    DispConvWinToScreen(LastX, LastY, &x, &y, NULL);
-    x++; y++;
-    if (x < 1 || x > NumOfColumns || y < 1 || y > NumOfLines) {
-      x = -1;
-    }
-  }
+	if (DecLocatorFlag & DecLocatorPixel) {
+		x = LastX + 1;
+		y = LastY + 1;
+		DispConvScreenToWin(NumOfColumns+1, NumOfLines+1, &MaxX, &MaxY);
+		if (x < 1 || x > MaxX || y < 1 || y > MaxY) {
+			x = -1;
+		}
+	}
+	else {
+		DispConvWinToScreen(LastX, LastY, &x, &y, NULL);
+		x++; y++;
+		if (x < 1 || x > NumOfColumns || y < 1 || y > NumOfLines) {
+			x = -1;
+		}
+	}
 
-  switch (Event) {
-  case IdMouseEventCurStat:
-    if (MouseReportMode == IdMouseTrackDECELR) {
-      len = MakeLocatorReportStr(buff, sizeof(buff), 1, x, y);
-    }
-    else {
-      len = _snprintf_s_l(buff, sizeof(buff), _TRUNCATE, "0&w", CLocale);
-    }
-    break;
+	switch (Event) {
+	case IdMouseEventCurStat:
+		if (MouseReportMode == IdMouseTrackDECELR) {
+			len = MakeLocatorReportStr(buff, sizeof(buff), 1, x, y);
+		}
+		else {
+			len = _snprintf_s_l(buff, sizeof(buff), _TRUNCATE, "0&w", CLocale);
+		}
+		break;
 
-  case IdMouseEventBtnDown:
-    if (DecLocatorFlag & DecLocatorButtonDown) {
-      len = MakeLocatorReportStr(buff, sizeof(buff), Button*2+2, x, y);
-    }
-    break;
+	case IdMouseEventBtnDown:
+		if (DecLocatorFlag & DecLocatorButtonDown) {
+			len = MakeLocatorReportStr(buff, sizeof(buff), Button*2+2, x, y);
+		}
+		break;
 
-  case IdMouseEventBtnUp:
-    if (DecLocatorFlag & DecLocatorButtonUp) {
-      len = MakeLocatorReportStr(buff, sizeof(buff), Button*2+3, x, y);
-    }
-    break;
+	case IdMouseEventBtnUp:
+		if (DecLocatorFlag & DecLocatorButtonUp) {
+			len = MakeLocatorReportStr(buff, sizeof(buff), Button*2+3, x, y);
+		}
+		break;
 
-  case IdMouseEventMove:
-    if (DecLocatorFlag & DecLocatorFiltered) {
-      if (y < FilterTop || y > FilterBottom || x < FilterLeft || x > FilterRight) {
-	len = MakeLocatorReportStr(buff, sizeof(buff), 10, x, y);
-	DecLocatorFlag &= ~DecLocatorFiltered;
-      }
-    }
-    break;
-  }
+	case IdMouseEventMove:
+		if (DecLocatorFlag & DecLocatorFiltered) {
+			if (y < FilterTop || y > FilterBottom || x < FilterLeft || x > FilterRight) {
+				len = MakeLocatorReportStr(buff, sizeof(buff), 10, x, y);
+				DecLocatorFlag &= ~DecLocatorFiltered;
+			}
+		}
+		break;
+	}
 
-  if (len == 0) {
-    return FALSE;
-  }
+	if (len == 0) {
+		return FALSE;
+	}
 
-  SendCSIstr(buff, len);
+	SendCSIstr(buff, len);
 
-  if (DecLocatorFlag & DecLocatorOneShot) {
-    MouseReportMode = IdMouseTrackNone;
-  }
-  return TRUE;
+	if (DecLocatorFlag & DecLocatorOneShot) {
+		MouseReportMode = IdMouseTrackNone;
+	}
+	return TRUE;
 }
 
 #define MOUSE_POS_LIMIT (255 - 32)
@@ -5710,212 +5722,212 @@
 #define MOUSE_POS_EXT_LIMIT (2047 - 32)
 
 int MakeMouseReportStr(char *buff, size_t buffsize, int mb, int x, int y) {
-  char tmpx[3], tmpy[3];
+	char tmpx[3], tmpy[3];
 
-  switch (MouseReportExtMode) {
-  case IdMouseTrackExtNone:
-    if (x >= MOUSE_POS_LIMIT) x = MOUSE_POS_LIMIT;
-    if (y >= MOUSE_POS_LIMIT) y = MOUSE_POS_LIMIT;
-    return _snprintf_s_l(buff, buffsize, _TRUNCATE, "M%c%c%c", CLocale, mb+32, x+32, y+32);
-    break;
+	switch (MouseReportExtMode) {
+	case IdMouseTrackExtNone:
+		if (x >= MOUSE_POS_LIMIT) x = MOUSE_POS_LIMIT;
+		if (y >= MOUSE_POS_LIMIT) y = MOUSE_POS_LIMIT;
+		return _snprintf_s_l(buff, buffsize, _TRUNCATE, "M%c%c%c", CLocale, mb+32, x+32, y+32);
+		break;
 
-  case IdMouseTrackExtUTF8:
-    if (x >= MOUSE_POS_EXT_LIMIT) x = MOUSE_POS_EXT_LIMIT;
-    if (y >= MOUSE_POS_EXT_LIMIT) y = MOUSE_POS_EXT_LIMIT;
-    x += 32;
-    y += 32;
-    if (x < 128) {
-      tmpx[0] = x;
-      tmpx[1] = 0;
-    }
-    else {
-      tmpx[0] = (x >> 6) & 0x1f | 0xc0;
-      tmpx[1] = x & 0x3f | 0x80;
-      tmpx[2] = 0;
-    }
-    if (y < 128) {
-      tmpy[0] = y;
-      tmpy[1] = 0;
-    }
-    else {
-      tmpy[0] = (x >> 6) & 0x1f | 0xc0;
-      tmpy[1] = y & 0x3f | 0x80;
-      tmpy[2] = 0;
-    }
-    return _snprintf_s_l(buff, buffsize, _TRUNCATE, "M%c%s%s", CLocale, mb+32, tmpx, tmpy);
-    break;
+	case IdMouseTrackExtUTF8:
+		if (x >= MOUSE_POS_EXT_LIMIT) x = MOUSE_POS_EXT_LIMIT;
+		if (y >= MOUSE_POS_EXT_LIMIT) y = MOUSE_POS_EXT_LIMIT;
+		x += 32;
+		y += 32;
+		if (x < 128) {
+			tmpx[0] = x;
+			tmpx[1] = 0;
+		}
+		else {
+			tmpx[0] = (x >> 6) & 0x1f | 0xc0;
+			tmpx[1] = x & 0x3f | 0x80;
+			tmpx[2] = 0;
+		}
+		if (y < 128) {
+			tmpy[0] = y;
+			tmpy[1] = 0;
+		}
+		else {
+			tmpy[0] = (x >> 6) & 0x1f | 0xc0;
+			tmpy[1] = y & 0x3f | 0x80;
+			tmpy[2] = 0;
+		}
+		return _snprintf_s_l(buff, buffsize, _TRUNCATE, "M%c%s%s", CLocale, mb+32, tmpx, tmpy);
+		break;
 
-  case IdMouseTrackExtSGR:
-    return _snprintf_s_l(buff, buffsize, _TRUNCATE, "<%d;%d;%d%c", CLocale, mb&0x7f, x, y, (mb&0x80)?'m':'M');
-    break;
+	case IdMouseTrackExtSGR:
+		return _snprintf_s_l(buff, buffsize, _TRUNCATE, "<%d;%d;%d%c", CLocale, mb&0x7f, x, y, (mb&0x80)?'m':'M');
+		break;
 
-  case IdMouseTrackExtURXVT:
-    return _snprintf_s_l(buff, buffsize, _TRUNCATE, "%d;%d;%dM", CLocale, mb+32, x, y);
-    break;
-  }
-  buff[0] = 0;
-  return 0;
+	case IdMouseTrackExtURXVT:
+		return _snprintf_s_l(buff, buffsize, _TRUNCATE, "%d;%d;%dM", CLocale, mb+32, x, y);
+		break;
+	}
+	buff[0] = 0;
+	return 0;
 }
 
 BOOL MouseReport(int Event, int Button, int Xpos, int Ypos) {
-  char Report[32];
-  int x, y, len, modifier;
-  static int LastSendX = -1, LastSendY = -1, LastButton = IdButtonRelease;
+	char Report[32];
+	int x, y, len, modifier;
+	static int LastSendX = -1, LastSendY = -1, LastButton = IdButtonRelease;
 
-  len = 0;
+	len = 0;
 
-  switch (Event) {
-  case IdMouseEventBtnDown:
-    ButtonStat |= (8>>(Button+1));
-    break;
-  case IdMouseEventBtnUp:
-    ButtonStat &= ~(8>>(Button+1));
-    break;
-  }
-  LastX = Xpos;
-  LastY = Ypos;
+	switch (Event) {
+	case IdMouseEventBtnDown:
+		ButtonStat |= (8>>(Button+1));
+		break;
+	case IdMouseEventBtnUp:
+		ButtonStat &= ~(8>>(Button+1));
+		break;
+	}
+	LastX = Xpos;
+	LastY = Ypos;
 
-  if (MouseReportMode == IdMouseTrackNone)
-    return FALSE;
+	if (MouseReportMode == IdMouseTrackNone)
+		return FALSE;
 
-  if (ts.DisableMouseTrackingByCtrl && ControlKey())
-    return FALSE;
+	if (ts.DisableMouseTrackingByCtrl && ControlKey())
+		return FALSE;
 
-  if (MouseReportMode == IdMouseTrackDECELR)
-    return DecLocatorReport(Event, Button);
+	if (MouseReportMode == IdMouseTrackDECELR)
+		return DecLocatorReport(Event, Button);
 
-  DispConvWinToScreen(Xpos, Ypos, &x, &y, NULL);
-  x++; y++;
+	DispConvWinToScreen(Xpos, Ypos, &x, &y, NULL);
+	x++; y++;
 
-  if (x < 1) x = 1;
-  if (y < 1) y = 1;
+	if (x < 1) x = 1;
+	if (y < 1) y = 1;
 
-  if (ShiftKey())
-    modifier = 4;
-  else
-    modifier = 0;
+	if (ShiftKey())
+		modifier = 4;
+	else
+		modifier = 0;
 
-  if (ControlKey())
-    modifier |= 8;
+	if (ControlKey())
+		modifier |= 8;
 
-  if (AltKey())
-    modifier |= 16;
+	if (AltKey())
+		modifier |= 16;
 
-  modifier = (ShiftKey()?4:0) | (AltKey()?8:0) | (ControlKey()?16:0);
+	modifier = (ShiftKey()?4:0) | (AltKey()?8:0) | (ControlKey()?16:0);
 
-  switch (Event) {
-    case IdMouseEventBtnDown:
-      switch (MouseReportMode) {
-	case IdMouseTrackX10:
-	  len = MakeMouseReportStr(Report, sizeof Report, Button, x, y);
-	  break;
+	switch (Event) {
+	case IdMouseEventBtnDown:
+		switch (MouseReportMode) {
+		case IdMouseTrackX10:
+			len = MakeMouseReportStr(Report, sizeof Report, Button, x, y);
+			break;
 
-	case IdMouseTrackVT200:
-	case IdMouseTrackBtnEvent:
-	case IdMouseTrackAllEvent:
-	  len = MakeMouseReportStr(Report, sizeof Report, Button | modifier, x, y);
-	  LastSendX = x;
-	  LastSendY = y;
-	  LastButton = Button;
-	  break;
+		case IdMouseTrackVT200:
+		case IdMouseTrackBtnEvent:
+		case IdMouseTrackAllEvent:
+			len = MakeMouseReportStr(Report, sizeof Report, Button | modifier, x, y);
+			LastSendX = x;
+			LastSendY = y;
+			LastButton = Button;
+			break;
 
-	case IdMouseTrackNetTerm:
-	  len = _snprintf_s_l(Report, sizeof Report, _TRUNCATE, "\033}%d,%d\r", CLocale, y, x);
-	  CommBinaryOut(&cv, Report, len);
-	  return TRUE;
+		case IdMouseTrackNetTerm:
+			len = _snprintf_s_l(Report, sizeof Report, _TRUNCATE, "\033}%d,%d\r", CLocale, y, x);
+			CommBinaryOut(&cv, Report, len);
+			return TRUE;
 
-	case IdMouseTrackVT200Hl: /* not supported yet */
-	default:
-	  return FALSE;
-      }
-      break;
+		case IdMouseTrackVT200Hl: /* not supported yet */
+		default:
+			return FALSE;
+		}
+		break;
 
-    case IdMouseEventBtnUp:
-      switch (MouseReportMode) {
-	case IdMouseTrackVT200:
-	case IdMouseTrackBtnEvent:
-	case IdMouseTrackAllEvent:
-	  if (MouseReportExtMode == IdMouseTrackExtSGR) {
-	    modifier |= 128;
-	  }
-	  else {
-	    Button = IdButtonRelease;
-	  }
-	  len = MakeMouseReportStr(Report, sizeof Report, Button | modifier, x, y);
-	  LastSendX = x;
-	  LastSendY = y;
-	  LastButton = IdButtonRelease;
-	  break;
+	case IdMouseEventBtnUp:
+		switch (MouseReportMode) {
+		case IdMouseTrackVT200:
+		case IdMouseTrackBtnEvent:
+		case IdMouseTrackAllEvent:
+			if (MouseReportExtMode == IdMouseTrackExtSGR) {
+				modifier |= 128;
+			}
+			else {
+				Button = IdButtonRelease;
+			}
+			len = MakeMouseReportStr(Report, sizeof Report, Button | modifier, x, y);
+			LastSendX = x;
+			LastSendY = y;
+			LastButton = IdButtonRelease;
+			break;
 
-	case IdMouseTrackX10: /* nothing to do */
-	case IdMouseTrackNetTerm: /* nothing to do */
-	  return TRUE;
+		case IdMouseTrackX10:     /* nothing to do */
+		case IdMouseTrackNetTerm: /* nothing to do */
+			return TRUE;
 
-	case IdMouseTrackVT200Hl: /* not supported yet */
-	default:
-	  return FALSE;
-      }
-      break;
+		case IdMouseTrackVT200Hl: /* not supported yet */
+		default:
+			return FALSE;
+		}
+		break;
 
-    case IdMouseEventMove:
-      switch (MouseReportMode) {
-	case IdMouseTrackBtnEvent:
-	  if (LastButton == 3) {
-	    return FALSE;
-	  }
-	  /* FALLTHROUGH */
-	case IdMouseTrackAllEvent:
-	  if (x == LastSendX && y == LastSendY) {
-	    return FALSE;
-	  }
-	  len = MakeMouseReportStr(Report, sizeof Report, LastButton | modifier | 32, x, y);
-	  LastSendX = x;
-	  LastSendY = y;
-	  break;
+	case IdMouseEventMove:
+		switch (MouseReportMode) {
+		case IdMouseTrackBtnEvent:
+			if (LastButton == 3) {
+				return FALSE;
+			}
+			/* FALLTHROUGH */
+		case IdMouseTrackAllEvent:
+			if (x == LastSendX && y == LastSendY) {
+				return FALSE;
+			}
+			len = MakeMouseReportStr(Report, sizeof Report, LastButton | modifier | 32, x, y);
+			LastSendX = x;
+			LastSendY = y;
+		break;
 
-	case IdMouseTrackVT200Hl: /* not supported yet */
-	case IdMouseTrackX10: /* nothing to do */
-	case IdMouseTrackVT200: /* nothing to do */
-	case IdMouseTrackNetTerm: /* nothing to do */
-	default:
-	  return FALSE;
-      }
-      break;
+		case IdMouseTrackVT200Hl: /* not supported yet */
+		case IdMouseTrackX10:     /* nothing to do */
+		case IdMouseTrackVT200:   /* nothing to do */
+		case IdMouseTrackNetTerm: /* nothing to do */
+		default:
+			return FALSE;
+		}
+		break;
 
-    case IdMouseEventWheel:
-      switch (MouseReportMode) {
-	case IdMouseTrackVT200:
-	case IdMouseTrackBtnEvent:
-	case IdMouseTrackAllEvent:
-	  len = MakeMouseReportStr(Report, sizeof Report, Button | modifier | 64, x, y);
-	  break;
+	case IdMouseEventWheel:
+		switch (MouseReportMode) {
+		case IdMouseTrackVT200:
+		case IdMouseTrackBtnEvent:
+		case IdMouseTrackAllEvent:
+			len = MakeMouseReportStr(Report, sizeof Report, Button | modifier | 64, x, y);
+			break;
 
-	case IdMouseTrackX10: /* nothing to do */
-	case IdMouseTrackVT200Hl: /* not supported yet */
-	case IdMouseTrackNetTerm: /* nothing to do */
-	  return FALSE;
-      }
-      break;
-  }
+		case IdMouseTrackX10:     /* nothing to do */
+		case IdMouseTrackVT200Hl: /* not supported yet */
+		case IdMouseTrackNetTerm: /* nothing to do */
+			return FALSE;
+		}
+		break;
+	}
 
-  if (len == 0)
-    return FALSE;
+	if (len == 0)
+		return FALSE;
 
-  SendCSIstr(Report, len);
-  return TRUE;
+	SendCSIstr(Report, len);
+	return TRUE;
 }
 
 void FocusReport(BOOL focus) {
-  if (!FocusReportMode)
-    return;
+	if (!FocusReportMode)
+		return;
 
-  if (focus) {
-    // Focus In
-    SendCSIstr("I", 0);
-  } else {
-    // Focus Out
-    SendCSIstr("O", 0);
-  }
+	if (focus) {
+		// Focus In
+		SendCSIstr("I", 0);
+	} else {
+		// Focus Out
+		SendCSIstr("O", 0);
+	}
 }
 
 void VisualBell() {
@@ -5975,30 +5987,30 @@
 }
 
 void ChangeTerminalID() {
-  switch (ts.TerminalID) {
-  case IdVT220J:
-  case IdVT282:
-    VTlevel = 2;
-    break;
-  case IdVT320:
-  case IdVT382:
-    VTlevel = 3;
-    break;
-  case IdVT420:
-    VTlevel = 4;
-    break;
-  case IdVT520:
-  case IdVT525:
-    VTlevel = 5;
-    break;
-  default:
-    VTlevel = 1;
-  }
+	switch (ts.TerminalID) {
+	case IdVT220J:
+	case IdVT282:
+		VTlevel = 2;
+		break;
+	case IdVT320:
+	case IdVT382:
+		VTlevel = 3;
+		break;
+	case IdVT420:
+		VTlevel = 4;
+		break;
+	case IdVT520:
+	case IdVT525:
+		VTlevel = 5;
+		break;
+	default:
+		VTlevel = 1;
+	}
 
-  if (VTlevel == 1) {
-    Send8BitMode = FALSE;
-  }
-  else {
-    Send8BitMode = ts.Send8BitCtrl;
-  }
+	if (VTlevel == 1) {
+		Send8BitMode = FALSE;
+	}
+	else {
+		Send8BitMode = ts.Send8BitCtrl;
+	}
 }

From svnnotify ＠ sourceforge.jp  Tue Jun 13 19:42:58 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 13 Jun 2017 19:42:58 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY4MDNdICBOT19DT1BZTElORV9GSVgg44Oe?=
 =?utf-8?b?44Kv44Ot44KS5buD5q2i44CC5bi444Gr5pyJ5Yq544CC?=
Message-ID: <1497350578.581708.7105.nullmailer@users.sourceforge.jp>

Revision: 6803
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6803
Author:   doda
Date:     2017-06-13 19:42:58 +0900 (Tue, 13 Jun 2017)
Log Message:
-----------
NO_COPYLINE_FIX マクロを廃止。常に有効。

Modified Paths:
--------------
    trunk/teraterm/common/tttypes.h
    trunk/teraterm/teraterm/buffer.c
    trunk/teraterm/teraterm/buffer.h
    trunk/teraterm/teraterm/vtterm.c
    trunk/teraterm/ttpset/ttset.c

-------------- next part --------------
Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h	2017-06-13 10:42:54 UTC (rev 6802)
+++ trunk/teraterm/common/tttypes.h	2017-06-13 10:42:58 UTC (rev 6803)
@@ -44,9 +44,7 @@
 #define AttrFontMask      0x07
 #define AttrBlink         0x08
 #define AttrReverse       0x10
-#ifndef NO_COPYLINE_FIX
 #define AttrLineContinued 0x20 /* valid only at the beggining or end of a line */
-#endif /* NO_COPYLINE_FIX */
 /* begin - ishizaki */
 #define AttrURL           0x40
 /* end - ishizaki */
@@ -482,9 +480,7 @@
 	WORD DelayPerLine;
 	WORD MaxComPort;
 	WORD ComAutoConnect;
-#ifndef NO_COPYLINE_FIX
 	WORD EnableContinuedLineCopy;
-#endif /* NO_COPYLINE_FIX */
 	COLORREF ANSIColor[16];
 	/* protocol used in connect() */
 	int ProtocolFamily;

Modified: trunk/teraterm/teraterm/buffer.c
===================================================================
--- trunk/teraterm/teraterm/buffer.c	2017-06-13 10:42:54 UTC (rev 6802)
+++ trunk/teraterm/teraterm/buffer.c	2017-06-13 10:42:58 UTC (rev 6803)
@@ -757,13 +757,11 @@
 //  XStart: start position of erasing
 //  Count: number of characters to be erased
 {
-#ifndef NO_COPYLINE_FIX
 	BOOL LineContinued=FALSE;
 
 	if (ts.EnableContinuedLineCopy && XStart == 0 && (AttrLine[0] & AttrLineContinued)) {
 		LineContinued = TRUE;
 	}
-#endif /* NO_COPYLINE_FIX */
 
 	if (ts.Language==IdJapanese || ts.Language==IdKorean || ts.Language==IdUtf8) {
 		EraseKanji(1); /* if cursor is on right half of a kanji, erase the kanji */
@@ -776,7 +774,6 @@
 	memset(&(AttrLineFG[XStart]),CurCharAttr.Fore,Count);
 	memset(&(AttrLineBG[XStart]),CurCharAttr.Back,Count);
 
-#ifndef NO_COPYLINE_FIX
 	if (ts.EnableContinuedLineCopy) {
 		if (LineContinued) {
 			BuffLineContinued(TRUE);
@@ -786,7 +783,6 @@
 			AttrBuff[NextLinePtr(LinePtr)] &= ~AttrLineContinued;
 		}
 	}
-#endif /* NO_COPYLINE_FIX */
 
 	DispEraseCharsInLine(XStart, Count);
 }
@@ -1288,10 +1284,9 @@
 	int i, j, k, IStart, IEnd;
 	BOOL Sp, FirstChar;
 	BYTE b;
-#ifndef NO_COPYLINE_FIX
 	BOOL LineContinued, PrevLineContinued;
+
 	LineContinued = FALSE;
-#endif /* NO_COPYLINE_FIX */
 
 	if (TalkStatus==IdTalkCB) {
 		return;
@@ -1348,7 +1343,6 @@
 
 		// exclude right-side space characters
 		IEnd = LeftHalfOfDBCS(TmpPtr,IEnd);
-#ifndef NO_COPYLINE_FIX
 		PrevLineContinued = LineContinued;
 		LineContinued = FALSE;
 		if (ts.EnableContinuedLineCopy && j!=SelectEnd.y && !BoxSelect) {
@@ -1362,7 +1356,6 @@
 			}
 		}
 		if (!LineContinued)
-#endif /* NO_COPYLINE_FIX */
 			while ((IEnd>0) && (CodeBuff[TmpPtr+IEnd]==0x20)) {
 				MoveCharPtr(TmpPtr,&IEnd,-1);
 			}
@@ -1384,11 +1377,7 @@
 					Sp = TRUE;
 					b = 0x09;
 				}
-#ifndef NO_COPYLINE_FIX
 				if ((b!=0x09) || (! FirstChar) || PrevLineContinued) {
-#else
-				if ((b!=0x09) || (! FirstChar)) {
-#endif
 					FirstChar = FALSE;
 					CBPtr[k] = b;
 					k++;
@@ -1404,9 +1393,7 @@
 			}
 		}
 
-#ifndef NO_COPYLINE_FIX
 		if (!LineContinued)
-#endif /* NO_COPYLINE_FIX */
 			if (j < SelectEnd.y) {
 				CBPtr[k] = 0x0d;
 				k++;
@@ -1417,7 +1404,6 @@
 		TmpPtr = NextLinePtr(TmpPtr);
 	}
 	CBPtr[k] = 0;
-#ifndef NO_COPYLINE_FIX
 	LineContinued = FALSE;
 	if (ts.EnableContinuedLineCopy && j!=SelectEnd.y && !BoxSelect && j<BuffEnd-1) {
 		LONG NextTmpPtr = NextLinePtr(TmpPtr);
@@ -1430,7 +1416,6 @@
 		}
 	}
 	if (!LineContinued)
-#endif /* NO_COPYLINE_FIX */
 		UnlockBuffer();
 
 // --- send CB memory to clipboard
@@ -1672,11 +1657,9 @@
 	int XStart, LineEnd, MoveLen;
 	int extr = 0;
 
-#ifndef NO_COPYLINE_FIX
 	if (ts.EnableContinuedLineCopy && CursorX == 0 && (AttrLine[0] & AttrLineContinued)) {
 		Attr.Attr |= AttrLineContinued;
 	}
-#endif /* NO_COPYLINE_FIX */
 
 	if (ts.Language==IdJapanese || ts.Language==IdKorean || ts.Language==IdUtf8) {
 		EraseKanji(1); /* if cursor is on right half of a kanji, erase the kanji */
@@ -1761,11 +1744,9 @@
 	int XStart, LineEnd, MoveLen;
 	int extr = 0;
 
-#ifndef NO_COPYLINE_FIX
 	if (ts.EnableContinuedLineCopy && CursorX == 0 && (AttrLine[0] & AttrLineContinued)) {
 		Attr.Attr |= AttrLineContinued;
 	}
-#endif /* NO_COPYLINE_FIX */
 
 	EraseKanji(1); /* if cursor is on right half of a kanji, erase the kanji */
 
@@ -3529,7 +3510,6 @@
 	MoveCursor(CursorX,CursorY);
 }
 
-#ifndef NO_COPYLINE_FIX
 void BuffLineContinued(BOOL mode)
 {
 	if (ts.EnableContinuedLineCopy) {
@@ -3540,7 +3520,6 @@
 		}
 	}
 }
-#endif /* NO_COPYLINE_FIX */
 
 void BuffSetCurCharAttr(TCharAttr Attr) {
 	CurCharAttr = Attr;
@@ -3765,13 +3744,11 @@
 //  Count: number of characters to be erased
 {
 	int i;
-#ifndef NO_COPYLINE_FIX
 	BOOL LineContinued=FALSE;
 
 	if (ts.EnableContinuedLineCopy && XStart == 0 && (AttrLine[0] & AttrLineContinued)) {
 		LineContinued = TRUE;
 	}
-#endif /* NO_COPYLINE_FIX */
 
 	if (ts.Language==IdJapanese || ts.Language==IdKorean || ts.Language==IdUtf8) {
 		if (!(AttrLine2[CursorX] & Attr2Protect)) {
@@ -3787,7 +3764,6 @@
 		}
 	}
 
-#ifndef NO_COPYLINE_FIX
 	if (ts.EnableContinuedLineCopy) {
 		if (LineContinued) {
 			BuffLineContinued(TRUE);
@@ -3797,7 +3773,6 @@
 			AttrBuff[NextLinePtr(LinePtr)] &= ~AttrLineContinued;
 		}
 	}
-#endif /* NO_COPYLINE_FIX */
 
 	BuffUpdateRect(XStart, CursorY, XStart+Count, CursorY);
 }

Modified: trunk/teraterm/teraterm/buffer.h
===================================================================
--- trunk/teraterm/teraterm/buffer.h	2017-06-13 10:42:54 UTC (rev 6802)
+++ trunk/teraterm/teraterm/buffer.h	2017-06-13 10:42:58 UTC (rev 6803)
@@ -63,11 +63,9 @@
 void CursorBackwardTab(int count);
 void ClearTabStop(int Ps);
 void ShowStatusLine(int Show);
-#ifndef NO_COPYLINE_FIX
 void BuffLineContinued(BOOL mode);
 #define SetLineContinued() BuffLineContinued(TRUE)
 #define ClearLineContinued() BuffLineContinued(FALSE)
-#endif /* NO_COPYLINE_FIX */
 void BuffRegionScrollUpNLines(int n);
 void BuffRegionScrollDownNLines(int n);
 void BuffSetCurCharAttr(TCharAttr Attr);

Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c	2017-06-13 10:42:54 UTC (rev 6802)
+++ trunk/teraterm/teraterm/vtterm.c	2017-06-13 10:42:58 UTC (rev 6803)
@@ -503,10 +503,8 @@
 
 void CarriageReturn(BOOL logFlag)
 {
-#ifndef NO_COPYLINE_FIX
 	if (!ts.EnableContinuedLineCopy || logFlag)
-#endif /* NO_COPYLINE_FIX */
-	if (cv.HLogBuf!=0) Log1Byte(CR);
+		if (cv.HLogBuf!=0) Log1Byte(CR);
 
 	if (RelativeOrgMode || CursorX > CursorLeftM)
 		MoveCursor(CursorLeftM, CursorY);
@@ -523,10 +521,8 @@
 		(b>=LF) && (b<=FF))
 		BuffDumpCurrentLine(b);
 
-#ifndef NO_COPYLINE_FIX
 	if (!ts.EnableContinuedLineCopy || logFlag)
-#endif /* NO_COPYLINE_FIX */
-	if (cv.HLogBuf!=0) Log1Byte(LF);
+		if (cv.HLogBuf!=0) Log1Byte(LF);
 
 	if (CursorY < CursorBottom)
 		MoveCursor(CursorX,CursorY+1);
@@ -534,9 +530,7 @@
 	else if (CursorY < NumOfLines-StatusLine-1)
 		MoveCursor(CursorX,CursorY+1);
 
-#ifndef NO_COPYLINE_FIX
 	ClearLineContinued();
-#endif /* NO_COPYLINE_FIX */
 
 	if (LFMode) CarriageReturn(logFlag);
 
@@ -548,11 +542,9 @@
 	if (Wrap && !ts.VTCompatTab) {
 		CarriageReturn(FALSE);
 		LineFeed(LF,FALSE);
-#ifndef NO_COPYLINE_FIX
 		if (ts.EnableContinuedLineCopy) {
 			SetLineContinued();
 		}
-#endif /* NO_COPYLINE_FIX */
 		Wrap = FALSE;
 	}
 	CursorForwardTab(1, AutoWrapMode);
@@ -574,9 +566,7 @@
 	if (Wrap) {
 		CarriageReturn(FALSE);
 		LineFeed(LF,FALSE);
-#ifndef NO_COPYLINE_FIX
 		CharAttrTmp.Attr |= ts.EnableContinuedLineCopy ? AttrLineContinued : 0;
-#endif /* NO_COPYLINE_FIX */
 	}
 
 //	if (cv.HLogBuf!=0) Log1Byte(b);
@@ -644,9 +634,7 @@
 	if (Wrap) {
 		CarriageReturn(FALSE);
 		LineFeed(LF, FALSE);
-#ifndef NO_COPYLINE_FIX
 		CharAttrTmp.Attr |= ts.EnableContinuedLineCopy ? AttrLineContinued : 0;
-#endif /* NO_COPYLINE_FIX */
 	}
 
 	if (cv.HLogBuf!=0) Log1Byte(b);
@@ -680,11 +668,9 @@
 void PutKanji(BYTE b)
 {
 	int LineEnd;
-#ifndef NO_COPYLINE_FIX
 	TCharAttr CharAttrTmp;
+	CharAttrTmp = CharAttr;
 
-	CharAttrTmp = CharAttr;
-#endif /* NO_COPYLINE_FIX */
 	Kanji = Kanji + b;
 
 	if (PrinterMode && DirectPrn) {
@@ -710,20 +696,16 @@
 	if (Wrap) {
 		CarriageReturn(FALSE);
 		LineFeed(LF,FALSE);
-#ifndef NO_COPYLINE_FIX
 		if (ts.EnableContinuedLineCopy)
 			CharAttrTmp.Attr |= AttrLineContinued;
-#endif /* NO_COPYLINE_FIX */
 	}
 	else if (CursorX > LineEnd - 1) {
 		if (AutoWrapMode) {
-#ifndef NO_COPYLINE_FIX
 			if (ts.EnableContinuedLineCopy) {
 				CharAttrTmp.Attr |= AttrLineContinued;
 				if (CursorX == LineEnd)
 					BuffPutChar(0x20, CharAttr, FALSE);
 			}
-#endif /* NO_COPYLINE_FIX */
 			CarriageReturn(FALSE);
 			LineFeed(LF,FALSE);
 		}
@@ -744,11 +726,7 @@
 		Special = FALSE;
 	}
 
-#ifndef NO_COPYLINE_FIX
 	BuffPutKanji(Kanji, CharAttrTmp, InsertMode);
-#else
-	BuffPutKanji(Kanji, CharAttr, InsertMode);
-#endif /* NO_COPYLINE_FIX */
 
 	if (CursorX < LineEnd - 1) {
 		MoveRight();

Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c	2017-06-13 10:42:54 UTC (rev 6802)
+++ trunk/teraterm/ttpset/ttset.c	2017-06-13 10:42:58 UTC (rev 6803)
@@ -1471,11 +1471,9 @@
 	GetPrivateProfileString(Section, "ZModemRcvCommand", "rz",
 	                        ts->ZModemRcvCommand, sizeof(ts->ZModemRcvCommand), FName);
 
-#ifndef NO_COPYLINE_FIX
 	/* Enable continued-line copy  -- special option */
 	ts->EnableContinuedLineCopy =
 		GetOnOff(Section, "EnableContinuedLineCopy", FName, FALSE);
-#endif							/* NO_COPYLINE_FIX */
 
 	if (GetOnOff(Section, "DisablePasteMouseRButton", FName, FALSE))
 		ts->PasteFlag |= CPF_DISABLE_RBUTTON;

From svnnotify ＠ sourceforge.jp  Tue Jun 13 19:56:30 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 13 Jun 2017 19:56:30 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY4MDRdIFNJLyBTTyDjga7nhKHlirnljJY=?=
 =?utf-8?b?5a++5b+cIFRpY2tldCA6IDM3MjY2?=
Message-ID: <1497351390.742722.24391.nullmailer@users.sourceforge.jp>

Revision: 6804
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6804
Author:   doda
Date:     2017-06-13 19:56:30 +0900 (Tue, 13 Jun 2017)
Log Message:
-----------
SI/SO の無効化対応 Ticket: 37266

SI/SO を無効化したいという要望はわかるけれど、SI/SO だけでいいのか?
SS2, SS3, LS2, LS3, LS1R, LS2R, LS3R, その他 ISO 2022 の文字指示とかはいいのか?

英語モードで自分が困るのが SI/SO だという事なんだろうけれど……

ISO 2022 の文字セット切り替え全般を制御するオプションにする方がよくないか?

Modified Paths:
--------------
    trunk/teraterm/common/tttypes.h
    trunk/teraterm/teraterm/vtterm.c
    trunk/teraterm/ttpset/ttset.c

-------------- next part --------------
Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h	2017-06-13 10:42:58 UTC (rev 6803)
+++ trunk/teraterm/common/tttypes.h	2017-06-13 10:56:30 UTC (rev 6804)
@@ -567,7 +567,7 @@
 	WORD DisableMenuDuplicateSession;
 	WORD DisableMenuNewConnection;
 	char TerminalUID[9];
-	WORD Dummy4;		// \x8B\x8CConfirmChangePasteCR. PasteFlag\x82?\x9D\x8D\x87\x82\xB5\x82\xBD\x82\xBD\x82?p\x8E~\x81B\x91\xBC\x82?]\x97p
+	WORD EnableSOSI;
 	WORD JumpList;
 	WORD TabStopFlag;
 	DWORD CtrlFlag;

Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c	2017-06-13 10:42:58 UTC (rev 6803)
+++ trunk/teraterm/teraterm/vtterm.c	2017-06-13 10:56:30 UTC (rev 6804)
@@ -802,7 +802,7 @@
 	case NUL:
 		return;
 	case SO:
-		if (! DirectPrn) {
+		if (ts.EnableSOSI && ! DirectPrn) {
 			if ((ts.Language==IdJapanese) &&
 			    (ts.KanjiCode==IdJIS) &&
 			    (ts.JIS7Katakana==1) &&
@@ -815,7 +815,7 @@
 		}
 		break;
 	case SI:
-		if (! DirectPrn) {
+		if (ts.EnableSOSI && ! DirectPrn) {
 			Glr[0] = 0; /* LS0 */
 			return;
 		}
@@ -942,16 +942,22 @@
 		}
 		break;
 	case SO: /* LS1 */
-		if ((ts.Language==IdJapanese) &&
-		    (ts.KanjiCode==IdJIS) &&
-		    (ts.JIS7Katakana==1) &&
-		    ((ts.TermFlag & TF_FIXEDJIS)!=0))
-			Gn[1] = IdKatakana;
+		if (ts.EnableSOSI) {
+			if ((ts.Language==IdJapanese) &&
+			    (ts.KanjiCode==IdJIS) &&
+			    (ts.JIS7Katakana==1) &&
+			    ((ts.TermFlag & TF_FIXEDJIS)!=0))
+			{
+				Gn[1] = IdKatakana;
+			}
 
-		Glr[0] = 1;
+			Glr[0] = 1;
+		}
 		break;
 	case SI: /* LS0 */
-		Glr[0] = 0;
+		if (ts.EnableSOSI) {
+			Glr[0] = 0;
+		}
 		break;
 	case DLE:
 		if ((ts.FTFlag & FT_BPAUTO)!=0)

Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c	2017-06-13 10:42:58 UTC (rev 6803)
+++ trunk/teraterm/ttpset/ttset.c	2017-06-13 10:56:30 UTC (rev 6804)
@@ -1940,6 +1940,8 @@
 	if (GetOnOff(Section, "NormalizeLineBreakOnPaste", FName, FALSE))
 		ts->PasteFlag |= CPF_NORMALIZE_LINEBREAK;
 
+	// Disable SO/SI.
+	ts->EnableSOSI = GetOnOff(Section, "EnableSOSI", FName, TRUE);
 
 	// Fallback to CP932 (Experimental)
 	ts->FallbackToCP932 = GetOnOff(Section, "FallbackToCP932", FName, FALSE);
@@ -3212,6 +3214,9 @@
 	WriteOnOff(Section, "NormalizeLineBreakOnPaste", FName,
 		(WORD) (ts->PasteFlag & CPF_NORMALIZE_LINEBREAK));
 
+	// Disable SO/SI.
+	WriteOnOff(Section, "EnableSOSI", FName, ts->EnableSOSI);
+
 	// CygTerm Configuration File
 	WriteCygtermConfFile(ts);
 }

From svnnotify ＠ sourceforge.jp  Thu Jun 15 09:37:02 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 15 Jun 2017 09:37:02 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B6806=5D__TeraTerm_Project_=E3=81=A8?=
 =?utf-8?b?44GX44Gm44Gu44Op44Kk44K744Oz44K56KGo6KiY44KS6L+95Yqg?=
Message-ID: <1497487022.215721.76281.nullmailer@users.sourceforge.jp>

Revision: 6806
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6806
Author:   doda
Date:     2017-06-15 09:37:01 +0900 (Thu, 15 Jun 2017)
Log Message:
-----------
TeraTerm Project としてのライセンス表記を追加

とりあえず Tera Term 本体分。
TeraTerm Project としての copyright 表記の年部分はコミットログを確認して書いたつもりだけど、ミスってたらすみません。

TODO: 過去に取り込んだパッチに関する著作権表記の追加

Modified Paths:
--------------
    trunk/teraterm/common/codemap.h
    trunk/teraterm/common/compat_w95.h
    trunk/teraterm/common/dlglib.c
    trunk/teraterm/common/dlglib.h
    trunk/teraterm/common/helpid.h
    trunk/teraterm/common/i18n.c
    trunk/teraterm/common/i18n.h
    trunk/teraterm/common/stdafx.cpp
    trunk/teraterm/common/stdafx.h
    trunk/teraterm/common/tektypes.h
    trunk/teraterm/common/teraterm.h
    trunk/teraterm/common/tt_res.h
    trunk/teraterm/common/ttcommon.h
    trunk/teraterm/common/ttftypes.h
    trunk/teraterm/common/ttlib.c
    trunk/teraterm/common/ttlib.h
    trunk/teraterm/common/ttplugin.h
    trunk/teraterm/common/tttypes.h
    trunk/teraterm/keycode/kc_res.h
    trunk/teraterm/keycode/keycode.c
    trunk/teraterm/keycode/keycode.rc
    trunk/teraterm/svnrev/svnrev.cpp
    trunk/teraterm/svnrev/svnrev.h
    trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.c
    trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.h
    trunk/teraterm/teraterm/addsetting.cpp
    trunk/teraterm/teraterm/addsetting.h
    trunk/teraterm/teraterm/buffer.c
    trunk/teraterm/teraterm/buffer.h
    trunk/teraterm/teraterm/clipboar.c
    trunk/teraterm/teraterm/clipboar.h
    trunk/teraterm/teraterm/commlib.c
    trunk/teraterm/teraterm/commlib.h
    trunk/teraterm/teraterm/filesys.cpp
    trunk/teraterm/teraterm/filesys.h
    trunk/teraterm/teraterm/ftdlg.cpp
    trunk/teraterm/teraterm/ftdlg.h
    trunk/teraterm/teraterm/keyboard.c
    trunk/teraterm/teraterm/keyboard.h
    trunk/teraterm/teraterm/prnabort.cpp
    trunk/teraterm/teraterm/prnabort.h
    trunk/teraterm/teraterm/protodlg.cpp
    trunk/teraterm/teraterm/protodlg.h
    trunk/teraterm/teraterm/teklib.c
    trunk/teraterm/teraterm/teklib.h
    trunk/teraterm/teraterm/tekwin.cpp
    trunk/teraterm/teraterm/tekwin.h
    trunk/teraterm/teraterm/telnet.c
    trunk/teraterm/teraterm/telnet.h
    trunk/teraterm/teraterm/teraapp.h
    trunk/teraterm/teraterm/teraprn.cpp
    trunk/teraterm/teraterm/teraprn.h
    trunk/teraterm/teraterm/teraterm.cpp
    trunk/teraterm/teraterm/ttdde.c
    trunk/teraterm/teraterm/ttdde.h
    trunk/teraterm/teraterm/ttdialog.c
    trunk/teraterm/teraterm/ttdialog.h
    trunk/teraterm/teraterm/ttermpro.rc
    trunk/teraterm/teraterm/ttfileio.c
    trunk/teraterm/teraterm/ttfileio.h
    trunk/teraterm/teraterm/ttime.c
    trunk/teraterm/teraterm/ttime.h
    trunk/teraterm/teraterm/ttplug.c
    trunk/teraterm/teraterm/ttplug.h
    trunk/teraterm/teraterm/ttsetup.c
    trunk/teraterm/teraterm/ttsetup.h
    trunk/teraterm/teraterm/ttwinman.c
    trunk/teraterm/teraterm/ttwinman.h
    trunk/teraterm/teraterm/ttwsk.c
    trunk/teraterm/teraterm/ttwsk.h
    trunk/teraterm/teraterm/uni2sjis.map
    trunk/teraterm/teraterm/uni_combining.map
    trunk/teraterm/teraterm/unisym2decsp.map
    trunk/teraterm/teraterm/vtdisp.c
    trunk/teraterm/teraterm/vtdisp.h
    trunk/teraterm/teraterm/vtterm.c
    trunk/teraterm/teraterm/vtterm.h
    trunk/teraterm/teraterm/vtwin.cpp
    trunk/teraterm/teraterm/vtwin.h
    trunk/teraterm/teraterm/winjump.c
    trunk/teraterm/teraterm/winjump.h
    trunk/teraterm/ttpcmn/language.c
    trunk/teraterm/ttpcmn/language.h
    trunk/teraterm/ttpcmn/sjis2uni.map
    trunk/teraterm/ttpcmn/ttcmn.c
    trunk/teraterm/ttpdlg/dlg_res.h
    trunk/teraterm/ttpdlg/ttdlg.c
    trunk/teraterm/ttpdlg/ttdlg.h
    trunk/teraterm/ttpdlg/ttpdlg.rc
    trunk/teraterm/ttpfile/bplus.c
    trunk/teraterm/ttpfile/bplus.h
    trunk/teraterm/ttpfile/file_res.h
    trunk/teraterm/ttpfile/ftlib.c
    trunk/teraterm/ttpfile/ftlib.h
    trunk/teraterm/ttpfile/kermit.c
    trunk/teraterm/ttpfile/kermit.h
    trunk/teraterm/ttpfile/quickvan.c
    trunk/teraterm/ttpfile/quickvan.h
    trunk/teraterm/ttpfile/ttfile.c
    trunk/teraterm/ttpfile/ttpfile.rc
    trunk/teraterm/ttpfile/xmodem.c
    trunk/teraterm/ttpfile/xmodem.h
    trunk/teraterm/ttpfile/ymodem.c
    trunk/teraterm/ttpfile/ymodem.h
    trunk/teraterm/ttpfile/zmodem.c
    trunk/teraterm/ttpfile/zmodem.h
    trunk/teraterm/ttpmacro/ListDlg.cpp
    trunk/teraterm/ttpmacro/ListDlg.h
    trunk/teraterm/ttpmacro/errdlg.cpp
    trunk/teraterm/ttpmacro/errdlg.h
    trunk/teraterm/ttpmacro/inpdlg.cpp
    trunk/teraterm/ttpmacro/inpdlg.h
    trunk/teraterm/ttpmacro/msgdlg.cpp
    trunk/teraterm/ttpmacro/msgdlg.h
    trunk/teraterm/ttpmacro/statdlg.cpp
    trunk/teraterm/ttpmacro/statdlg.h
    trunk/teraterm/ttpmacro/stdafx.h
    trunk/teraterm/ttpmacro/ttl.c
    trunk/teraterm/ttpmacro/ttl.h
    trunk/teraterm/ttpmacro/ttm_res.h
    trunk/teraterm/ttpmacro/ttmacro.cpp
    trunk/teraterm/ttpmacro/ttmacro.h
    trunk/teraterm/ttpmacro/ttmbuff.c
    trunk/teraterm/ttpmacro/ttmbuff.h
    trunk/teraterm/ttpmacro/ttmdde.c
    trunk/teraterm/ttpmacro/ttmdde.h
    trunk/teraterm/ttpmacro/ttmdef.h
    trunk/teraterm/ttpmacro/ttmdlg.cpp
    trunk/teraterm/ttpmacro/ttmdlg.h
    trunk/teraterm/ttpmacro/ttmenc.c
    trunk/teraterm/ttpmacro/ttmenc.h
    trunk/teraterm/ttpmacro/ttmlib.c
    trunk/teraterm/ttpmacro/ttmlib.h
    trunk/teraterm/ttpmacro/ttmmain.cpp
    trunk/teraterm/ttpmacro/ttmmain.h
    trunk/teraterm/ttpmacro/ttmmsg.h
    trunk/teraterm/ttpmacro/ttmonig.h
    trunk/teraterm/ttpmacro/ttmparse.c
    trunk/teraterm/ttpmacro/ttmparse.h
    trunk/teraterm/ttpmacro/ttpmacro.rc
    trunk/teraterm/ttpmacro/wait4all.c
    trunk/teraterm/ttpmacro/wait4all.h
    trunk/teraterm/ttpset/ttset.c
    trunk/teraterm/ttptek/tekesc.c
    trunk/teraterm/ttptek/tekesc.h
    trunk/teraterm/ttptek/tttek.c

-------------- next part --------------
Modified: trunk/teraterm/common/codemap.h
===================================================================
--- trunk/teraterm/common/codemap.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/common/codemap.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,3 +1,29 @@
+/*
+ * Copyright (C) 2008-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
+
 #pragma once
 typedef struct codemap {
 	unsigned short from_code;

Modified: trunk/teraterm/common/compat_w95.h
===================================================================
--- trunk/teraterm/common/compat_w95.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/common/compat_w95.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,3 +1,29 @@
+/*
+ * Copyright (C) 2009-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
+
 // VS2005\x82Ńr\x83\x8B\x83h\x82\xB3\x82?\x83o\x83C\x83i\x83\x8A\x82\xAA Windows95 \x82ł\xE0\x8BN\x93\xAE\x82ł\xAB\x82\xE9\x82悤\x82?\xB7\x82邽\x82??A
 // IsDebuggerPresent()\x82?V\x83\x93\x83{\x83\x8B\x92\xE8\x8B`\x82\xF0\x92?\xC1\x82\xB7\x82\xE9\x81B
 //

Modified: trunk/teraterm/common/dlglib.c
===================================================================
--- trunk/teraterm/common/dlglib.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/common/dlglib.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2008-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* Routines for dialog boxes */
 #include "teraterm.h"

Modified: trunk/teraterm/common/dlglib.h
===================================================================
--- trunk/teraterm/common/dlglib.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/common/dlglib.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2005-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* Routines for dialog boxes */
 #ifdef __cplusplus

Modified: trunk/teraterm/common/helpid.h
===================================================================
--- trunk/teraterm/common/helpid.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/common/helpid.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2006-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* Help constants */
 

Modified: trunk/teraterm/common/i18n.c
===================================================================
--- trunk/teraterm/common/i18n.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/common/i18n.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,28 @@
-/* Tera Term
- (C) 2006 TeraTerm Project
- All rights reserved. */
+/*
+ * Copyright (C) 2006-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 #include "i18n.h"
 

Modified: trunk/teraterm/common/i18n.h
===================================================================
--- trunk/teraterm/common/i18n.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/common/i18n.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,28 @@
-/* Tera Term
- (C) 2006 TeraTerm Project
- All rights reserved. */
+/*
+ * Copyright (C) 2006-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 #ifndef __I18N_H
 #define __I18N_H

Modified: trunk/teraterm/common/stdafx.cpp
===================================================================
--- trunk/teraterm/common/stdafx.cpp	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/common/stdafx.cpp	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,2 +1,29 @@
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2011-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
+
 #include "stdafx.h"
 

Modified: trunk/teraterm/common/stdafx.h
===================================================================
--- trunk/teraterm/common/stdafx.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/common/stdafx.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,3 +1,31 @@
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2009-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
+
+//
 // stdafx.h
 //
 

Modified: trunk/teraterm/common/tektypes.h
===================================================================
--- trunk/teraterm/common/tektypes.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/common/tektypes.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2009-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* Constants and types for TEK window */
 

Modified: trunk/teraterm/common/teraterm.h
===================================================================
--- trunk/teraterm/common/teraterm.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/common/teraterm.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2005-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 /* IPv6 modification is Copyright(C) 2000, 2001 Jun-ya kato <kato ＠ win6.jp> */
 
 #pragma once

Modified: trunk/teraterm/common/tt_res.h
===================================================================
--- trunk/teraterm/common/tt_res.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/common/tt_res.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,3 +1,30 @@
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2004-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
+
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
 // Used by c:\work\ttssh2\teraterm\teraterm\ttermpro.rc

Modified: trunk/teraterm/common/ttcommon.h
===================================================================
--- trunk/teraterm/common/ttcommon.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/common/ttcommon.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2004-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, TTCMN interface */
 

Modified: trunk/teraterm/common/ttftypes.h
===================================================================
--- trunk/teraterm/common/ttftypes.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/common/ttftypes.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2007-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* Constants, types for file transfer */
 

Modified: trunk/teraterm/common/ttlib.c
===================================================================
--- trunk/teraterm/common/ttlib.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/common/ttlib.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2006-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* misc. routines  */
 #include "teraterm.h"

Modified: trunk/teraterm/common/ttlib.h
===================================================================
--- trunk/teraterm/common/ttlib.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/common/ttlib.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2006-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* useful routines */
 

Modified: trunk/teraterm/common/ttplugin.h
===================================================================
--- trunk/teraterm/common/ttplugin.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/common/ttplugin.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,8 +1,31 @@
 /* Tera Term extension mechanism
-   Robert O'Callahan (roc+tt ＠ cs.cmu.edu)
-   
-   Tera Term by Takashi Teranishi (teranishi ＠ rikaxp.riken.go.jp)
-*/
+ *
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) Robert O'Callahan (roc+tt ＠ cs.cmu.edu)
+ * (C) 2008-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 #ifndef __TTPLUGIN_H
 #define __TTPLUGIN_H

Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/common/tttypes.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2004-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* Constants and types for Tera Term */
 #include <locale.h>

Modified: trunk/teraterm/keycode/kc_res.h
===================================================================
--- trunk/teraterm/keycode/kc_res.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/keycode/kc_res.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,3 +1,30 @@
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2009-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
+
 //{{NO_DEPENDENCIES}}
 // Microsoft Developer Studio generated include file.
 // Used by keycode.rc

Modified: trunk/teraterm/keycode/keycode.c
===================================================================
--- trunk/teraterm/keycode/keycode.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/keycode/keycode.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2006-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* keycode.exe for Tera Term Pro */
 

Modified: trunk/teraterm/keycode/keycode.rc
===================================================================
--- trunk/teraterm/keycode/keycode.rc	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/keycode/keycode.rc	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,3 +1,30 @@
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2009-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
+
 //Microsoft Developer Studio generated resource script.
 //
 #include "kc_res.h"

Modified: trunk/teraterm/svnrev/svnrev.cpp
===================================================================
--- trunk/teraterm/svnrev/svnrev.cpp	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/svnrev/svnrev.cpp	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,3 +1,29 @@
+/*
+ * Copyright (C) 2009-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
+
 #include <windows.h>
 #include <stdio.h>
 #include "svnrev.h"

Modified: trunk/teraterm/svnrev/svnrev.h
===================================================================
--- trunk/teraterm/svnrev/svnrev.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/svnrev/svnrev.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1 +1,28 @@
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2009-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
+
 #pragma once

Modified: trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.c
===================================================================
--- trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,4 +1,29 @@
 /*
+ * Copyright (C) 2010-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
+/*
  * WSAAsyncGetAddrInfo.c -- asynchronous version of getaddrinfo
  * Copyright(C) 2000-2003 Jun-ya Kato <kato ＠ win6.jp>
  */

Modified: trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.h
===================================================================
--- trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/WSAAsyncGetAddrInfo.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,4 +1,29 @@
 /*
+ * Copyright (C) 2010-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
+/*
  * WSAAsyncGetAddrInfo.h -- declarations for WSAAsyncGetAddrInfo()
  * Copyright(C) 2000-2003 Jun-ya Kato <kato ＠ win6.jp>
  */

Modified: trunk/teraterm/teraterm/addsetting.cpp
===================================================================
--- trunk/teraterm/teraterm/addsetting.cpp	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/addsetting.cpp	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,4 +1,30 @@
 /*
+ * Copyright (C) 2008-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
+
+/*
  * Additional settings dialog
  */
 

Modified: trunk/teraterm/teraterm/addsetting.h
===================================================================
--- trunk/teraterm/teraterm/addsetting.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/addsetting.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,3 +1,29 @@
+/*
+ * (C) 2008-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
+
 #pragma once
 
 #include "tt_res.h"

Modified: trunk/teraterm/teraterm/buffer.c
===================================================================
--- trunk/teraterm/teraterm/buffer.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/buffer.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2004-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, scroll buffer routines */
 

Modified: trunk/teraterm/teraterm/buffer.h
===================================================================
--- trunk/teraterm/teraterm/buffer.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/buffer.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2005-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, scroll buffer routines */
 

Modified: trunk/teraterm/teraterm/clipboar.c
===================================================================
--- trunk/teraterm/teraterm/clipboar.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/clipboar.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2006-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, Clipboard routines */
 #include "teraterm.h"

Modified: trunk/teraterm/teraterm/clipboar.h
===================================================================
--- trunk/teraterm/teraterm/clipboar.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/clipboar.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2008-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, Clipboard routines */
 

Modified: trunk/teraterm/teraterm/commlib.c
===================================================================
--- trunk/teraterm/teraterm/commlib.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/commlib.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2005-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 /* IPv6 modification is Copyright (C) 2000, 2001 Jun-ya KATO <kato ＠ win6.jp> */
 
 /* TERATERM.EXE, Communication routines */

Modified: trunk/teraterm/teraterm/commlib.h
===================================================================
--- trunk/teraterm/teraterm/commlib.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/commlib.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2007-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, Communication routines */
 #ifdef __cplusplus

Modified: trunk/teraterm/teraterm/filesys.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys.cpp	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/filesys.cpp	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2005-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, file transfer routines */
 #include "stdafx.h"

Modified: trunk/teraterm/teraterm/filesys.h
===================================================================
--- trunk/teraterm/teraterm/filesys.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/filesys.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2007-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, file transfer routines */
 #ifdef __cplusplus

Modified: trunk/teraterm/teraterm/ftdlg.cpp
===================================================================
--- trunk/teraterm/teraterm/ftdlg.cpp	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/ftdlg.cpp	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2007-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, file transfer dialog box */
 #include "stdafx.h"

Modified: trunk/teraterm/teraterm/ftdlg.h
===================================================================
--- trunk/teraterm/teraterm/ftdlg.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/ftdlg.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2007-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, file transfer dialog box */
 

Modified: trunk/teraterm/teraterm/keyboard.c
===================================================================
--- trunk/teraterm/teraterm/keyboard.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/keyboard.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2006-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, keyboard routines */
 

Modified: trunk/teraterm/teraterm/keyboard.h
===================================================================
--- trunk/teraterm/teraterm/keyboard.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/keyboard.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2007-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* proto types */
 #ifdef __cplusplus

Modified: trunk/teraterm/teraterm/prnabort.cpp
===================================================================
--- trunk/teraterm/teraterm/prnabort.cpp	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/prnabort.cpp	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2007-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, print-abort dialog box */
 #include "stdafx.h"

Modified: trunk/teraterm/teraterm/prnabort.h
===================================================================
--- trunk/teraterm/teraterm/prnabort.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/prnabort.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2007-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, print-abort dialog box */
 

Modified: trunk/teraterm/teraterm/protodlg.cpp
===================================================================
--- trunk/teraterm/teraterm/protodlg.cpp	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/protodlg.cpp	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2007-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, file-transfer-protocol dialog box */
 #include "stdafx.h"

Modified: trunk/teraterm/teraterm/protodlg.h
===================================================================
--- trunk/teraterm/teraterm/protodlg.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/protodlg.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2007-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, file-transfer-protocol dialog box */
 

Modified: trunk/teraterm/teraterm/teklib.c
===================================================================
--- trunk/teraterm/teraterm/teklib.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/teklib.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2004-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, TTTEK.DLL interface */
 

Modified: trunk/teraterm/teraterm/teklib.h
===================================================================
--- trunk/teraterm/teraterm/teklib.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/teklib.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2009-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, TTTEK.DLL interface */
 

Modified: trunk/teraterm/teraterm/tekwin.cpp
===================================================================
--- trunk/teraterm/teraterm/tekwin.cpp	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/tekwin.cpp	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2006-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, TEK window */
 #include "stdafx.h"

Modified: trunk/teraterm/teraterm/tekwin.h
===================================================================
--- trunk/teraterm/teraterm/tekwin.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/tekwin.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2006-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, TEK window */
 

Modified: trunk/teraterm/teraterm/telnet.c
===================================================================
--- trunk/teraterm/teraterm/telnet.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/telnet.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2007-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, TELNET routines */
 

Modified: trunk/teraterm/teraterm/telnet.h
===================================================================
--- trunk/teraterm/teraterm/telnet.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/telnet.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2007-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, TELNET routines */
 

Modified: trunk/teraterm/teraterm/teraapp.h
===================================================================
--- trunk/teraterm/teraterm/teraapp.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/teraapp.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2009-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, Main application class */
 

Modified: trunk/teraterm/teraterm/teraprn.cpp
===================================================================
--- trunk/teraterm/teraterm/teraprn.cpp	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/teraprn.cpp	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2007-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, Printing routines */
 #include "stdafx.h"

Modified: trunk/teraterm/teraterm/teraprn.h
===================================================================
--- trunk/teraterm/teraterm/teraprn.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/teraprn.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2008-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, Printing routines */
 

Modified: trunk/teraterm/teraterm/teraterm.cpp
===================================================================
--- trunk/teraterm/teraterm/teraterm.cpp	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/teraterm.cpp	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2006-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, main */
 

Modified: trunk/teraterm/teraterm/ttdde.c
===================================================================
--- trunk/teraterm/teraterm/ttdde.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/ttdde.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2004-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, DDE routines */
 #include "teraterm.h"

Modified: trunk/teraterm/teraterm/ttdde.h
===================================================================
--- trunk/teraterm/teraterm/ttdde.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/ttdde.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2008-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, DDE routines */
 #include <ddeml.h>

Modified: trunk/teraterm/teraterm/ttdialog.c
===================================================================
--- trunk/teraterm/teraterm/ttdialog.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/ttdialog.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2007-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, TTDLG interface */
 #include "teraterm.h"

Modified: trunk/teraterm/teraterm/ttdialog.h
===================================================================
--- trunk/teraterm/teraterm/ttdialog.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/ttdialog.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2007-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, TTDLG interface */
 #ifdef __cplusplus

Modified: trunk/teraterm/teraterm/ttermpro.rc
===================================================================
--- trunk/teraterm/teraterm/ttermpro.rc	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/ttermpro.rc	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,5 +1,33 @@
 // Microsoft Visual C++ generated resource script.
 //
+
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2004-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
+
 #include "..\common\tt_res.h"
 
 #define APSTUDIO_READONLY_SYMBOLS

Modified: trunk/teraterm/teraterm/ttfileio.c
===================================================================
--- trunk/teraterm/teraterm/ttfileio.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/ttfileio.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,28 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 2008-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, TTSET interface */
 #include "teraterm.h"

Modified: trunk/teraterm/teraterm/ttfileio.h
===================================================================
--- trunk/teraterm/teraterm/ttfileio.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/ttfileio.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,28 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 2008-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, Serial/File interface */
 #ifdef __cplusplus

Modified: trunk/teraterm/teraterm/ttime.c
===================================================================
--- trunk/teraterm/teraterm/ttime.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/ttime.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,3 +1,29 @@
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2007-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 /* Tera Term */
 /* TERATERM.EXE, IME interface */
 

Modified: trunk/teraterm/teraterm/ttime.h
===================================================================
--- trunk/teraterm/teraterm/ttime.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/ttime.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,3 +1,29 @@
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2007-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 /* Tera Term */
 /* TERATERM.EXE, IME interface */
 

Modified: trunk/teraterm/teraterm/ttplug.c
===================================================================
--- trunk/teraterm/teraterm/ttplug.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/ttplug.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,3 +1,30 @@
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) Robert O'Callahan
+ * (C) 2004-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 #include "teraterm.h"
 #include "tttypes.h"
 #include "ttlib.h"

Modified: trunk/teraterm/teraterm/ttplug.h
===================================================================
--- trunk/teraterm/teraterm/ttplug.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/ttplug.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,3 +1,30 @@
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) Robert O'Callahan
+ * (C) 2008-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 #ifndef __TTPLUG_H
 #define __TTPLUG_H
 

Modified: trunk/teraterm/teraterm/ttsetup.c
===================================================================
--- trunk/teraterm/teraterm/ttsetup.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/ttsetup.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2007-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, TTSET interface */
 #include "teraterm.h"

Modified: trunk/teraterm/teraterm/ttsetup.h
===================================================================
--- trunk/teraterm/teraterm/ttsetup.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/ttsetup.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2007-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, TTSET interface */
 #ifdef __cplusplus

Modified: trunk/teraterm/teraterm/ttwinman.c
===================================================================
--- trunk/teraterm/teraterm/ttwinman.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/ttwinman.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2005-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, variables, flags related to VT win and TEK win */
 

Modified: trunk/teraterm/teraterm/ttwinman.h
===================================================================
--- trunk/teraterm/teraterm/ttwinman.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/ttwinman.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2006-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, variables, flags related to VT win and TEK win */
 #ifdef __cplusplus

Modified: trunk/teraterm/teraterm/ttwsk.c
===================================================================
--- trunk/teraterm/teraterm/ttwsk.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/ttwsk.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2007-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, Winsock interface */
 

Modified: trunk/teraterm/teraterm/ttwsk.h
===================================================================
--- trunk/teraterm/teraterm/ttwsk.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/ttwsk.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2007-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 /* IPv6 modification is Copyright(C) 2000 Jun-ya Kato <kato ＠ win6.jp> */
 
 /* TERATERM.EXE, Winsock interface */

Modified: trunk/teraterm/teraterm/uni2sjis.map
===================================================================
--- trunk/teraterm/teraterm/uni2sjis.map	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/uni2sjis.map	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,3 +1,28 @@
+/*
+ * Copyright (C) 2004-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 #include "codemap.h"
 
 /*

Modified: trunk/teraterm/teraterm/uni_combining.map
===================================================================
--- trunk/teraterm/teraterm/uni_combining.map	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/uni_combining.map	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,3 +1,28 @@
+/*
+ * Copyright (C) 2004-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 typedef struct combining_map {
 	unsigned short precomposed;
 	unsigned short first_code;

Modified: trunk/teraterm/teraterm/unisym2decsp.map
===================================================================
--- trunk/teraterm/teraterm/unisym2decsp.map	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/unisym2decsp.map	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,3 +1,28 @@
+/*
+ * Copyright (C) 2009-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 #include "codemap.h"
 
 /*

Modified: trunk/teraterm/teraterm/vtdisp.c
===================================================================
--- trunk/teraterm/teraterm/vtdisp.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/vtdisp.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2005-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, VT terminal display routines */
 #include "teraterm.h"

Modified: trunk/teraterm/teraterm/vtdisp.h
===================================================================
--- trunk/teraterm/teraterm/vtdisp.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/vtdisp.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2008-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, VT terminal display routines */
 #ifdef __cplusplus

Modified: trunk/teraterm/teraterm/vtterm.c
===================================================================
--- trunk/teraterm/teraterm/vtterm.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/vtterm.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2004-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, VT terminal emulation */
 #include "teraterm.h"

Modified: trunk/teraterm/teraterm/vtterm.h
===================================================================
--- trunk/teraterm/teraterm/vtterm.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/vtterm.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2007-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, VT terminal emulation */
 

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/vtwin.cpp	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2004-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 /* IPv6 modification is Copyright(C) 2000 Jun-ya Kato <kato ＠ win6.jp> */
 
 /* TERATERM.EXE, VT window */

Modified: trunk/teraterm/teraterm/vtwin.h
===================================================================
--- trunk/teraterm/teraterm/vtwin.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/vtwin.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2004-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TERATERM.EXE, VT window */
 

Modified: trunk/teraterm/teraterm/winjump.c
===================================================================
--- trunk/teraterm/teraterm/winjump.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/winjump.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -18,6 +18,32 @@
  * contains higher level functions to manipulate the jumplist.
  */
 
+/*
+ * Copyright (C) 2011-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
+
 #include <windows.h>
 #include <assert.h>
 #include <stdio.h>

Modified: trunk/teraterm/teraterm/winjump.h
===================================================================
--- trunk/teraterm/teraterm/winjump.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/teraterm/winjump.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,3 +1,29 @@
+/*
+ * Copyright (C) 2011-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
+
 #ifdef __cplusplus
 extern "C" {
 #endif

Modified: trunk/teraterm/ttpcmn/language.c
===================================================================
--- trunk/teraterm/ttpcmn/language.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpcmn/language.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2006-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 // TTCMN.DLL character code conversion
 

Modified: trunk/teraterm/ttpcmn/language.h
===================================================================
--- trunk/teraterm/ttpcmn/language.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpcmn/language.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2010-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTCMN.DLL, character code conversion */
 

Modified: trunk/teraterm/ttpcmn/sjis2uni.map
===================================================================
--- trunk/teraterm/ttpcmn/sjis2uni.map	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpcmn/sjis2uni.map	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,3 +1,28 @@
+/*
+ * Copyright (C) 2004-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 #include "codemap.h"
 
 /*

Modified: trunk/teraterm/ttpcmn/ttcmn.c
===================================================================
--- trunk/teraterm/ttpcmn/ttcmn.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpcmn/ttcmn.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2004-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 #ifndef _WIN32_IE
 #define _WIN32_IE 0x501

Modified: trunk/teraterm/ttpdlg/dlg_res.h
===================================================================
--- trunk/teraterm/ttpdlg/dlg_res.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpdlg/dlg_res.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,3 +1,29 @@
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2005-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
 // Used by ttpdlg.rc

Modified: trunk/teraterm/ttpdlg/ttdlg.c
===================================================================
--- trunk/teraterm/ttpdlg/ttdlg.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpdlg/ttdlg.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2004-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 /* IPv6 modification is Copyright(C) 2000 Jun-ya Kato <kato ＠ win6.jp> */
 
 /* TTDLG.DLL, dialog boxes */

Modified: trunk/teraterm/ttpdlg/ttdlg.h
===================================================================
--- trunk/teraterm/ttpdlg/ttdlg.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpdlg/ttdlg.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1 +1,27 @@
+/*
+ * Copyright (C) 2008-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
+
 void PASCAL TTDLGSetUILanguageFile(char *file);

Modified: trunk/teraterm/ttpdlg/ttpdlg.rc
===================================================================
--- trunk/teraterm/ttpdlg/ttpdlg.rc	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpdlg/ttpdlg.rc	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,3 +1,29 @@
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2004-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 // Microsoft Visual C++ generated resource script.
 //
 #include "dlg_res.h"

Modified: trunk/teraterm/ttpfile/bplus.c
===================================================================
--- trunk/teraterm/ttpfile/bplus.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpfile/bplus.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2007-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTFILE.DLL, B-Plus protocol */
 #include "teraterm.h"

Modified: trunk/teraterm/ttpfile/bplus.h
===================================================================
--- trunk/teraterm/ttpfile/bplus.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpfile/bplus.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2007-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTFILE.DLL, B-Plus protocol */
 

Modified: trunk/teraterm/ttpfile/file_res.h
===================================================================
--- trunk/teraterm/ttpfile/file_res.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpfile/file_res.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,3 +1,29 @@
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2005-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
 // Used by ttpfile.rc

Modified: trunk/teraterm/ttpfile/ftlib.c
===================================================================
--- trunk/teraterm/ttpfile/ftlib.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpfile/ftlib.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2007-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTFILE.DLL, routines for file transfer protocol */
 

Modified: trunk/teraterm/ttpfile/ftlib.h
===================================================================
--- trunk/teraterm/ttpfile/ftlib.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpfile/ftlib.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2007-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTFILE.DLL, routines for file transfer protocol */
 

Modified: trunk/teraterm/ttpfile/kermit.c
===================================================================
--- trunk/teraterm/ttpfile/kermit.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpfile/kermit.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,10 +1,28 @@
-/* Tera Term
-Copyright(C) 1994-1998 T. Teranishi
-All rights reserved. 
-(C) 2004-2012 TeraTerm Project
-All rights reserved. 
-
-  Kermit specification: http://www.kermitproject.org/
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2007-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
  */
 
 /* TTFILE.DLL, Kermit protocol */

Modified: trunk/teraterm/ttpfile/kermit.h
===================================================================
--- trunk/teraterm/ttpfile/kermit.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpfile/kermit.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2007-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTFILE.DLL, Kermit protocol */
 

Modified: trunk/teraterm/ttpfile/quickvan.c
===================================================================
--- trunk/teraterm/ttpfile/quickvan.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpfile/quickvan.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2006-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTFILE.DLL, Quick-VAN protocol */
 #include "teraterm.h"

Modified: trunk/teraterm/ttpfile/quickvan.h
===================================================================
--- trunk/teraterm/ttpfile/quickvan.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpfile/quickvan.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2009-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTFILE.DLL, Quick-VAN protocol */
 

Modified: trunk/teraterm/ttpfile/ttfile.c
===================================================================
--- trunk/teraterm/ttpfile/ttfile.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpfile/ttfile.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2005-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTFILE.DLL, file transfer, VT window printing */
 #include "teraterm.h"

Modified: trunk/teraterm/ttpfile/ttpfile.rc
===================================================================
--- trunk/teraterm/ttpfile/ttpfile.rc	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpfile/ttpfile.rc	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,3 +1,29 @@
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2005-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 // Microsoft Visual C++ generated resource script.
 //
 #include "file_res.h"

Modified: trunk/teraterm/ttpfile/xmodem.c
===================================================================
--- trunk/teraterm/ttpfile/xmodem.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpfile/xmodem.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2006-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTFILE.DLL, XMODEM protocol */
 #include "teraterm.h"

Modified: trunk/teraterm/ttpfile/xmodem.h
===================================================================
--- trunk/teraterm/ttpfile/xmodem.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpfile/xmodem.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2009-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTFILE.DLL, XMODEM protocol */
 

Modified: trunk/teraterm/ttpfile/ymodem.c
===================================================================
--- trunk/teraterm/ttpfile/ymodem.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpfile/ymodem.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,28 @@
-/* Tera Term
-(C) 2008-2010 TeraTerm Project
-All rights reserved. */
+/*
+ * Copyright (C) 2008-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTFILE.DLL, YMODEM protocol */
 #include <sys/types.h>

Modified: trunk/teraterm/ttpfile/ymodem.h
===================================================================
--- trunk/teraterm/ttpfile/ymodem.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpfile/ymodem.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,28 @@
-/* Tera Term
- (C) 2008 TeraTerm Project
- All rights reserved. */
+/*
+ * Copyright (C) 2008-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTFILE.DLL, YMODEM protocol */
 

Modified: trunk/teraterm/ttpfile/zmodem.c
===================================================================
--- trunk/teraterm/ttpfile/zmodem.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpfile/zmodem.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,7 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- (C) 2010 TeraTerm Project
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2007-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /*
  "ZMODEM.LOG"\x82?\xA9\x95\xFB\x81F

Modified: trunk/teraterm/ttpfile/zmodem.h
===================================================================
--- trunk/teraterm/ttpfile/zmodem.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpfile/zmodem.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2009-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTFILE.DLL, ZMODEM protocol */
 

Modified: trunk/teraterm/ttpmacro/ListDlg.cpp
===================================================================
--- trunk/teraterm/ttpmacro/ListDlg.cpp	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/ListDlg.cpp	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,3 +1,29 @@
+/*
+ * Copyright (C) 2013-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
+//
 // ListDlg.cpp : \x8E\xC0\x91\x95\x83t\x83@\x83C\x83\x8B
 //
 

Modified: trunk/teraterm/ttpmacro/ListDlg.h
===================================================================
--- trunk/teraterm/ttpmacro/ListDlg.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/ListDlg.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,3 +1,28 @@
+/*
+ * Copyright (C) 2013-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 #pragma once
 #include "afxwin.h"
 

Modified: trunk/teraterm/ttpmacro/errdlg.cpp
===================================================================
--- trunk/teraterm/ttpmacro/errdlg.cpp	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/errdlg.cpp	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2007-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTMACRO.EXE, error dialog box */
 

Modified: trunk/teraterm/ttpmacro/errdlg.h
===================================================================
--- trunk/teraterm/ttpmacro/errdlg.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/errdlg.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2007-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTMACRO.EXE, error dialog box */
 

Modified: trunk/teraterm/ttpmacro/inpdlg.cpp
===================================================================
--- trunk/teraterm/ttpmacro/inpdlg.cpp	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/inpdlg.cpp	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2006-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTMACRO.EXE, input dialog box */
 

Modified: trunk/teraterm/ttpmacro/inpdlg.h
===================================================================
--- trunk/teraterm/ttpmacro/inpdlg.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/inpdlg.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2006-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTMACRO.EXE, input dialog box */
 

Modified: trunk/teraterm/ttpmacro/msgdlg.cpp
===================================================================
--- trunk/teraterm/ttpmacro/msgdlg.cpp	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/msgdlg.cpp	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2006-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTMACRO.EXE, message dialog box */
 

Modified: trunk/teraterm/ttpmacro/msgdlg.h
===================================================================
--- trunk/teraterm/ttpmacro/msgdlg.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/msgdlg.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2006-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTMACRO.EXE, message dialog box */
 

Modified: trunk/teraterm/ttpmacro/statdlg.cpp
===================================================================
--- trunk/teraterm/ttpmacro/statdlg.cpp	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/statdlg.cpp	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2006-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTMACRO.EXE, status dialog box */
 

Modified: trunk/teraterm/ttpmacro/statdlg.h
===================================================================
--- trunk/teraterm/ttpmacro/statdlg.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/statdlg.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2007-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTMACRO.EXE, status dialog box */
 

Modified: trunk/teraterm/ttpmacro/stdafx.h
===================================================================
--- trunk/teraterm/ttpmacro/stdafx.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/stdafx.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,2 +1,27 @@
+/*
+ * Copyright (C) 2013-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 #pragma once
 #include <afxwin.h>

Modified: trunk/teraterm/ttpmacro/ttl.c
===================================================================
--- trunk/teraterm/ttpmacro/ttl.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/ttl.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2005-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTMACRO.EXE, Tera Term Language interpreter */
 

Modified: trunk/teraterm/ttpmacro/ttl.h
===================================================================
--- trunk/teraterm/ttpmacro/ttl.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/ttl.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2005-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTMACRO.EXE, Tera Term Language interpreter */
 

Modified: trunk/teraterm/ttpmacro/ttm_res.h
===================================================================
--- trunk/teraterm/ttpmacro/ttm_res.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/ttm_res.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,3 +1,29 @@
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2005-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
 // Used by ttpmacro.rc

Modified: trunk/teraterm/ttpmacro/ttmacro.cpp
===================================================================
--- trunk/teraterm/ttpmacro/ttmacro.cpp	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/ttmacro.cpp	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2006-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTMACRO.EXE, main */
 

Modified: trunk/teraterm/ttpmacro/ttmacro.h
===================================================================
--- trunk/teraterm/ttpmacro/ttmacro.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/ttmacro.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2009-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTMACRO.EXE, main */
 

Modified: trunk/teraterm/ttpmacro/ttmbuff.c
===================================================================
--- trunk/teraterm/ttpmacro/ttmbuff.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/ttmbuff.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-// Tera Term
-// Copyright(C) 1994-1998 T. Teranishi
-// All rights reserved.
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2005-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 // TTMACRO.EXE, Macro file buffer
 

Modified: trunk/teraterm/ttpmacro/ttmbuff.h
===================================================================
--- trunk/teraterm/ttpmacro/ttmbuff.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/ttmbuff.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2005-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTMACRO.EXE, Macro file buffer */
 

Modified: trunk/teraterm/ttpmacro/ttmdde.c
===================================================================
--- trunk/teraterm/ttpmacro/ttmdde.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/ttmdde.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-// Tera Term
-// Copyright(C) 1994-1998 T. Teranishi
-// All rights reserved.
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2005-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 // TTMACRO.EXE, DDE routines
 

Modified: trunk/teraterm/ttpmacro/ttmdde.h
===================================================================
--- trunk/teraterm/ttpmacro/ttmdde.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/ttmdde.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2005-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTMACRO.EXE, DDE routines */
 

Modified: trunk/teraterm/ttpmacro/ttmdef.h
===================================================================
--- trunk/teraterm/ttpmacro/ttmdef.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/ttmdef.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,28 @@
-/* Tera Term
- Copyright(C) 2016 TeraTerm Project
- All rights reserved. */
+/*
+ * Copyright (C) 2016-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTMACRO.EXE, common definitions */
 

Modified: trunk/teraterm/ttpmacro/ttmdlg.cpp
===================================================================
--- trunk/teraterm/ttpmacro/ttmdlg.cpp	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/ttmdlg.cpp	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2006-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTMACRO.EXE, dialog boxes */
 

Modified: trunk/teraterm/ttpmacro/ttmdlg.h
===================================================================
--- trunk/teraterm/ttpmacro/ttmdlg.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/ttmdlg.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2007-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTMACRO.EXE, dialog boxes */
 

Modified: trunk/teraterm/ttpmacro/ttmenc.c
===================================================================
--- trunk/teraterm/ttpmacro/ttmenc.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/ttmenc.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
-   Copyright(C) 1994-1998 T. Teranishi
-   All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2009-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTMACRO.EXE, password encryption */
 

Modified: trunk/teraterm/ttpmacro/ttmenc.h
===================================================================
--- trunk/teraterm/ttpmacro/ttmenc.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/ttmenc.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2009-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTMACRO.EXE, password encryption */
 

Modified: trunk/teraterm/ttpmacro/ttmlib.c
===================================================================
--- trunk/teraterm/ttpmacro/ttmlib.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/ttmlib.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-// Tera Term
-// Copyright(C) 1994-1998 T. Teranishi
-// All rights reserved.
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2006-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 // TTMACRO.EXE, misc routines
 

Modified: trunk/teraterm/ttpmacro/ttmlib.h
===================================================================
--- trunk/teraterm/ttpmacro/ttmlib.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/ttmlib.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-// Tera Term
-// Copyright(C) 1994-1998 T. Teranishi
-// All rights reserved.
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2006-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 // TTMACRO.EXE, misc routines
 

Modified: trunk/teraterm/ttpmacro/ttmmain.cpp
===================================================================
--- trunk/teraterm/ttpmacro/ttmmain.cpp	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/ttmmain.cpp	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2005-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTMACRO.EXE, main */
 

Modified: trunk/teraterm/ttpmacro/ttmmain.h
===================================================================
--- trunk/teraterm/ttpmacro/ttmmain.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/ttmmain.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2007-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTMACRO.EXE, main window */
 

Modified: trunk/teraterm/ttpmacro/ttmmsg.h
===================================================================
--- trunk/teraterm/ttpmacro/ttmmsg.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/ttmmsg.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2013-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTMACRO.EXE, message IDs */
 

Modified: trunk/teraterm/ttpmacro/ttmonig.h
===================================================================
--- trunk/teraterm/ttpmacro/ttmonig.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/ttmonig.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,3 +1,28 @@
+/*
+ * Copyright (C) 2013-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 #pragma once
 
 // Oniguruma: Regular expression library

Modified: trunk/teraterm/ttpmacro/ttmparse.c
===================================================================
--- trunk/teraterm/ttpmacro/ttmparse.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/ttmparse.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-// Tera Term
-// Copyright(C) 1994-1998 T. Teranishi
-// All rights reserved.
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2005-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 // TTMACRO.EXE, TTL parser
 

Modified: trunk/teraterm/ttpmacro/ttmparse.h
===================================================================
--- trunk/teraterm/ttpmacro/ttmparse.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/ttmparse.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2005-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTMACRO.EXE, TTL parser */
 

Modified: trunk/teraterm/ttpmacro/ttpmacro.rc
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.rc	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/ttpmacro.rc	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,3 +1,29 @@
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2005-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 // Microsoft Visual C++ generated resource script.
 //
 #include "ttm_res.h"

Modified: trunk/teraterm/ttpmacro/wait4all.c
===================================================================
--- trunk/teraterm/ttpmacro/wait4all.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/wait4all.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,4 +1,29 @@
 /*
+ * Copyright (C) 2009-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
+/*
  * "wait4all"\x83}\x83N\x83\x8D\x83R\x83}\x83\x93\x83h\x97p\x83\x8B\x81[\x83`\x83\x93
  *
  */

Modified: trunk/teraterm/ttpmacro/wait4all.h
===================================================================
--- trunk/teraterm/ttpmacro/wait4all.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpmacro/wait4all.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,4 +1,29 @@
 /*
+ * Copyright (C) 2009-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
+/*
  * wait4all.h
  *
  */

Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttpset/ttset.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2004-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 /* IPv6 modification is Copyright(C) 2000 Jun-ya kato <kato ＠ win6.jp> */
 
 /* TTSET.DLL, setup file routines*/

Modified: trunk/teraterm/ttptek/tekesc.c
===================================================================
--- trunk/teraterm/ttptek/tekesc.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttptek/tekesc.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2009-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTTEK.DLL, TEK escape sequences */
 #include "teraterm.h"

Modified: trunk/teraterm/ttptek/tekesc.h
===================================================================
--- trunk/teraterm/ttptek/tekesc.h	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttptek/tekesc.h	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTTEK.DLL, TEK escape sequences */
 

Modified: trunk/teraterm/ttptek/tttek.c
===================================================================
--- trunk/teraterm/ttptek/tttek.c	2017-06-15 00:36:45 UTC (rev 6805)
+++ trunk/teraterm/ttptek/tttek.c	2017-06-15 00:37:01 UTC (rev 6806)
@@ -1,6 +1,29 @@
-/* Tera Term
- Copyright(C) 1994-1998 T. Teranishi
- All rights reserved. */
+/*
+ * Copyright (C) 1994-1998 T. Teranishi
+ * (C) 2007-2017 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *   1. Redistributions of source code must retain the above copyright notice,
+ *      this list of conditions and the following disclaimer.
+ *   2. Redistributions in binary form must reproduce the above copyright notice,
+ *      this list of conditions and the following disclaimer in the documentation
+ *      and/or other materials provided with the distribution.
+ *   3. The name of the author may not be used to endorse or promote products derived
+ *      from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
+ * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
+ * OF SUCH DAMAGE.
+ */
 
 /* TTTEK.DLL, for TEK window */
 #include "teraterm.h"

From svnnotify ＠ sourceforge.jp  Thu Jun 15 09:36:46 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 15 Jun 2017 09:36:46 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY4MDVdICDlj4LogINVUkzlpInmm7Q=?=
Message-ID: <1497487006.093598.72741.nullmailer@users.sourceforge.jp>

Revision: 6805
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6805
Author:   doda
Date:     2017-06-15 09:36:45 +0900 (Thu, 15 Jun 2017)
Log Message:
-----------
参考URL変更

Modified Paths:
--------------
    trunk/teraterm/common/compat_w95.h

-------------- next part --------------
Modified: trunk/teraterm/common/compat_w95.h
===================================================================
--- trunk/teraterm/common/compat_w95.h	2017-06-13 10:56:30 UTC (rev 6804)
+++ trunk/teraterm/common/compat_w95.h	2017-06-15 00:36:45 UTC (rev 6805)
@@ -1,7 +1,7 @@
 // VS2005\x82Ńr\x83\x8B\x83h\x82\xB3\x82?\x83o\x83C\x83i\x83\x8A\x82\xAA Windows95 \x82ł\xE0\x8BN\x93\xAE\x82ł\xAB\x82\xE9\x82悤\x82?\xB7\x82邽\x82??A
 // IsDebuggerPresent()\x82?V\x83\x93\x83{\x83\x8B\x92\xE8\x8B`\x82\xF0\x92?\xC1\x82\xB7\x82\xE9\x81B
 //
-// cf.http://jet2.u-abel.net/program/tips/forceimp.htm
+// cf. https://pf-j.sakura.ne.jp/program/tips/forceimp.htm
 
 
 #if _MSC_VER == 1400

From svnnotify ＠ sourceforge.jp  Mon Jun 19 12:54:18 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 19 Jun 2017 12:54:18 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY4MDddICDjg6njgqTjgrvjg7PjgrnlkI0=?=
 =?utf-8?b?44KS5Y6z5a+G44Gr6KGo6KiY44O744Op44Kk44OW44Op44Oq44Gu44Op44Kk?=
 =?utf-8?b?44K744Oz44K55ZCN6KGo6KiY44KS6L+95Yqg?=
Message-ID: <1497844458.682618.15190.nullmailer@users.sourceforge.jp>

Revision: 6807
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6807
Author:   maya
Date:     2017-06-19 12:54:18 +0900 (Mon, 19 Jun 2017)
Log Message:
-----------
ライセンス名を厳密に表記・ライブラリのライセンス名表記を追加

Modified Paths:
--------------
    trunk/doc/en/html/about/copyright.html
    trunk/doc/ja/html/about/copyright.html

-------------- next part --------------
Modified: trunk/doc/en/html/about/copyright.html
===================================================================
--- trunk/doc/en/html/about/copyright.html	2017-06-15 00:37:01 UTC (rev 6806)
+++ trunk/doc/en/html/about/copyright.html	2017-06-19 03:54:18 UTC (rev 6807)
@@ -13,17 +13,27 @@
 <h1>License and Copyright</h1>
 
 <h2>Contents</h2>
+<!--h3>\x8D\\x90\xAC\x83\x82\x83W\x83\x85\x81[\x83\x8B</h3-->
 <ul>
-  <li><a href="#license_teraterm">Tera Term</a> ... BSD style license</li>
-  <li><a href="#license_ttssh">TTSSH</a> ... BSD style license</li>
-  <li><a href="#license_cygterm">CygTerm+</a> ... GPL v2</li>
-  <li><a href="#license_ttproxy">TTProxy</a> ... BSD style license</li>
-  <li><a href="#license_ttmenu">TeraTerm Menu</a> ... BSD style license</li>
-  <li><a href="#license_kanjimenu">TTX KanjiMenu</a> ... BSD style license</li>
-  <li>Additional plugins ... BSD style license.</li>
+  <li><a href="#license_teraterm">Tera Term</a> ... 3-clause BSD license</li>
+  <li><a href="#license_ttssh">TTSSH</a> ... 3-clause BSD license</li>
+  <li><a href="#license_cygterm">CygTerm+</a> ... <a href="../reference/CygTerm+-LICENSE.txt">GPL v2</a></li>
+  <li><a href="#license_ttproxy">TTProxy</a> ... 3-clause BSD license</li>
+  <li><a href="#license_ttmenu">TeraTerm Menu</a> ... 3-clause BSD license</li>
+  <li><a href="#license_kanjimenu">TTX KanjiMenu</a> ... 3-clause BSD license</li>
+  <li>Additional plugins ... 3-clause BSD license</li>
   <li>Collector ... Freeware. Source code is not available.</li>
   <li>LogMeTT, TTLEditor ... Freeware. Proprietary license. Source code is not available.</li>
 </ul>
+<!--h3>\x8Eg\x97p\x82\xB5\x82Ă\xA2\x82?\x83C\x83u\x83\x89\x83\x8A(\x83\\x81[\x83X\x83R\x81[\x83h)</h3-->
+<ul>
+  <li>Oniguruma ... <a href="../reference/Oniguruma-LICENSE.txt">2-clause BSD license</a></li>
+  <li>SFMT ... <a href="../reference/SFMT-LICENSE.txt">3-clause BSD license</a></li>
+  <li>OpenSSH ... <a href="../reference/OpenSSH-LICENSE.txt">BSD style license</a></li>
+  <li>OpenSSL ... <a href="../reference/OpenSSL-LICENSE.txt">Dual(both) license, OpenSSL License(Apache License 1.0) and SSLeay License(4-clause BSD license)</a></li>
+  <li>zlib ... <a href="../reference/zlib-LICENSE.txt">zlib License</a></li>
+  <li>PuTTY ... <a href="../reference/PuTTY-LICENSE.txt">MIT License</a></li>
+</ul>
 
 
 <h2>Tera Term</h2>

Modified: trunk/doc/ja/html/about/copyright.html
===================================================================
--- trunk/doc/ja/html/about/copyright.html	2017-06-15 00:37:01 UTC (rev 6806)
+++ trunk/doc/ja/html/about/copyright.html	2017-06-19 03:54:18 UTC (rev 6807)
@@ -13,17 +13,27 @@
 <h1>\x83\x89\x83C\x83Z\x83\x93\x83X\x81E\x92\x98\x8D?</h1>
 
 <h2>\x8AT\x97v</h2>
+<h3>\x8D\\x90\xAC\x83\x82\x83W\x83\x85\x81[\x83\x8B</h3>
 <ul>
-  <li><a href="#license_teraterm">Tera Term</a> ... BSD\x83X\x83^\x83C\x83\x8B\x83\x89\x83C\x83Z\x83\x93\x83X</li>
-  <li><a href="#license_ttssh">TTSSH</a> ... BSD\x83X\x83^\x83C\x83\x8B\x83\x89\x83C\x83Z\x83\x93\x83X</li>
-  <li><a href="#license_cygterm">CygTerm+</a> ... GPL v2</li>
-  <li><a href="#license_ttproxy">TTProxy</a> ... BSD\x83X\x83^\x83C\x83\x8B\x83\x89\x83C\x83Z\x83\x93\x83X</li>
-  <li><a href="#license_ttmenu">TeraTerm Menu</a> ... BSD\x83X\x83^\x83C\x83\x8B\x83\x89\x83C\x83Z\x83\x93\x83X</li>
-  <li><a href="#license_kanjimenu">TTX KanjiMenu</a> ... BSD\x83X\x83^\x83C\x83\x8B\x83\x89\x83C\x83Z\x83\x93\x83X</li>
-  <li>\x92?\xC1\x83v\x83\x89\x83O\x83C\x83\x93 ... BSD\x83X\x83^\x83C\x83\x8B\x83\x89\x83C\x83Z\x83\x93\x83X</li>
+  <li><a href="#license_teraterm">Tera Term</a> ... \x8EO\x8F\xF0\x8D\x80BSD\x83\x89\x83C\x83Z\x83\x93\x83X</li>
+  <li><a href="#license_ttssh">TTSSH</a> ... \x8EO\x8F\xF0\x8D\x80BSD\x83\x89\x83C\x83Z\x83\x93\x83X</li>
+  <li><a href="#license_cygterm">CygTerm+</a> ... <a href="../reference/CygTerm+-LICENSE.txt">GPL v2</a></li>
+  <li><a href="#license_ttproxy">TTProxy</a> ... \x8EO\x8F\xF0\x8D\x80BSD\x83\x89\x83C\x83Z\x83\x93\x83X</li>
+  <li><a href="#license_ttmenu">TeraTerm Menu</a> ... \x8EO\x8F\xF0\x8D\x80BSD\x83\x89\x83C\x83Z\x83\x93\x83X</li>
+  <li><a href="#license_kanjimenu">TTX KanjiMenu</a> ... \x8EO\x8F\xF0\x8D\x80BSD\x83\x89\x83C\x83Z\x83\x93\x83X</li>
+  <li>\x92?\xC1\x83v\x83\x89\x83O\x83C\x83\x93 ... \x8EO\x8F\xF0\x8D\x80BSD\x83\x89\x83C\x83Z\x83\x93\x83X</li>
   <li>Collector ... \x83t\x83\x8A\x81[\x83E\x83F\x83A \x83\\x81[\x83X\x83R\x81[\x83h\x92??\xB5</li>
   <li>LogMeTT, TTLEditor ... \x83t\x83\x8A\x81[\x83E\x83F\x83A \x83v\x83\x8D\x83v\x83\x89\x83C\x83G\x83^\x83\x8A\x81E\x83\x89\x83C\x83Z\x83\x93\x83X \x83\\x81[\x83X\x83R\x81[\x83h\x92??\xB5</li>
 </ul>
+<h3>\x8Eg\x97p\x82\xB5\x82Ă\xA2\x82?\x83C\x83u\x83\x89\x83\x8A(\x83\\x81[\x83X\x83R\x81[\x83h)</h3>
+<ul>
+  <li>Oniguruma ... <a href="../reference/Oniguruma-LICENSE.txt">\x93\xF1\x8F\xF0\x8D\x80BSD\x83\x89\x83C\x83Z\x83\x93\x83X</a></li>
+  <li>SFMT ... <a href="../reference/SFMT-LICENSE.txt">\x8EO\x8F\xF0\x8D\x80BSD\x83\x89\x83C\x83Z\x83\x93\x83X</a></li>
+  <li>OpenSSH ... <a href="../reference/OpenSSH-LICENSE.txt">BSD\x83X\x83^\x83C\x83\x8B\x83\x89\x83C\x83Z\x83\x93\x83X</a></li>
+  <li>OpenSSL ... <a href="../reference/OpenSSL-LICENSE.txt">OpenSSL License(Apache License 1.0) \x82\xC6 SSLeay License(\x8El\x8F\xF0\x8D\x80BSD\x83\x89\x83C\x83Z\x83\x93\x83X) \x82?f\x83\x85\x83A\x83\x8B\x83\x89\x83C\x83Z\x83\x93\x83X(\x97\xBC\x95\xFB\x82\xAA\x93K\x97p\x82\xB3\x82\xEA\x82\xE9)</a></li>
+  <li>zlib ... <a href="../reference/zlib-LICENSE.txt">zlib\x83\x89\x83C\x83Z\x83\x93\x83X</a></li>
+  <li>PuTTY ... <a href="../reference/PuTTY-LICENSE.txt">MIT\x83\x89\x83C\x83Z\x83\x93\x83X</a></li>
+</ul>
 
 
 <h2>Tera Term</h2>

From svnnotify ＠ sourceforge.jp  Mon Jun 19 21:50:21 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 19 Jun 2017 21:50:21 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B6808=5D_logprintf=2C__logprintf=5Fhe?=
 =?utf-8?b?eGR1bXAg44Gn5byV5pWw44GnIHB2YXIg44KS5rih44GZ44Gu44KS5buD5q2i?=
 =?utf-8?b?44GX44Gf44CC?=
Message-ID: <1497876621.479420.99104.nullmailer@users.sourceforge.jp>

Revision: 6808
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6808
Author:   doda
Date:     2017-06-19 21:50:21 +0900 (Mon, 19 Jun 2017)
Log Message:
-----------
logprintf, logprintf_hexdump で引数で pvar を渡すのを廃止した。

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/buffer.c
    trunk/ttssh2/ttxssh/crypt.c
    trunk/ttssh2/ttxssh/dns.c
    trunk/ttssh2/ttxssh/keyfiles.c
    trunk/ttssh2/ttxssh/ssh.c
    trunk/ttssh2/ttxssh/ttxssh.c
    trunk/ttssh2/ttxssh/ttxssh.h

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/buffer.c
===================================================================
--- trunk/ttssh2/ttxssh/buffer.c	2017-06-19 03:54:18 UTC (rev 6807)
+++ trunk/ttssh2/ttxssh/buffer.c	2017-06-19 12:50:21 UTC (rev 6808)
@@ -187,7 +187,7 @@
 
 	if (buffer_get_int_ret(&ret, msg) == -1) {
 		// TODO: \x83G\x83\x89\x81[\x8F\x88\x97\x9D
-		logprintf(NULL, LOG_LEVEL_ERROR, "buffer_get_int: buffer error");
+		logprintf(LOG_LEVEL_ERROR, "buffer_get_int: buffer error");
 	}
 	return (ret);
 }

Modified: trunk/ttssh2/ttxssh/crypt.c
===================================================================
--- trunk/ttssh2/ttxssh/crypt.c	2017-06-19 03:54:18 UTC (rev 6807)
+++ trunk/ttssh2/ttxssh/crypt.c	2017-06-19 12:50:21 UTC (rev 6808)
@@ -558,12 +558,12 @@
 		return TRUE;
 
 	if (mac->key == NULL) {
-		logprintf(pvar, LOG_LEVEL_VERBOSE, "HMAC key is NULL(seq %lu len %d)", sequence_number, len);
+		logprintf(LOG_LEVEL_VERBOSE, "HMAC key is NULL(seq %lu len %d)", sequence_number, len);
 		goto error;
 	}
 
 	if ((u_int)mac->mac_len > sizeof(m)) {
-		logprintf(pvar, LOG_LEVEL_VERBOSE, "HMAC len(%d) is larger than %d bytes(seq %lu len %d)", 
+		logprintf(LOG_LEVEL_VERBOSE, "HMAC len(%d) is larger than %d bytes(seq %lu len %d)", 
 			mac->mac_len, sizeof(m), sequence_number, len);
 		goto error;
 	}
@@ -576,9 +576,9 @@
 	HMAC_cleanup(&c);
 
 	if (memcmp(m, MAC, mac->mac_len)) {
-		logprintf(pvar, LOG_LEVEL_VERBOSE, "HMAC key is not matched(seq %lu len %d)", sequence_number, len);
-		logprintf_hexdump(pvar, LOG_LEVEL_VERBOSE, m, mac->mac_len, "m:");
-		logprintf_hexdump(pvar, LOG_LEVEL_VERBOSE, MAC, mac->mac_len, "MAC:");
+		logprintf(LOG_LEVEL_VERBOSE, "HMAC key is not matched(seq %lu len %d)", sequence_number, len);
+		logprintf_hexdump(LOG_LEVEL_VERBOSE, m, mac->mac_len, "m:");
+		logprintf_hexdump(LOG_LEVEL_VERBOSE, MAC, mac->mac_len, "MAC:");
 		goto error;
 	}
 

Modified: trunk/ttssh2/ttxssh/dns.c
===================================================================
--- trunk/ttssh2/ttxssh/dns.c	2017-06-19 03:54:18 UTC (rev 6807)
+++ trunk/ttssh2/ttxssh/dns.c	2017-06-19 12:50:21 UTC (rev 6808)
@@ -84,7 +84,7 @@
 	default: // Un-supported algorithm
 		hostkey_alg = SSHFP_KEY_RESERVED;
 	}
-	logprintf(pvar, LOG_LEVEL_VERBOSE, "verify_hostkey_dns: key type = %d, SSHFP type = %d", key->type, hostkey_alg);
+	logprintf(LOG_LEVEL_VERBOSE, "verify_hostkey_dns: key type = %d, SSHFP type = %d", key->type, hostkey_alg);
 
 	status = DnsQuery(hostname, DNS_TYPE_SSHFP, DNS_QUERY_STANDARD, NULL, &rec, NULL);
 
@@ -92,7 +92,7 @@
 		for (p=rec; p!=NULL; p=p->pNext) {
 			if (p->wType == DNS_TYPE_SSHFP) {
 				t = (PDNS_SSHFP_DATA)&(p->Data.Null);
-				logprintf(pvar, LOG_LEVEL_VERBOSE,
+				logprintf(LOG_LEVEL_VERBOSE,
 				          "verify_hostkey_dns: SSHFP RR: Algorithm = %d, Digest type = %d",
 				          t->Algorithm, t->DigestType);
 				if (t->Algorithm == SSHFP_KEY_RESERVED) {
@@ -105,7 +105,7 @@
 						case SSHFP_HASH_SHA1:
 							if (hostkey_alg != SSHFP_KEY_RSA && hostkey_alg != SSHFP_KEY_DSA) {
 								// SHA1 does not allowed to use with ECDSA and ED25519 key
-								logprintf(pvar, LOG_LEVEL_VERBOSE,
+								logprintf(LOG_LEVEL_VERBOSE,
 								          "verify_hostkey_dns: not allowed digest type. "
 								          "Algorithm = %d, Digest type = %d",
 								          t->Algorithm,
@@ -148,7 +148,7 @@
 				}
 			}
 			else {
-				logprintf(pvar, LOG_LEVEL_VERBOSE, "verify_hostkey_dns: not SSHFP RR (%d)", p->wType);
+				logprintf(LOG_LEVEL_VERBOSE, "verify_hostkey_dns: not SSHFP RR (%d)", p->wType);
 			}
 		}
 		DnsRecordListFree(rec, DnsFreeRecordList);

Modified: trunk/ttssh2/ttxssh/keyfiles.c
===================================================================
--- trunk/ttssh2/ttxssh/keyfiles.c	2017-06-19 03:54:18 UTC (rev 6807)
+++ trunk/ttssh2/ttxssh/keyfiles.c	2017-06-19 12:50:21 UTC (rev 6808)
@@ -387,7 +387,7 @@
 		len = fread(buf, 1, sizeof(buf), fp);
 		buffer_append(blob, buf, len);
 		if (buffer_len(blob) > MAX_KEY_FILE_SIZE) {
-			logprintf(pvar, LOG_LEVEL_WARNING, "%s: key file too large.", __FUNCTION__);
+			logprintf(LOG_LEVEL_WARNING, __FUNCTION__ ": key file too large.");
 			goto error;
 		}
 		if (len < sizeof(buf))
@@ -400,7 +400,7 @@
 	cp = buffer_ptr(blob);
 	len = buffer_len(blob);
 	if (len < m1len || memcmp(cp, MARK_BEGIN, m1len)) {
-		logprintf(pvar, LOG_LEVEL_VERBOSE, "%s: missing begin marker", __FUNCTION__);
+		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": missing begin marker");
 		goto error;
 	}
 	cp += m1len;
@@ -419,7 +419,7 @@
 		}
 	}
 	if (!len) {
-		logprintf(pvar, LOG_LEVEL_VERBOSE, "%s: no end marker", __FUNCTION__);
+		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": no end marker");
 		goto error;
 	}
 
@@ -426,15 +426,15 @@
 	// \x83t\x83@\x83C\x83\x8B\x82?X\x83L\x83\x83\x83\x93\x82\xAA\x8FI\x82\xED\x82\xC1\x82\xBD\x82?ŁAbase64 decode\x82\xB7\x82\xE9\x81B
 	len = buffer_len(encoded);
 	if ((cp = buffer_append_space(copy_consumed, len)) == NULL) {
-		logprintf(pvar, LOG_LEVEL_ERROR, "%s: buffer_append_space", __FUNCTION__);
+		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_append_space");
 		goto error;
 	}
 	if ((dlen = b64decode(cp, len, buffer_ptr(encoded))) < 0) {
-		logprintf(pvar, LOG_LEVEL_ERROR, "%s: base64 decode failed", __FUNCTION__);
+		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": base64 decode failed");
 		goto error;
 	}
 	if ((unsigned int)dlen > len) {
-		logprintf(pvar, LOG_LEVEL_ERROR, "%s: crazy base64 length %d > %u", __FUNCTION__, dlen, len);
+		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": crazy base64 length %d > %u", dlen, len);
 		goto error;
 	}
 
@@ -441,7 +441,7 @@
 	buffer_consume_end(copy_consumed, len - dlen);
 	if (buffer_remain_len(copy_consumed) < sizeof(AUTH_MAGIC) ||
 	    memcmp(buffer_tail_ptr(copy_consumed), AUTH_MAGIC, sizeof(AUTH_MAGIC))) {
-		logprintf(pvar, LOG_LEVEL_ERROR, "%s: bad magic", __FUNCTION__);
+		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": bad magic");
 		goto error;
 	}
 	buffer_consume(copy_consumed, sizeof(AUTH_MAGIC));
@@ -453,7 +453,7 @@
 	ciphername = buffer_get_string_msg(copy_consumed, NULL);
 	ciphernameval = get_cipher_by_name(ciphername);
 	if (ciphernameval == SSH_CIPHER_NONE && strcmp(ciphername, "none") != 0) {
-		logprintf(pvar, LOG_LEVEL_ERROR, "%s: unknown cipher name", __FUNCTION__);
+		logprintf(LOG_LEVEL_ERROR, "%s: unknown cipher name", __FUNCTION__);
 		goto error;
 	}
 	// \x83p\x83X\x83t\x83\x8C\x81[\x83Y\x82?`\x83F\x83b\x83N\x81B\x88Í\x86\x89\xBB\x82\xAA none \x82ł?\xA2\x8F?\x82?\xF3\x82?p\x83X\x83\x8F\x81[\x83h\x82\xF0\x94F\x82??\xA2\x81B
@@ -466,11 +466,11 @@
 	kdfname = buffer_get_string_msg(copy_consumed, NULL);
 	if (kdfname == NULL ||
 	    (!strcmp(kdfname, "none") && !strcmp(kdfname, KDFNAME))) {
-		logprintf(pvar, LOG_LEVEL_ERROR, "%s: unknown kdf name", __FUNCTION__);
+		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": unknown kdf name");
 		goto error;
 	}
 	if (!strcmp(kdfname, "none") && strcmp(ciphername, "none") != 0) {
-		logprintf(pvar, LOG_LEVEL_ERROR, "%s: cipher %s requires kdf", __FUNCTION__, ciphername);
+		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ "%s: cipher %s requires kdf", ciphername);
 		goto error;
 	}
 
@@ -477,12 +477,12 @@
 	/* kdf options */
 	kdfp = buffer_get_string_msg(copy_consumed, &klen);
 	if (kdfp == NULL) {
-		logprintf(pvar, LOG_LEVEL_ERROR, "%s: kdf options not set", __FUNCTION__);
+		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": kdf options not set");
 		goto error;
 	}
 	if (klen > 0) {
 		if ((cp = buffer_append_space(kdf, klen)) == NULL) {
-			logprintf(pvar, LOG_LEVEL_ERROR, "%s: kdf alloc failed", __FUNCTION__);
+			logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": kdf alloc failed");
 			goto error;
 		}
 		memcpy(cp, kdfp, klen);
@@ -490,11 +490,11 @@
 
 	/* number of keys */
 	if (buffer_get_int_ret(&nkeys, copy_consumed) < 0) {
-		logprintf(pvar, LOG_LEVEL_ERROR, "%s: key counter missing", __FUNCTION__);
+		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": key counter missing");
 		goto error;
 	}
 	if (nkeys != 1) {
-		logprintf(pvar, LOG_LEVEL_ERROR, "%s: only one key supported", __FUNCTION__);
+		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": only one key supported");
 		goto error;
 	}
 
@@ -501,7 +501,7 @@
 	/* pubkey */
 	cp = buffer_get_string_msg(copy_consumed, &len);
 	if (cp == NULL) {
-		logprintf(pvar, LOG_LEVEL_ERROR, "%s: pubkey not found", __FUNCTION__);
+		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": pubkey not found");
 		goto error;
 	}
 	free(cp); /* XXX check pubkey against decrypted private key */
@@ -511,11 +511,11 @@
 	blocksize = get_cipher_block_size(ciphernameval);
 	authlen = 0;  // TODO: \x82??\x82\xA6\x82\xB8\x8CŒ艻
 	if (len < blocksize) {
-		logprintf(pvar, LOG_LEVEL_ERROR, "%s: encrypted data too small", __FUNCTION__);
+		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": encrypted data too small");
 		goto error;
 	}
 	if (len % blocksize) {
-		logprintf(pvar, LOG_LEVEL_ERROR, "%s: length not multiple of blocksize", __FUNCTION__);
+		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": length not multiple of blocksize");
 		goto error;
 	}
 
@@ -526,7 +526,7 @@
 	if (!strcmp(kdfname, KDFNAME)) {
 		salt = buffer_get_string_msg(kdf, &slen);
 		if (salt == NULL) {
-			logprintf(pvar, LOG_LEVEL_ERROR, "%s: salt not set", __FUNCTION__);
+			logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": salt not set");
 			goto error;
 		}
 		rounds = buffer_get_int(kdf);
@@ -533,7 +533,7 @@
 		// TODO: error check
 		if (bcrypt_pbkdf(passphrase, strlen(passphrase), salt, slen,
 		    key, keylen + ivlen, rounds) < 0) {
-			logprintf(pvar, LOG_LEVEL_ERROR, "%s: bcrypt_pbkdf failed", __FUNCTION__);
+			logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": bcrypt_pbkdf failed");
 			goto error;
 		}
 	}
@@ -550,8 +550,8 @@
 	buffer_consume(copy_consumed, len);
 
 	if (buffer_remain_len(copy_consumed) != 0) {
-		logprintf(pvar, LOG_LEVEL_ERROR, "%s: key blob has trailing data (len = %u)",
-			__FUNCTION__, buffer_remain_len(copy_consumed));
+		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": key blob has trailing data (len = %u)",
+			buffer_remain_len(copy_consumed));
 		goto error;
 	}
 
@@ -558,12 +558,12 @@
 	/* check bytes */
 	if (buffer_get_int_ret(&check1, b) < 0 ||
 	    buffer_get_int_ret(&check2, b) < 0) {
-		logprintf(pvar, LOG_LEVEL_ERROR, "check bytes missing");
+		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": check bytes missing");
 		goto error;
 	}
 	if (check1 != check2) {
-		logprintf(pvar, LOG_LEVEL_VERBOSE, "%s: decrypt failed: 0x%08x != 0x%08x",
-			__FUNCTION__, check1, check2);
+		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": decrypt failed: 0x%08x != 0x%08x",
+			check1, check2);
 		goto error;
 	}
 
@@ -578,7 +578,7 @@
 	while (buffer_remain_len(b)) {
 		if (buffer_get_char_ret(&pad, b) == -1 ||
 		    pad != (++i & 0xff)) {
-			logprintf(pvar, LOG_LEVEL_ERROR, "%s: bad padding", __FUNCTION__);
+			logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": bad padding");
 			key_free(keyfmt);
 			keyfmt = NULL;
 			goto error;

Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2017-06-19 03:54:18 UTC (rev 6807)
+++ trunk/ttssh2/ttxssh/ssh.c	2017-06-19 12:50:21 UTC (rev 6808)
@@ -2853,7 +2853,7 @@
 			set_uint32(outmsg + 8, x);    // window width  (pixels)
 			set_uint32(outmsg + 12, y);   // window height (pixels)
 			finish_send_packet(pvar);
-			logprintf(pvar, LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH_CMSG_WINDOW_SIZE. "
+			logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH_CMSG_WINDOW_SIZE. "
 			          "cols: %d, rows: %d, x: %d, y: %d", cols, rows, x, y);
 		}
 
@@ -2888,7 +2888,7 @@
 		finish_send_packet(pvar);
 		buffer_free(msg);
 
-		logprintf(pvar, LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH2_MSG_CHANNEL_REQUEST. "
+		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH2_MSG_CHANNEL_REQUEST. "
 		          "local: %d, remote: %d, request-type: %s, cols: %d, rows: %d, x: %d, y: %d",
 		          c->self_id, c->remote_id, req_type, cols, rows, x, y);
 
@@ -2929,7 +2929,7 @@
 		finish_send_packet(pvar);
 		buffer_free(msg);
 
-		logprintf(pvar, LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH2_MSG_CHANNEL_REQUEST. "
+		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH2_MSG_CHANNEL_REQUEST. "
 		          "local: %d, remote: %d, request-type: %s, break-length: %d",
 		          c->self_id, c->remote_id, req_type, 1000);
 
@@ -3720,7 +3720,7 @@
 		finish_send_packet(pvar);
 		buffer_free(msg);
 
-		logprintf(pvar, LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH2_MSG_CHANNEL_REQUEST. "
+		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH2_MSG_CHANNEL_REQUEST. "
 		          "local: %d, remote: %d, request-type: %s, proto: %s, cookie: %s, screen: %d",
 		          c->self_id, c->remote_id, req_type, auth_protocol, newdata, screen_num);
 
@@ -7317,11 +7317,11 @@
 	ret = DialogBoxParam(hInst, MAKEINTRESOURCE(IDD_SSHPASSWD_INPUT), pvar->cv->HWin, passwd_change_dialog, (LPARAM)&cp);
 
 	if (ret == -1) {
-		logprintf(pvar, LOG_LEVEL_WARNING, __FUNCTION__ ": DialogBoxParam failed.");
+		logprintf(LOG_LEVEL_WARNING, __FUNCTION__ ": DialogBoxParam failed.");
 		return FALSE;
 	}
 	else if (ret == 0) {
-		logprintf(pvar, LOG_LEVEL_NOTICE, __FUNCTION__ ": dialog cancelled.");
+		logprintf(LOG_LEVEL_NOTICE, __FUNCTION__ ": dialog cancelled.");
 		return FALSE;
 	}
 
@@ -7406,7 +7406,7 @@
 	finish_send_packet(pvar);
 	buffer_free(msg);
 
-	logprintf(pvar, LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH2_MSG_CHANNEL_REQUEST. "
+	logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH2_MSG_CHANNEL_REQUEST. "
 	          "local: %d, remote: %d, request-type: %s, msg1=%s, msg2=%s",
 	          c->self_id, c->remote_id, req, msg1 ? msg1 : "none", msg2 ? msg2 : "none");
 	return TRUE;
@@ -7488,7 +7488,7 @@
 	buffer_free(ttymsg);
 
 	notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_REQUEST was sent at send_pty_request().", LOG_LEVEL_VERBOSE);
-	logprintf(pvar, LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH2_MSG_CHANNEL_REQUEST. "
+	logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH2_MSG_CHANNEL_REQUEST. "
 	          "local: %d, remote: %d, request-type: %s, "
 	          "term: %s, cols: %d, rows: %d, x: %d, y: %d, "
 	          "out-speed: %d, in-speed: %d, verase: %s, onlcr: %s",
@@ -7614,7 +7614,7 @@
 		break;
 
 	default: // NOT REACHED
-		logprintf(pvar, LOG_LEVEL_ERROR, __FUNCTION__ ": Invalid channel-type. (%d)", c->type);
+		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": Invalid channel-type. (%d)", c->type);
 		return FALSE;
 	}
 	return TRUE;
@@ -9131,7 +9131,7 @@
 	if (agent_msg->len == 0) {
 		req_len = get_uint32_MSBfirst(data);
 		if (req_len > AGENT_MAX_MSGLEN - 4) {
-			logprintf(pvar, LOG_LEVEL_NOTICE,
+			logprintf(LOG_LEVEL_NOTICE,
 				__FUNCTION__ ": Agent Forwarding Error: server request is too large. "
 				"size=%u, allowd max=%u.", req_len, AGENT_MAX_MSGLEN-4);
 			if (pvar->session_settings.ForwardAgentNotify) {
@@ -9163,7 +9163,7 @@
 
 	agent_query(data, *agent_request_len, &response, &resplen, NULL, NULL);
 	if (response == NULL || resplen < 5) {
-		logprintf(pvar, LOG_LEVEL_NOTICE, __FUNCTION__ "Agent Forwarding Error: agent_query is failed.");
+		logprintf(LOG_LEVEL_NOTICE, __FUNCTION__ "Agent Forwarding Error: agent_query is failed.");
 		goto error;
 	}
 

Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c	2017-06-19 03:54:18 UTC (rev 6807)
+++ trunk/ttssh2/ttxssh/ttxssh.c	2017-06-19 12:50:21 UTC (rev 6808)
@@ -946,21 +946,17 @@
 	}
 }
 
-void logprintf(PTInstVar pv, int level, char *fmt, ...)
+void logprintf(int level, char *fmt, ...)
 {
 	char buff[4096];
 	va_list params;
 
-	if (pv == NULL) {
-		pv = pvar;
-	}
-
-	if (level <= pv->session_settings.LogLevel) {
+	if (level <= pvar->session_settings.LogLevel) {
 		va_start(params, fmt);
 		vsnprintf_s(buff, sizeof(buff), _TRUNCATE, fmt, params);
 		va_end(params);
 
-		notify_verbose_message(pv, buff, level);
+		notify_verbose_message(pvar, buff, level);
 	}
 }
 
@@ -1004,7 +1000,7 @@
 	//strncat_s(buf, buflen, "\n", _TRUNCATE);
 }
 
-void logprintf_hexdump(PTInstVar pvar, int level, char *data, int len, char *fmt, ...)
+void logprintf_hexdump(int level, char *data, int len, char *fmt, ...)
 {
 	char buff[4096];
 	va_list params;

Modified: trunk/ttssh2/ttxssh/ttxssh.h
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.h	2017-06-19 03:54:18 UTC (rev 6807)
+++ trunk/ttssh2/ttxssh/ttxssh.h	2017-06-19 12:50:21 UTC (rev 6808)
@@ -343,10 +343,9 @@
 void notify_nonfatal_error(PTInstVar pvar, char *msg);
 void notify_fatal_error(PTInstVar pvar, char *msg, BOOL send_disconnect);
 void notify_verbose_message(PTInstVar pvar, char *msg, int level);
-void logprintf(PTInstVar pvar, int level, char *fmt, ...);
-void logprintf_hexdump(PTInstVar pvar, int level, char *data, int len, char *fmt, ...);
+void logprintf(int level, char *fmt, ...);
+void logprintf_hexdump(int level, char *data, int len, char *fmt, ...);
 
-
 void get_teraterm_dir_relative_name(char *buf, int bufsize, char *basename);
 int copy_teraterm_dir_relative_path(char *dest, int destsize, char *basename);
 void get_file_version(char *exefile, int *major, int *minor, int *release, int *build);

From svnnotify ＠ sourceforge.jp  Mon Jun 19 21:50:42 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 19 Jun 2017 21:50:42 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY4MDldICDjg63jgrDplqLpgKPjgpLopos=?=
 =?utf-8?b?55u044GX44CC?=
Message-ID: <1497876642.675956.99354.nullmailer@users.sourceforge.jp>

Revision: 6809
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6809
Author:   doda
Date:     2017-06-19 21:50:42 +0900 (Mon, 19 Jun 2017)
Log Message:
-----------
ログ関連を見直し。

・_snprintf_s() + notify_verbose_message() を logprintf() に置き換え。
・固定メッセージの notify_verbose_message() を logputs() に置き換え。

pvar を渡す必要が無くなったので、pvar が使えない状況でもログ出力が行える。

全体的に LOGLEVEL を見直したい……

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/auth.c
    trunk/ttssh2/ttxssh/dns.c
    trunk/ttssh2/ttxssh/fwd.c
    trunk/ttssh2/ttxssh/key.c
    trunk/ttssh2/ttxssh/sftp.c
    trunk/ttssh2/ttxssh/ssh.c
    trunk/ttssh2/ttxssh/ttxssh.c
    trunk/ttssh2/ttxssh/ttxssh.h

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/auth.c
===================================================================
--- trunk/ttssh2/ttxssh/auth.c	2017-06-19 12:50:21 UTC (rev 6808)
+++ trunk/ttssh2/ttxssh/auth.c	2017-06-19 12:50:42 UTC (rev 6809)
@@ -943,14 +943,8 @@
 
 int AUTH_set_supported_auth_types(PTInstVar pvar, int types)
 {
-	char buf[1024];
+	logprintf(LOG_LEVEL_VERBOSE, "Server reports supported authentication method mask = %d", types);
 
-	_snprintf_s(buf, sizeof(buf), _TRUNCATE,
-	          "Server reports supported authentication method mask = %d",
-	          types);
-	buf[sizeof(buf) - 1] = 0;
-	notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
-
 	if (SSHv1(pvar)) {
 		types &= (1 << SSH_AUTH_PASSWORD) | (1 << SSH_AUTH_RSA)
 		       | (1 << SSH_AUTH_RHOSTS_RSA) | (1 << SSH_AUTH_RHOSTS)
@@ -973,8 +967,7 @@
 		return 0;
 	} else {
 		if (pvar->auth_state.auth_dialog != NULL) {
-			update_server_supported_types(pvar,
-			                              pvar->auth_state.auth_dialog);
+			update_server_supported_types(pvar, pvar->auth_state.auth_dialog);
 		}
 
 		return 1;

Modified: trunk/ttssh2/ttxssh/dns.c
===================================================================
--- trunk/ttssh2/ttxssh/dns.c	2017-06-19 12:50:21 UTC (rev 6808)
+++ trunk/ttssh2/ttxssh/dns.c	2017-06-19 12:50:42 UTC (rev 6809)
@@ -96,7 +96,8 @@
 				          "verify_hostkey_dns: SSHFP RR: Algorithm = %d, Digest type = %d",
 				          t->Algorithm, t->DigestType);
 				if (t->Algorithm == SSHFP_KEY_RESERVED) {
-					notify_verbose_message(pvar, "verify_hostkey_dns: Invalid key algorithm (SSHFP_KEY_RESERVED)", LOG_LEVEL_WARNING);
+					logputs(LOG_LEVEL_WARNING,
+					        "verify_hostkey_dns: Invalid key algorithm (SSHFP_KEY_RESERVED)");
 					continue; // skip invalid record
 				}
 				if (t->Algorithm == hostkey_alg) {
@@ -108,8 +109,7 @@
 								logprintf(LOG_LEVEL_VERBOSE,
 								          "verify_hostkey_dns: not allowed digest type. "
 								          "Algorithm = %d, Digest type = %d",
-								          t->Algorithm,
-									  t->DigestType);
+								          t->Algorithm, t->DigestType);
 								dgst_alg = -1;
 							}
 							else {
@@ -134,10 +134,10 @@
 					}
 					if (hostkey_dlen == p->wDataLength-2 && memcmp(hostkey_digest, t->Digest, hostkey_dlen) == 0) {
 						found = DNS_VERIFY_MATCH;
-						notify_verbose_message(pvar, "verify_hostkey_dns: key matched", LOG_LEVEL_INFO);
+						logputs(LOG_LEVEL_INFO, "verify_hostkey_dns: key matched");
 					}
 					else {
-						notify_verbose_message(pvar, "verify_hostkey_dns: key mismatched", LOG_LEVEL_WARNING);
+						logputs(LOG_LEVEL_WARNING, "verify_hostkey_dns: key mismatched");
 						found = DNS_VERIFY_MISMATCH;
 						break;
 					}
@@ -154,7 +154,7 @@
 		DnsRecordListFree(rec, DnsFreeRecordList);
 	}
 	else {
-		notify_verbose_message(pvar, "verify_hostkey_dns: DnsQuery failed.", LOG_LEVEL_VERBOSE);
+		logputs(LOG_LEVEL_VERBOSE, "verify_hostkey_dns: DnsQuery failed.");
 	}
 
 	free(hostkey_digest);

Modified: trunk/ttssh2/ttxssh/fwd.c
===================================================================
--- trunk/ttssh2/ttxssh/fwd.c	2017-06-19 12:50:21 UTC (rev 6808)
+++ trunk/ttssh2/ttxssh/fwd.c	2017-06-19 12:50:42 UTC (rev 6809)
@@ -618,11 +618,10 @@
 	     strport, sizeof(strport), NI_NUMERICHOST | NI_NUMERICSERV)) {
 		/* NOT REACHED */
 	}
-	_snprintf_s(buf, sizeof(buf), _TRUNCATE,
+	logprintf(LOG_LEVEL_VERBOSE,
 	          "Host %s connecting to port %d; forwarding to %s:%d",
 	          hname, request->spec.from_port, request->spec.to_host,
 	          request->spec.to_port);
-	notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
 
 	strncpy_s(buf, sizeof(buf), hname, _TRUNCATE);
 
@@ -1056,9 +1055,7 @@
 				                  "Some socket(s) required for port forwarding could not be initialized.\n"
 				                  "Some port forwarding services may not be available.\n"
 				                  "(errno %d)");
-				_snprintf_s(buf, sizeof(buf), _TRUNCATE,
-				            pvar->ts->UIMsg, WSAGetLastError());
-				notify_verbose_message(pvar,buf,LOG_LEVEL_WARNING);
+				logprintf(LOG_LEVEL_WARNING, buf, pvar->ts->UIMsg, WSAGetLastError());
 			}
 			freeaddrinfo(res0);
 			/* free(request->listening_sockets); /* DO NOT FREE HERE, listening_sockets'll be freed in FWD_end */

Modified: trunk/ttssh2/ttxssh/key.c
===================================================================
--- trunk/ttssh2/ttxssh/key.c	2017-06-19 12:50:21 UTC (rev 6808)
+++ trunk/ttssh2/ttxssh/key.c	2017-06-19 12:50:42 UTC (rev 6809)
@@ -2232,7 +2232,6 @@
 {
 	size_t i;
 	int dlgresult;
-	char msg[1024];
 	char *host;
 
 	host = pvar->ssh_state.hostname;
@@ -2239,8 +2238,7 @@
 
 	// "/nosecuritywarning"\x82\xAA\x8Ew\x92?\x82\xEA\x82Ă\xA2\x82\xE9\x8F?\x81A\x8DX\x90V\x82?\xEA\x90?s\x82\xED\x82?\xA2\x81B
 	if (pvar->nocheck_known_hosts) {
-		_snprintf_s(msg, sizeof(msg), _TRUNCATE, "Hostkey was not updated because `/nosecuritywarning' option was specified.");
-		notify_verbose_message(pvar, msg, LOG_LEVEL_VERBOSE);
+		logputs(LOG_LEVEL_VERBOSE, "Hostkey was not updated because `/nosecuritywarning' option was specified.");
 		goto error;
 	}
 
@@ -2253,8 +2251,7 @@
 			cur_active != NULL ? cur_active : pvar->NotificationWindow,
 			hosts_updatekey_dlg_proc, (LPARAM)pvar);
 		if (dlgresult != 1) {
-			_snprintf_s(msg, sizeof(msg), _TRUNCATE, "Hostkey was not updated because a user cancelled.");
-			notify_verbose_message(pvar, msg, LOG_LEVEL_VERBOSE);
+			logputs(LOG_LEVEL_VERBOSE, "Hostkey was not updated because a user cancelled.");
 			goto error;
 		}
 	}
@@ -2266,8 +2263,7 @@
 	for (i = 0; i < ctx->nkeys; i++) {
 		HOSTS_add_host_key(pvar, ctx->keys[i]);
 	}
-	_snprintf_s(msg, sizeof(msg), _TRUNCATE, "Hostkey was successfully updated to known_hosts file.");
-	notify_verbose_message(pvar, msg, LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "Hostkey was successfully updated to known_hosts file.");
 
 error:
 	return;
@@ -2276,7 +2272,6 @@
 static void client_global_hostkeys_private_confirm(PTInstVar pvar, int type, u_int32_t seq, void *_ctx)
 {
 	struct hostkeys_update_ctx *ctx = (struct hostkeys_update_ctx *)_ctx;
-	char msg[128];
 	char *data;
 	int len;
 	unsigned char *blob = NULL;
@@ -2307,18 +2302,19 @@
 	memcpy(cp, data, len);
 
 	if (ctx->nnew == 0) {
-		_snprintf_s(msg, sizeof(msg), _TRUNCATE, "Hostkey can not be updated because ctx->nnew %d(program bug).", ctx->nnew);
-		notify_verbose_message(pvar, msg, LOG_LEVEL_FATAL);
+		logprintf(LOG_LEVEL_FATAL,
+			"Hostkey can not be updated because ctx->nnew %d(program bug).", ctx->nnew);
 		goto error;
 	}
 	if (type != SSH2_MSG_REQUEST_SUCCESS) {
-		_snprintf_s(msg, sizeof(msg), _TRUNCATE, "Server failed to confirm ownership of private host keys(type %d)", type);
-		notify_verbose_message(pvar, msg, LOG_LEVEL_ERROR);
+		logprintf(LOG_LEVEL_ERROR,
+			"Server failed to confirm ownership of private host keys(type %d)", type);
 		goto error;
 	}
 	if (pvar->session_id_len == 0) {
-		_snprintf_s(msg, sizeof(msg), _TRUNCATE, "Hostkey can not be updated because pvar->session_id_len %d(program bug).", pvar->session_id_len);
-		notify_verbose_message(pvar, msg, LOG_LEVEL_FATAL);
+		logprintf(LOG_LEVEL_FATAL,
+			"Hostkey can not be updated because pvar->session_id_len %d(program bug).",
+			pvar->session_id_len);
 		goto error;
 	}
 
@@ -2345,9 +2341,9 @@
 		free(sig);
 		sig = NULL;
 		if (ret != 1) {
-			_snprintf_s(msg, sizeof(msg), _TRUNCATE, "server gave bad signature for %s key %u", 
+			logprintf(LOG_LEVEL_ERROR,
+				"server gave bad signature for %s key %u",
 				get_sshname_from_key(ctx->keys[i]), i);
-			notify_verbose_message(pvar, msg, LOG_LEVEL_ERROR);
 			goto error;
 		}
 		ndone++;
@@ -2354,9 +2350,9 @@
 	}
 
 	if (ndone != ctx->nnew) {
-		_snprintf_s(msg, sizeof(msg), _TRUNCATE, "Hostkey can not be updated because ndone != ctx->nnew (%u / %u)(program bug).",
+		logprintf(LOG_LEVEL_FATAL,
+			"Hostkey can not be updated because ndone != ctx->nnew (%u / %u)(program bug).",
 			ndone, ctx->nnew);
-		notify_verbose_message(pvar, msg, LOG_LEVEL_FATAL);
 		goto error;
 	}
 
@@ -2381,7 +2377,6 @@
 	int len;
 	size_t i;
 	char *cp, *fp;
-	char msg[128];
 	unsigned char *blob = NULL;
 	buffer_t *b = NULL;
 	struct hostkeys_update_ctx *ctx = NULL;
@@ -2390,8 +2385,7 @@
 
 	// Tera Term\x82??\xE8\x82ŁA\x93\x96\x8AY\x8B@\x94\\x82?I\x83\x93\x83I\x83t\x82?\xE4\x82ł\xAB\x82\xE9\x82悤\x82?\xB7\x82\xE9\x81B
 	if (pvar->settings.UpdateHostkeys == SSH_UPDATE_HOSTKEYS_NO) {
-		_snprintf_s(msg, sizeof(msg), _TRUNCATE, "Hostkey was not updated because ts.UpdateHostkeys is disabled.");
-		notify_verbose_message(pvar, msg, LOG_LEVEL_VERBOSE);
+		logputs(LOG_LEVEL_VERBOSE, "Hostkey was not updated because ts.UpdateHostkeys is disabled.");
 		return 1;
 	}
 
@@ -2413,8 +2407,7 @@
 		blob = buffer_get_string_msg(b, &len);
 		key = key_from_blob(blob, len);
 		if (key == NULL) {
-			_snprintf_s(msg, sizeof(msg), _TRUNCATE, "Not found host key into blob %p (%d)", blob, len);
-			notify_verbose_message(pvar, msg, LOG_LEVEL_ERROR);
+			logprintf(LOG_LEVEL_ERROR, "Not found host key into blob %p (%d)", blob, len);
 			goto error;
 		}
 		free(blob);
@@ -2421,16 +2414,13 @@
 		blob = NULL;
 
 		fp = key_fingerprint(key, SSH_FP_HEX, SSH_DIGEST_MD5);
-		_snprintf_s(msg, sizeof(msg), _TRUNCATE, "Received %s host key %s", 
-			get_sshname_from_key(key), fp);
-		notify_verbose_message(pvar, msg, LOG_LEVEL_VERBOSE);
+		logprintf(LOG_LEVEL_VERBOSE, "Received %s host key %s", get_sshname_from_key(key), fp);
 		free(fp);
 
 		// \x8B\x96\x89?\xB3\x82?\x83z\x83X\x83g\x83L\x81[\x83A\x83\x8B\x83S\x83\x8A\x83Y\x83\x80\x82\xA9\x82\xF0\x83`\x83F\x83b\x83N\x82\xB7\x82\xE9\x81B
 		if (check_hostkey_algorithm(pvar, key) == 0) {
-			_snprintf_s(msg, sizeof(msg), _TRUNCATE, "%s host key is not permitted by ts.HostKeyOrder",
+			logprintf(LOG_LEVEL_VERBOSE, "%s host key is not permitted by ts.HostKeyOrder",
 				get_sshname_from_key(key));
-			notify_verbose_message(pvar, msg, LOG_LEVEL_VERBOSE);
 			continue;
 		}
 
@@ -2439,9 +2429,8 @@
 		// \x8Fd\x95\xA1\x82\xB5\x82\xBD\x83L\x81[\x82\xF0\x8E\xF3\x90M\x82\xB5\x82\xBD\x82\xE7\x83G\x83\x89\x81[\x82?\xB7\x82\xE9\x81B
 		for (i = 0; i < ctx->nkeys; i++) {
 			if (HOSTS_compare_public_key(key, ctx->keys[i]) == 1) {
-				_snprintf_s(msg, sizeof(msg), _TRUNCATE, "Received duplicated %s host key",
+				logprintf(LOG_LEVEL_ERROR, "Received duplicated %s host key",
 					get_sshname_from_key(key));
-				notify_verbose_message(pvar, msg, LOG_LEVEL_ERROR);
 				goto error;
 			}
 		}
@@ -2449,9 +2438,8 @@
 		// \x83L\x81[\x82\xF0\x93o\x98^\x82\xB7\x82\xE9\x81B
 		tmp = realloc(ctx->keys, (ctx->nkeys + 1)*sizeof(*ctx->keys));
 		if (tmp == NULL) {
-			_snprintf_s(msg, sizeof(msg), _TRUNCATE, "Not memory: realloc ctx->keys %d",
+			logprintf(LOG_LEVEL_FATAL, "Not memory: realloc ctx->keys %d",
 				ctx->nkeys);
-			notify_verbose_message(pvar, msg, LOG_LEVEL_FATAL);
 			goto error;
 		}
 		ctx->keys = tmp;
@@ -2460,15 +2448,13 @@
 	}
 
 	if (ctx->nkeys == 0) {
-		_snprintf_s(msg, sizeof(msg), _TRUNCATE, "No host rotation key");
-		notify_verbose_message(pvar, msg, LOG_LEVEL_VERBOSE);
+		logputs(LOG_LEVEL_VERBOSE, "No host rotation key");
 		goto error;
 	}
 
 	if ((ctx->keys_seen = calloc(ctx->nkeys, sizeof(*ctx->keys_seen))) == NULL) {
-		_snprintf_s(msg, sizeof(msg), _TRUNCATE, "Not memory: calloc ctx->keys %d",
+		logprintf(LOG_LEVEL_FATAL, "Not memory: calloc ctx->keys %d",
 			ctx->nkeys);
-		notify_verbose_message(pvar, msg, LOG_LEVEL_FATAL);
 		goto error;
 	}
 
@@ -2480,9 +2466,8 @@
 		if (!ctx->keys_seen[i])
 			ctx->nnew++;
 	}
-	_snprintf_s(msg, sizeof(msg), _TRUNCATE, "%u keys from server: %u new, %u retained. %u to remove",
+	logprintf(LOG_LEVEL_VERBOSE, "%u keys from server: %u new, %u retained. %u to remove",
 		ctx->nkeys, ctx->nnew, ctx->nkeys - ctx->nnew, ctx->nold);
-	notify_verbose_message(pvar, msg, LOG_LEVEL_VERBOSE);
 
 	// \x90V\x8BK\x92?\xC1\x82\xB7\x82錮\x82?[\x83\x8D\x82\xBE\x82\xAA\x81Adeprecated\x82?\xAE\x82\xAA\x91\xB6\x8D?\xB7\x82\xE9\x81B
 	if (ctx->nnew == 0 && ctx->nold != 0) {

Modified: trunk/ttssh2/ttxssh/sftp.c
===================================================================
--- trunk/ttssh2/ttxssh/sftp.c	2017-06-19 12:50:21 UTC (rev 6808)
+++ trunk/ttssh2/ttxssh/sftp.c	2017-06-19 12:50:42 UTC (rev 6809)
@@ -147,33 +147,12 @@
 	va_end(arg);
 
 	SendMessage(c->sftp.console_window, WM_USER_CONSOLE, 0, (LPARAM)tmp);
-	notify_verbose_message(pvar, tmp, LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, tmp);
 }
 
-static void sftp_do_syslog(PTInstVar pvar, int level, char *fmt, ...)
-{
-	char tmp[1024];
-	va_list arg;
+#define sftp_do_syslog(pvar, level, ...) logprintf(level, __VA_ARGS__)
+#define sftp_syslog(pvar, ...) logprintf(LOG_LEVEL_VERBOSE, __VA_ARGS__)
 
-	va_start(arg, fmt);
-	_vsnprintf_s(tmp, sizeof(tmp), _TRUNCATE, fmt, arg);
-	va_end(arg);
-
-	notify_verbose_message(pvar, tmp, level);
-}
-
-static void sftp_syslog(PTInstVar pvar, char *fmt, ...)
-{
-	char tmp[1024];
-	va_list arg;
-
-	va_start(arg, fmt);
-	_vsnprintf_s(tmp, sizeof(tmp), _TRUNCATE, fmt, arg);
-	va_end(arg);
-
-	notify_verbose_message(pvar, tmp, LOG_LEVEL_VERBOSE);
-}
-
 // SFTP\x90\xEA\x97p\x83o\x83b\x83t\x83@\x82\xF0\x8Am\x95?\xB7\x82\xE9\x81BSCP\x82????\xE8\x81A\x90擪\x82??\x82?f\x81[\x83^\x83T\x83C\x83Y\x82??\x9E\x82?B
 //
 // buffer_t

Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2017-06-19 12:50:21 UTC (rev 6808)
+++ trunk/ttssh2/ttxssh/ssh.c	2017-06-19 12:50:42 UTC (rev 6809)
@@ -1282,8 +1282,7 @@
 
 static BOOL handle_auth_failure(PTInstVar pvar)
 {
-	notify_verbose_message(pvar, "Authentication failed",
-	                       LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "Authentication failed");
 
 	// retry count\x82??\xC1 (2005.7.15 yutaka)
 	pvar->userauth_retry_count++;
@@ -1319,8 +1318,7 @@
 		int len = get_payload_uint32(pvar, 0);
 
 		if (grab_payload(pvar, len)) {
-			notify_verbose_message(pvar, "Received TIS challenge",
-			                       LOG_LEVEL_VERBOSE);
+			logputs(LOG_LEVEL_VERBOSE, "Received TIS challenge");
 
 			AUTH_set_TIS_mode(pvar, pvar->ssh_state.payload + 4, len);
 			AUTH_advance_to_next_cred(pvar);
@@ -1333,8 +1331,7 @@
 
 static BOOL handle_auth_required(PTInstVar pvar)
 {
-	notify_verbose_message(pvar, "Server requires authentication",
-	                       LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "Server requires authentication");
 
 	pvar->ssh_state.status_flags &= ~STATUS_DONT_SEND_CREDENTIALS;
 	try_send_credentials(pvar);
@@ -1346,7 +1343,7 @@
 static BOOL handle_ignore(PTInstVar pvar)
 {
 	if (SSHv1(pvar)) {
-		notify_verbose_message(pvar, "SSH_MSG_IGNORE was received.", LOG_LEVEL_VERBOSE);
+		logputs(LOG_LEVEL_VERBOSE, "SSH_MSG_IGNORE was received.");
 
 		if (grab_payload(pvar, 4)
 		 && grab_payload(pvar, get_payload_uint32(pvar, 0))) {
@@ -1354,7 +1351,7 @@
 		}
 	}
 	else {
-		notify_verbose_message(pvar, "SSH2_MSG_IGNORE was received.", LOG_LEVEL_VERBOSE);
+		logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_IGNORE was received.");
 
 		// \x83\x81\x83b\x83Z\x81[\x83W\x82\xAA SSH2_MSG_IGNORE \x82?\x9E\x82?\xBD\x82\xE0\x82\xB5\x82?\xA2
 		// Cisco \x83\x8B\x81[\x83^\x91?\xF4 (2006.11.28 maya)
@@ -1370,7 +1367,7 @@
 	char buf[2048];
 
 	if (SSHv1(pvar)) {
-		notify_verbose_message(pvar, "SSH_MSG_DEBUG was received.", LOG_LEVEL_VERBOSE);
+		logputs(LOG_LEVEL_VERBOSE, "SSH_MSG_DEBUG was received.");
 
 		if (grab_payload(pvar, 4)
 		 && grab_payload(pvar, description_len =
@@ -1382,7 +1379,7 @@
 			return TRUE;
 		}
 	} else {
-		notify_verbose_message(pvar, "SSH2_MSG_DEBUG was received.", LOG_LEVEL_VERBOSE);
+		logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_DEBUG was received.");
 
 		if (grab_payload(pvar, 5)
 		 && grab_payload(pvar,
@@ -1403,7 +1400,7 @@
 	if (always_display) {
 		notify_nonfatal_error(pvar, buf);
 	} else {
-		notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
+		logputs(LOG_LEVEL_VERBOSE, buf);
 	}
 	return TRUE;
 }
@@ -1418,7 +1415,7 @@
 	char uimsg[MAX_UIMSG];
 
 	if (SSHv1(pvar)) {
-		notify_verbose_message(pvar, "SSH_MSG_DISCONNECT was received.", LOG_LEVEL_VERBOSE);
+		logputs(LOG_LEVEL_VERBOSE, "SSH_MSG_DISCONNECT was received.");
 
 		if (grab_payload(pvar, 4)
 		 && grab_payload(pvar, description_len = get_payload_uint32(pvar, 0))) {
@@ -1429,7 +1426,7 @@
 			return TRUE;
 		}
 	} else {
-		notify_verbose_message(pvar, "SSH2_MSG_DISCONNECT was received.", LOG_LEVEL_VERBOSE);
+		logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_DISCONNECT was received.");
 
 		if (grab_payload(pvar, 8)
 		 && grab_payload(pvar,
@@ -1491,15 +1488,13 @@
 
 static BOOL handle_crypt_success(PTInstVar pvar)
 {
-	notify_verbose_message(pvar, "Secure mode successfully achieved",
-	                       LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "Secure mode successfully achieved");
 	return FALSE;
 }
 
 static BOOL handle_noauth_success(PTInstVar pvar)
 {
-	notify_verbose_message(pvar, "Server does not require authentication",
-	                       LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "Server does not require authentication");
 	prep_compression(pvar);
 	return FALSE;
 }
@@ -1506,8 +1501,7 @@
 
 static BOOL handle_auth_success(PTInstVar pvar)
 {
-	notify_verbose_message(pvar, "Authentication accepted",
-	                       LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "Authentication accepted");
 	prep_compression(pvar);
 
 	// \x83n\x81[\x83g\x83r\x81[\x83g\x81E\x83X\x83\x8C\x83b\x83h\x82?J\x8En (2004.12.11 yutaka)
@@ -1531,7 +1525,7 @@
 	Key hostkey;
 	int supported_types;
 
-	notify_verbose_message(pvar, "SSH_SMSG_PUBLIC_KEY was received.", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "SSH_SMSG_PUBLIC_KEY was received.");
 
 	if (!grab_payload(pvar, 14))
 		return FALSE;
@@ -1732,7 +1726,7 @@
 	pvar->server_compat_flag = 0;
 
 	if ((server_swver = strchr(pvar->server_version_string+4, '-')) == NULL) {
-		notify_verbose_message(pvar, "Can't get server software version string.", LOG_LEVEL_WARNING);
+		logputs(LOG_LEVEL_WARNING, "Can't get server software version string.");
 		return;
 	}
 	server_swver++;
@@ -1739,7 +1733,7 @@
 
 	if (strncmp(server_swver, "Cisco-1", 7) == 0) {
 		pvar->server_compat_flag |= SSH_BUG_DHGEX_LARGE;
-		notify_verbose_message(pvar, "Server version string is matched to \"Cisco-1\", compatibility flag SSH_BUG_DHGEX_LARGE is enabled.", LOG_LEVEL_INFO);
+		logputs(LOG_LEVEL_INFO, "Server version string is matched to \"Cisco-1\", compatibility flag SSH_BUG_DHGEX_LARGE is enabled.");
 	}
 }
 
@@ -1765,7 +1759,7 @@
 		strncpy_s(buf, buf_len, prefix, _TRUNCATE);
 		strncat_s(buf, buf_len, ID, _TRUNCATE);
 		chop_newlines(buf);
-		notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
+		logputs(LOG_LEVEL_VERBOSE, buf);
 		free(buf);
 
 		if (ID[ID_len - 1] != '\n') {
@@ -1832,25 +1826,16 @@
 				// \x83T\x81[\x83o\x83o\x81[\x83W\x83\x87\x83\x93\x82?`\x83F\x83b\x83N
 				server_version_check(pvar);
 
-				if ((pvar->Psend) (pvar->socket, TTSSH_ID, TTSSH_ID_len,
-				                   0) != TTSSH_ID_len) {
+				if ((pvar->Psend) (pvar->socket, TTSSH_ID, TTSSH_ID_len, 0) != TTSSH_ID_len) {
 					UTIL_get_lang_msg("MSG_SSH_SEND_ID_ERROR", pvar,
 					                  "An error occurred while sending the SSH ID string.\n"
 					                  "The connection will close.");
 					notify_fatal_error(pvar, pvar->ts->UIMsg, TRUE);
 				} else {
-					// \x89\xFC\x8Ds\x83R\x81[\x83h\x82?\x9C\x8B\x8E (2004.8.4 yutaka)
-					pvar->client_version_string[--TTSSH_ID_len] = 0; // \n
-					pvar->client_version_string[--TTSSH_ID_len] = 0; // \r
+					// \x89\xFC\x8Ds\x82?\x9C\x8B\x8E
+					chop_newlines(pvar->client_version_string);
+					logprintf(LOG_LEVEL_VERBOSE, "Sent client identification string: %s", pvar->client_version_string);
 
-					strncpy_s(prefix, sizeof(prefix), "Sent client identification string: ", _TRUNCATE);
-					buf_len = strlen(prefix) + strlen(pvar->client_version_string) + 1;
-					buf = (char *) malloc(buf_len);
-					strncpy_s(buf, buf_len, prefix, _TRUNCATE);
-					strncat_s(buf, buf_len, pvar->client_version_string, _TRUNCATE);
-					notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
-					free(buf);
-
 					push_memdump("server ID", NULL, pvar->server_version_string, strlen(pvar->server_version_string));
 					push_memdump("client ID", NULL, pvar->client_version_string, strlen(pvar->client_version_string));
 
@@ -2151,7 +2136,7 @@
 				           pvar->ssh_state.receiver_sequence_number - 1);
 				finish_send_packet(pvar);
 
-				notify_verbose_message(pvar, "SSH2_MSG_UNIMPLEMENTED was sent at SSH_handle_packet().", LOG_LEVEL_VERBOSE);
+				logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_UNIMPLEMENTED was sent at SSH_handle_packet().");
 				/* XXX need to decompress incoming packet, but how? */
 			}
 		} else {
@@ -2487,9 +2472,7 @@
 					begin_send_packet(pvar, SSH_CMSG_AUTH_PASSWORD,
 					                  4 + len);
 
-				notify_verbose_message(pvar,
-				                       "Trying PASSWORD authentication...",
-				                       LOG_LEVEL_VERBOSE);
+				logputs(LOG_LEVEL_VERBOSE, "Trying PASSWORD authentication...");
 
 				set_uint32(outmsg, len);
 				memcpy(outmsg + 4, cred->password, len);
@@ -2508,9 +2491,7 @@
 				unsigned char *outmsg =
 					begin_send_packet(pvar, SSH_CMSG_AUTH_RHOSTS, 4 + len);
 
-				notify_verbose_message(pvar,
-				                       "Trying RHOSTS authentication...",
-				                       LOG_LEVEL_VERBOSE);
+				logputs(LOG_LEVEL_VERBOSE, "Trying RHOSTS authentication...");
 
 				set_uint32(outmsg, len);
 				memcpy(outmsg + 4, cred->rhosts_client_user, len);
@@ -2523,9 +2504,7 @@
 				unsigned char *outmsg =
 					begin_send_packet(pvar, SSH_CMSG_AUTH_RSA, 2 + len);
 
-				notify_verbose_message(pvar,
-				                       "Trying RSA authentication...",
-				                       LOG_LEVEL_VERBOSE);
+				logputs(LOG_LEVEL_VERBOSE, "Trying RSA authentication...");
 
 				set_ushort16_MSBfirst(outmsg, len * 8);
 				BN_bn2bin(cred->key_pair->rsa->n, outmsg + 2);
@@ -2542,9 +2521,7 @@
 					begin_send_packet(pvar, SSH_CMSG_AUTH_RHOSTS_RSA,
 					                  12 + mod_len + name_len + exp_len);
 
-				notify_verbose_message(pvar,
-				                       "Trying RHOSTS+RSA authentication...",
-				                       LOG_LEVEL_VERBOSE);
+				logputs(LOG_LEVEL_VERBOSE, "Trying RHOSTS+RSA authentication...");
 
 				set_uint32(outmsg, name_len);
 				memcpy(outmsg + 4, cred->rhosts_client_user, name_len);
@@ -2589,9 +2566,7 @@
 				pubkey += 2;
 				outmsg = begin_send_packet(pvar, SSH_CMSG_AUTH_RSA, 2 + bn_bytes);
 
-				notify_verbose_message(pvar,
-				                       "Trying RSA authentication...",
-				                       LOG_LEVEL_VERBOSE);
+				logputs(LOG_LEVEL_VERBOSE, "Trying RSA authentication...");
 
 				set_ushort16_MSBfirst(outmsg, bn_bytes * 8);
 				memcpy(outmsg + 2, pubkey, bn_bytes);
@@ -2607,9 +2582,7 @@
 					unsigned char *outmsg =
 						begin_send_packet(pvar, SSH_CMSG_AUTH_TIS, 0);
 
-					notify_verbose_message(pvar,
-					                       "Trying TIS authentication...",
-					                       LOG_LEVEL_VERBOSE);
+					logputs(LOG_LEVEL_VERBOSE, "Trying TIS authentication...");
 					enque_handlers(pvar, 2, TIS_msgs, TIS_handlers);
 				} else {
 					int len = strlen(cred->password);
@@ -2617,9 +2590,7 @@
 						begin_send_packet(pvar, SSH_CMSG_AUTH_TIS_RESPONSE,
 						                  4 + len);
 
-					notify_verbose_message(pvar,
-					                       "Sending TIS response",
-					                       LOG_LEVEL_VERBOSE);
+					logputs(LOG_LEVEL_VERBOSE, "Sending TIS response");
 
 					set_uint32(outmsg, len);
 					memcpy(outmsg + 4, cred->password, len);
@@ -2654,7 +2625,6 @@
 			int len = strlen(username);
 			unsigned char *outmsg =
 				begin_send_packet(pvar, SSH_CMSG_USER, 4 + len);
-			char buf[1024] = "Sending user name: ";
 			static const int msgs[] =
 				{ SSH_SMSG_SUCCESS, SSH_SMSG_FAILURE };
 			static const SSHPacketHandler handlers[]
@@ -2666,8 +2636,7 @@
 
 			pvar->ssh_state.status_flags |= STATUS_DONT_SEND_USER_NAME;
 
-			strncat_s(buf, sizeof(buf), username, _TRUNCATE);
-			notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
+			logprintf(LOG_LEVEL_VERBOSE, "Sending user name: %s", username);
 
 			enque_handlers(pvar, 2, msgs, handlers);
 		}
@@ -2806,7 +2775,7 @@
 		finish_send_packet(pvar);
 		buffer_free(msg);
 
-		notify_verbose_message(pvar, "SSH2_MSG_DISCONNECT was sent at SSH_notify_disconnecting().", LOG_LEVEL_VERBOSE);
+		logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_DISCONNECT was sent at SSH_notify_disconnecting().");
 	}
 }
 
@@ -3292,7 +3261,6 @@
 	buffer_t *msg;
 	unsigned char *outmsg;
 	unsigned int len;
-	char log[128];
 
 	// SSH2\x8C\xAE\x8C\xF0\x8A\xB7\x92\x86\x82??\x81A\x83p\x83P\x83b\x83g\x82\xF0\x8E?Ă\xE9\x81B(2005.6.19 yutaka)
 	if (pvar->rekeying) {
@@ -3339,8 +3307,7 @@
 		buffer_free(msg);
 		//debug_print(1, pvar->ssh_state.outbuf, 7 + 4 + 1 + 1 + len);
 
-		_snprintf_s(log, sizeof(log), _TRUNCATE, "SSH2_MSG_CHANNEL_DATA was sent at SSH2_send_channel_data(). local:%d remote:%d", c->self_id, c->remote_id);
-		notify_verbose_message(pvar, log, LOG_LEVEL_SSHDUMP);
+		logprintf(LOG_LEVEL_SSHDUMP, "SSH2_MSG_CHANNEL_DATA was sent at SSH2_send_channel_data(). local:%d remote:%d", c->self_id, c->remote_id);
 
 		// remote window size\x82?\xB2\x90\xAE
 		if (buflen <= c->remote_window) {
@@ -3438,7 +3405,7 @@
 		finish_send_packet(pvar);
 		buffer_free(msg);
 
-		notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_OPEN_FAILURE was sent at SSH_fail_channel_open().", LOG_LEVEL_VERBOSE);
+		logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_OPEN_FAILURE was sent at SSH_fail_channel_open().");
 	}
 }
 
@@ -3447,7 +3414,6 @@
 	buffer_t *msg;
 	unsigned char *outmsg;
 	int len;
-	char log[128];
 
 	if (c == NULL)
 		return;
@@ -3468,8 +3434,7 @@
 	finish_send_packet(pvar);
 	buffer_free(msg);
 
-	_snprintf_s(log, sizeof(log), _TRUNCATE, "SSH2_MSG_CHANNEL_OPEN_CONFIRMATION was sent at SSH_confirm_channel_open(). local:%d remote:%d", c->self_id, c->remote_id);
-	notify_verbose_message(pvar, log, LOG_LEVEL_VERBOSE);
+	logprintf(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_OPEN_CONFIRMATION was sent at SSH_confirm_channel_open(). local:%d remote:%d", c->self_id, c->remote_id);
 }
 
 void SSH_confirm_channel_open(PTInstVar pvar, uint32 remote_channel_num,
@@ -3516,7 +3481,6 @@
 	buffer_t *msg;
 	unsigned char *outmsg;
 	int len;
-	char log[128];
 
 	if (c == NULL)
 		return;
@@ -3543,8 +3507,7 @@
 	finish_send_packet(pvar);
 	buffer_free(msg);
 
-	_snprintf_s(log, sizeof(log), _TRUNCATE, "SSH2_MSG_CHANNEL_EOF was sent at SSH2_channel_input_eof(). local:%d remote:%d", c->self_id, c->remote_id);
-	notify_verbose_message(pvar, log, LOG_LEVEL_VERBOSE);
+	logprintf(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_EOF was sent at SSH2_channel_input_eof(). local:%d remote:%d", c->self_id, c->remote_id);
 }
 
 void SSH_channel_input_eof(PTInstVar pvar, uint32 remote_channel_num, uint32 local_channel_num)
@@ -3610,7 +3573,7 @@
 		finish_send_packet(pvar);
 		buffer_free(msg);
 
-		notify_verbose_message(pvar, "SSH2_MSG_GLOBAL_REQUEST was sent at SSH_request_forwarding().", LOG_LEVEL_VERBOSE);
+		logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_GLOBAL_REQUEST was sent at SSH_request_forwarding().");
 	}
 }
 
@@ -3640,7 +3603,7 @@
 		finish_send_packet(pvar);
 		buffer_free(msg);
 
-		notify_verbose_message(pvar, "SSH2_MSG_GLOBAL_REQUEST was sent at SSH_cancel_request_forwarding().", LOG_LEVEL_VERBOSE);
+		logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_GLOBAL_REQUEST was sent at SSH_cancel_request_forwarding().");
 	}
 }
 
@@ -3819,7 +3782,7 @@
 			finish_send_packet(pvar);
 			buffer_free(msg);
 
-			notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_OPEN was sent at SSH_open_channel().", LOG_LEVEL_VERBOSE);
+			logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_OPEN was sent at SSH_open_channel().");
 
 			return;
 
@@ -3957,7 +3920,7 @@
 	finish_send_packet(pvar);
 	buffer_free(msg);
 
-	notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_OPEN was sent at SSH_scp_transaction().", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_OPEN was sent at SSH_scp_transaction().");
 
 	return TRUE;
 
@@ -4023,7 +3986,7 @@
 	finish_send_packet(pvar);
 	buffer_free(msg);
 
-	notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_OPEN was sent at SSH_sftp_transaction().", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_OPEN was sent at SSH_sftp_transaction().");
 
 	return TRUE;
 
@@ -4559,7 +4522,6 @@
 	buffer_t *msg;
 	unsigned char *outmsg;
 	int len, i;
-	char log[1024];
 
 	msg = buffer_init();
 	if (msg == NULL) {
@@ -4586,45 +4548,37 @@
 	buffer_put_int(msg, 0);
 
 
-	_snprintf_s(log, sizeof(log), _TRUNCATE,
-	            "client proposal: KEX algorithm: %s",
-	            myproposal[0]);
-	notify_verbose_message(pvar, log, LOG_LEVEL_VERBOSE);
+	logprintf(LOG_LEVEL_VERBOSE,
+		"client proposal: KEX algorithm: %s",
+		myproposal[0]);
 
-	_snprintf_s(log, sizeof(log), _TRUNCATE,
-	            "client proposal: server host key algorithm: %s",
-	            myproposal[1]);
-	notify_verbose_message(pvar, log, LOG_LEVEL_VERBOSE);
+	logprintf(LOG_LEVEL_VERBOSE,
+		"client proposal: server host key algorithm: %s",
+		myproposal[1]);
 
-	_snprintf_s(log, sizeof(log), _TRUNCATE,
-	            "client proposal: encryption algorithm client to server: %s",
-	            myproposal[2]);
-	notify_verbose_message(pvar, log, LOG_LEVEL_VERBOSE);
+	logprintf(LOG_LEVEL_VERBOSE,
+		"client proposal: encryption algorithm client to server: %s",
+		myproposal[2]);
 
-	_snprintf_s(log, sizeof(log), _TRUNCATE,
-	            "client proposal: encryption algorithm server to client: %s",
-	            myproposal[3]);
-	notify_verbose_message(pvar, log, LOG_LEVEL_VERBOSE);
+	logprintf(LOG_LEVEL_VERBOSE,
+		"client proposal: encryption algorithm server to client: %s",
+		myproposal[3]);
 
-	_snprintf_s(log, sizeof(log), _TRUNCATE,
-	            "client proposal: MAC algorithm client to server: %s",
-	            myproposal[4]);
-	notify_verbose_message(pvar, log, LOG_LEVEL_VERBOSE);
+	logprintf(LOG_LEVEL_VERBOSE,
+		"client proposal: MAC algorithm client to server: %s",
+		myproposal[4]);
 
-	_snprintf_s(log, sizeof(log), _TRUNCATE,
-	            "client proposal: MAC algorithm server to client: %s",
-	            myproposal[5]);
-	notify_verbose_message(pvar, log, LOG_LEVEL_VERBOSE);
+	logprintf(LOG_LEVEL_VERBOSE,
+		"client proposal: MAC algorithm server to client: %s",
+		myproposal[5]);
 
-	_snprintf_s(log, sizeof(log), _TRUNCATE,
-	            "client proposal: compression algorithm client to server: %s",
-	            myproposal[6]);
-	notify_verbose_message(pvar, log, LOG_LEVEL_VERBOSE);
+	logprintf(LOG_LEVEL_VERBOSE,
+		"client proposal: compression algorithm client to server: %s",
+		myproposal[6]);
 
-	_snprintf_s(log, sizeof(log), _TRUNCATE,
-	            "client proposal: compression algorithm server to client: %s",
-	            myproposal[7]);
-	notify_verbose_message(pvar, log, LOG_LEVEL_VERBOSE);
+	logprintf(LOG_LEVEL_VERBOSE,
+		"client proposal: compression algorithm server to client: %s",
+		myproposal[7]);
 
 
 	len = buffer_len(msg);
@@ -4635,7 +4589,7 @@
 	// my_kex\x82?\xE6\x82\xC1\x82Ă\xA8\x82\xAD\x82\xBD\x82?A\x83t\x83\x8A\x81[\x82\xB5\x82Ă?\xA2\x82\xAF\x82?\xA2\x81B
 	//buffer_free(msg);
 
-	notify_verbose_message(pvar, "SSH2_MSG_KEXINIT was sent at SSH2_send_kexinit().", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_KEXINIT was sent at SSH2_send_kexinit().");
 }
 
 
@@ -4834,7 +4788,7 @@
 	char tmp[1024+512];
 	char str_keytype[20];
 
-	notify_verbose_message(pvar, "SSH2_MSG_KEXINIT was received.", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_KEXINIT was received.");
 
 	// \x82\xB7\x82ł?L\x81[\x8C\xF0\x8A\xB7\x82\xAA\x8FI\x82\xED\x82\xC1\x82Ă\xA2\x82\xE9\x82?\xE0\x8A?\xED\x82炸\x81A\x83T\x81[\x83o\x82\xA9\x82\xE7 SSH2_MSG_KEXINIT \x82\xAA
 	// \x91\x97\x82\xE7\x82\xEA\x82Ă\xAD\x82\xE9\x8F?\x82?A\x83L\x81[\x8Dč?\x82\xF0\x8Ds\x82\xA4\x81B(2004.10.24 yutaka)
@@ -4899,8 +4853,7 @@
 	buf[i] = '\0'; // null-terminate
 	offset += size;
 
-	_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "server proposal: KEX algorithm: %s", buf);
-	notify_verbose_message(pvar, tmp, LOG_LEVEL_VERBOSE);
+	logprintf(LOG_LEVEL_VERBOSE, "server proposal: KEX algorithm: %s", buf);
 
 	pvar->kex_type = choose_SSH2_kex_algorithm(buf, myproposal[PROPOSAL_KEX_ALGS]);
 	if (pvar->kex_type == KEX_DH_UNKNOWN) { // not match
@@ -4920,8 +4873,7 @@
 	buf[i] = 0;
 	offset += size;
 
-	_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "server proposal: server host key algorithm: %s", buf);
-	notify_verbose_message(pvar, tmp, LOG_LEVEL_VERBOSE);
+	logprintf(LOG_LEVEL_VERBOSE, "server proposal: server host key algorithm: %s", buf);
 
 	pvar->hostkey_type = KEY_UNSPEC;
 	choose_SSH2_proposal(buf, myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS], str_keytype, sizeof(str_keytype));
@@ -4949,8 +4901,7 @@
 	buf[i] = 0;
 	offset += size;
 
-	_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "server proposal: encryption algorithm client to server: %s", buf);
-	notify_verbose_message(pvar, tmp, LOG_LEVEL_VERBOSE);
+	logprintf(LOG_LEVEL_VERBOSE, "server proposal: encryption algorithm client to server: %s", buf);
 
 	pvar->ctos_cipher = choose_SSH2_cipher_algorithm(buf, myproposal[PROPOSAL_ENC_ALGS_CTOS]);
 	if (pvar->ctos_cipher == SSH_CIPHER_NONE) {
@@ -4970,8 +4921,7 @@
 	buf[i] = 0;
 	offset += size;
 
-	_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "server proposal: encryption algorithm server to client: %s", buf);
-	notify_verbose_message(pvar, tmp, LOG_LEVEL_VERBOSE);
+	logprintf(LOG_LEVEL_VERBOSE, "server proposal: encryption algorithm server to client: %s", buf);
 
 	pvar->stoc_cipher = choose_SSH2_cipher_algorithm(buf, myproposal[PROPOSAL_ENC_ALGS_STOC]);
 	if (pvar->stoc_cipher == SSH_CIPHER_NONE) {
@@ -4991,8 +4941,7 @@
 	buf[i] = 0;
 	offset += size;
 
-	_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "server proposal: MAC algorithm client to server: %s", buf);
-	notify_verbose_message(pvar, tmp, LOG_LEVEL_VERBOSE);
+	logprintf(LOG_LEVEL_VERBOSE, "server proposal: MAC algorithm client to server: %s", buf);
 
 	pvar->ctos_hmac = choose_SSH2_hmac_algorithm(buf, myproposal[PROPOSAL_MAC_ALGS_CTOS]);
 	if (pvar->ctos_hmac == HMAC_UNKNOWN) { // not match
@@ -5011,8 +4960,7 @@
 	buf[i] = 0;
 	offset += size;
 
-	_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "server proposal: MAC algorithm server to client: %s", buf);
-	notify_verbose_message(pvar, tmp, LOG_LEVEL_VERBOSE);
+	logprintf(LOG_LEVEL_VERBOSE, "server proposal: MAC algorithm server to client: %s", buf);
 
 	pvar->stoc_hmac = choose_SSH2_hmac_algorithm(buf, myproposal[PROPOSAL_MAC_ALGS_STOC]);
 	if (pvar->stoc_hmac == HMAC_UNKNOWN) { // not match
@@ -5034,8 +4982,7 @@
 	buf[i] = 0;
 	offset += size;
 
-	_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "server proposal: compression algorithm client to server: %s", buf);
-	notify_verbose_message(pvar, tmp, LOG_LEVEL_VERBOSE);
+	logprintf(LOG_LEVEL_VERBOSE, "server proposal: compression algorithm client to server: %s", buf);
 
 	pvar->ctos_compression = choose_SSH2_compression_algorithm(buf, myproposal[PROPOSAL_COMP_ALGS_CTOS]);
 	if (pvar->ctos_compression == COMP_UNKNOWN) { // not match
@@ -5054,8 +5001,7 @@
 	buf[i] = 0;
 	offset += size;
 
-	_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, "server proposal: compression algorithm server to client: %s", buf);
-	notify_verbose_message(pvar, tmp, LOG_LEVEL_VERBOSE);
+	logprintf(LOG_LEVEL_VERBOSE, "server proposal: compression algorithm server to client: %s", buf);
 
 	pvar->stoc_compression = choose_SSH2_compression_algorithm(buf, myproposal[PROPOSAL_COMP_ALGS_STOC]);
 	if (pvar->stoc_compression == COMP_UNKNOWN) { // not match
@@ -5067,44 +5013,36 @@
 
 
 	// \x8C\x88\x92\xE8
-	_snprintf_s(buf, sizeof(buf), _TRUNCATE, "KEX algorithm: %s",
-	            get_kex_algorithm_name(pvar->kex_type));
-	notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
+	logprintf(LOG_LEVEL_VERBOSE, "KEX algorithm: %s",
+		get_kex_algorithm_name(pvar->kex_type));
 
-	_snprintf_s(buf, sizeof(buf), _TRUNCATE,
-	            "server host key algorithm: %s",
-	            get_ssh_keytype_name(pvar->hostkey_type));
-	notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
+	logprintf(LOG_LEVEL_VERBOSE,
+		"server host key algorithm: %s",
+		get_ssh_keytype_name(pvar->hostkey_type));
 
-	_snprintf_s(buf, sizeof(buf), _TRUNCATE,
-	            "encryption algorithm client to server: %s",
-	            get_cipher_string(pvar->ctos_cipher));
-	notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
+	logprintf(LOG_LEVEL_VERBOSE,
+		"encryption algorithm client to server: %s",
+		get_cipher_string(pvar->ctos_cipher));
 
-	_snprintf_s(buf, sizeof(buf), _TRUNCATE,
-	            "encryption algorithm server to client: %s",
-	            get_cipher_string(pvar->stoc_cipher));
-	notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
+	logprintf(LOG_LEVEL_VERBOSE,
+		"encryption algorithm server to client: %s",
+		get_cipher_string(pvar->stoc_cipher));
 
-	_snprintf_s(buf, sizeof(buf), _TRUNCATE,
-	            "MAC algorithm client to server: %s",
-	            get_ssh2_mac_name(pvar->ctos_hmac));
-	notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
+	logprintf(LOG_LEVEL_VERBOSE,
+		"MAC algorithm client to server: %s",
+		get_ssh2_mac_name(pvar->ctos_hmac));
 
-	_snprintf_s(buf, sizeof(buf), _TRUNCATE,
-	            "MAC algorithm server to client: %s",
-	            get_ssh2_mac_name(pvar->stoc_hmac));
-	notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
+	logprintf(LOG_LEVEL_VERBOSE,
+		"MAC algorithm server to client: %s",
+		get_ssh2_mac_name(pvar->stoc_hmac));
 
-	_snprintf_s(buf, sizeof(buf), _TRUNCATE,
-	            "compression algorithm client to server: %s",
-	            get_ssh2_comp_name(pvar->ctos_compression));
-	notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
+	logprintf(LOG_LEVEL_VERBOSE,
+		"compression algorithm client to server: %s",
+		get_ssh2_comp_name(pvar->ctos_compression));
 
-	_snprintf_s(buf, sizeof(buf), _TRUNCATE,
-	            "compression algorithm server to client: %s",
-	            get_ssh2_comp_name(pvar->stoc_compression));
-	notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
+	logprintf(LOG_LEVEL_VERBOSE,
+		"compression algorithm server to client: %s",
+		get_ssh2_comp_name(pvar->stoc_compression));
 
 
 	// we_need\x82?\x88\x92\xE8 (2004.11.6 yutaka)
@@ -5205,7 +5143,7 @@
 
 	buffer_free(msg);
 
-	notify_verbose_message(pvar, "SSH2_MSG_KEXDH_INIT was sent at SSH2_dh_kex_init().", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_KEXDH_INIT was sent at SSH2_dh_kex_init().");
 
 	return;
 
@@ -5253,11 +5191,9 @@
 		bits = max;
 	}
 	if (pvar->server_compat_flag & SSH_BUG_DHGEX_LARGE && bits > 4096) {
-		unsigned char tmp[256];
-		_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, 
-		            "SSH_BUG_DHGEX_LARGE is enabled. DH-GEX group size is limited to 4096. (Original size is %d)",
-			    bits);
-		notify_verbose_message(pvar, tmp, LOG_LEVEL_NOTICE);
+		logprintf(LOG_LEVEL_NOTICE,
+			"SSH_BUG_DHGEX_LARGE is enabled. DH-GEX group size is limited to 4096. "
+			"(Original size is %d)", bits);
 		bits = 4096;
 	}
 
@@ -5290,7 +5226,7 @@
 
 	buffer_free(msg);
 
-	notify_verbose_message(pvar, "SSH2_MSG_KEX_DH_GEX_REQUEST was sent at SSH2_dh_gex_kex_init().", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_KEX_DH_GEX_REQUEST was sent at SSH2_dh_gex_kex_init().");
 
 	return;
 
@@ -5312,7 +5248,7 @@
 	unsigned char *outmsg;
 	char tmpbuf[256];
 
-	notify_verbose_message(pvar, "SSH2_MSG_KEX_DH_GEX_GROUP was received.", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_KEX_DH_GEX_GROUP was received.");
 
 	// 6byte\x81i\x83T\x83C\x83Y\x81{\x83p\x83f\x83B\x83\x93\x83O\x81{\x83^\x83C\x83v\x81j\x82\xF0\x8E\xE6\x82菜\x82\xA2\x82\xBD\x88?~\x82?y\x83C\x83\x8D\x81[\x83h
 	data = pvar->ssh_state.payload;
@@ -5328,9 +5264,8 @@
 	buffer_get_bignum2(&data, g); // \x90\xB6\x90\xAC\x8C\xB3\x82?擾
 
 	grp_bits = BN_num_bits(p);
-	_snprintf_s(tmpbuf, sizeof(tmpbuf), _TRUNCATE, "DH-GEX: Request: %d / %d / %d, Received: %d",
+	logprintf(LOG_LEVEL_VERBOSE, "DH-GEX: Request: %d / %d / %d, Received: %d",
 	            pvar->kexgex_min, pvar->kexgex_bits, pvar->kexgex_max, BN_num_bits(p));
-	notify_verbose_message(pvar, tmpbuf, LOG_LEVEL_VERBOSE);
 
 	//
 	// (1) < GEX_GRP_MINSIZE <= (2) < kexgex_min <= (3) < kexgex_bits <= (4) <= kexgex_max < (5) <= GEX_GRP_MAXSIZE < (6)
@@ -5345,25 +5280,23 @@
 	}
 	else if (grp_bits < pvar->kexgex_min) {
 	// (2) \x83v\x83\x8D\x83g\x83R\x83\x8B\x82ŔF\x82?\xE7\x82\xEA\x82Ă\xA2\x82\xE9\x94??\xE0\x82\xBE\x82\xAA\x81A\x82\xB1\x82\xBF\x82\xE7\x82???\x82\xBD\x8D?\xAC\x92l\x82\xE6\x82?\x82\xB3\x82\xA2\x81B\x8Am\x94F\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x8Fo\x82\xB7\x81B
-		_snprintf_s(tmpbuf, sizeof(tmpbuf), _TRUNCATE,
+		logprintf(LOG_LEVEL_WARNING,
 		    "DH-GEX: grp_bits(%d) < kexgex_min(%d)", grp_bits, pvar->kexgex_min);
-		notify_verbose_message(pvar, tmpbuf, LOG_LEVEL_WARNING);
 		UTIL_get_lang_msg("MSG_SSH_GEX_SIZE_SMALLER", pvar,
 		                  "Received group size is smaller than the requested minimal size.\nrequested: %d, received: %d\nAre you sure that you want to accecpt received group?");
 		_snprintf_s(tmpbuf, sizeof(tmpbuf), _TRUNCATE,
-		    pvar->ts->UIMsg, pvar->kexgex_min, grp_bits);
+			pvar->ts->UIMsg, pvar->kexgex_min, grp_bits);
 	}
 	else if (grp_bits < pvar->kexgex_bits) {
 	// (3) \x97v\x8B\x81\x82??\xAC\x92l\x82?\x9E\x82\xBD\x82\xB7\x82\xAA\x81A\x97v\x8B\x81\x92l\x82\xE6\x82\xE8\x82?\xAC\x82\xB3\x82\xA2\x81B\x8Am\x94F\x83_\x83C\x83A\x83\x8D\x83O\x82?o\x82\xB3\x82?\xA2\x81B
-		_snprintf_s(tmpbuf, sizeof(tmpbuf), _TRUNCATE,
-		    "DH-GEX: grp_bits(%d) < kexgex_bits(%d)", grp_bits, pvar->kexgex_bits);
-		notify_verbose_message(pvar, tmpbuf, LOG_LEVEL_NOTICE);
+		logprintf(LOG_LEVEL_NOTICE,
+			"DH-GEX: grp_bits(%d) < kexgex_bits(%d)", grp_bits, pvar->kexgex_bits);
 #if 1
 		tmpbuf[0] = 0; // no message
 #else
 		_snprintf_s(tmpbuf, sizeof(tmpbuf), _TRUNCATE,
-		    "Received group size is smaller than requested.\nrequested: %d, received: %d\nAccept this?",
-		    pvar->kexgex_bits, grp_bits);
+			"Received group size is smaller than requested.\nrequested: %d, received: %d\nAccept this?",
+			pvar->kexgex_bits, grp_bits);
 #endif
 	}
 	else if (grp_bits <= pvar->kexgex_max) {
@@ -5373,13 +5306,12 @@
 	else {
 	// (5) \x82\xB1\x82\xBF\x82\xE7\x82???\x82\xBD\x8Dő\xE5\x92l\x82\xE6\x82\xE8\x91?\x82\xA2\x81B\x8Am\x94F\x83_\x83C\x83A\x83\x8D\x83O\x82\xF0\x8Fo\x82\xB7\x81B
 	//     \x82\xBD\x82\xBE\x82\xB5\x8C\xBB\x8F\xF3\x82ł\xCD kexgex_max == GEX_GRP_MAXSIZE(8192) \x82ł\xA0\x82\xE9\x88?\xB1\x82????鎖\x82?\xB3\x82\xA2\x81B
-		_snprintf_s(tmpbuf, sizeof(tmpbuf), _TRUNCATE,
-		    "DH-GEX: grp_bits(%d) > kexgex_max(%d)", grp_bits, pvar->kexgex_max);
-		notify_verbose_message(pvar, tmpbuf, LOG_LEVEL_WARNING);
+		logprintf(LOG_LEVEL_WARNING,
+			"DH-GEX: grp_bits(%d) > kexgex_max(%d)", grp_bits, pvar->kexgex_max);
 		UTIL_get_lang_msg("MSG_SSH_GEX_SIZE_LARGER", pvar,
 		                  "Received group size is larger than the requested maximal size.\nrequested: %d, received: %d\nAre you sure that you want to accecpt received group?");
 		_snprintf_s(tmpbuf, sizeof(tmpbuf), _TRUNCATE,
-		    pvar->ts->UIMsg, pvar->kexgex_max, grp_bits);
+			pvar->ts->UIMsg, pvar->kexgex_max, grp_bits);
 	}
 	
 	if (tmpbuf[0] != 0) {
@@ -5413,7 +5345,7 @@
 	memcpy(outmsg, buffer_ptr(msg), len);
 	finish_send_packet(pvar);
 
-	notify_verbose_message(pvar, "SSH2_MSG_KEX_DH_GEX_INIT was sent at handle_SSH2_dh_gex_group().", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_KEX_DH_GEX_INIT was sent at handle_SSH2_dh_gex_group().");
 
 	// \x82\xB1\x82\xB1\x82ō?\x82\xB5\x82\xBDDH\x8C\xAE\x82?A\x82\xA0\x82?Ńn\x83b\x83V\x83\x85\x8Cv\x8EZ\x82?g\x82\xA4\x82\xBD\x82?\xE6\x82\xC1\x82Ă\xA8\x82\xAD\x81B(2004.10.31 yutaka)
 	if (pvar->kexdh != NULL) {
@@ -5497,7 +5429,7 @@
 
 	buffer_free(msg);
 
-	notify_verbose_message(pvar, "SSH2_MSG_KEX_ECDH_INIT was sent at SSH2_ecdh_kex_init().", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_KEX_ECDH_INIT was sent at SSH2_ecdh_kex_init().");
 
 	return;
 
@@ -5548,7 +5480,7 @@
 	int ret, hashlen;
 	Key *hostkey;  // hostkey
 
-	notify_verbose_message(pvar, "SSH2_MSG_KEXDH_REPLY was received.", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_KEXDH_REPLY was received.");
 
 	memset(&hostkey, 0, sizeof(hostkey));
 
@@ -5693,7 +5625,7 @@
 	begin_send_packet(pvar, SSH2_MSG_NEWKEYS, 0);
 	finish_send_packet(pvar);
 
-	notify_verbose_message(pvar, "SSH2_MSG_NEWKEYS was sent at handle_SSH2_dh_kex_reply().", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_NEWKEYS was sent at handle_SSH2_dh_kex_reply().");
 
 	// SSH2_MSG_NEWKEYS\x82?\xE8\x8FI\x82\xED\x82\xC1\x82\xBD\x82\xA0\x82??L\x81[\x82???\x82\xE6\x82эĐ?\xE8\x82\xF0\x8Ds\x82\xA4
 	// \x91\x97\x90M\x97p\x82?Í\x86\x8C\xAE\x82\xCD SSH2_MSG_NEWKEYS \x82?\x97\x90M\x8C\xE3\x82?A\x8E\xF3\x90M\x97p\x82?\xCD SSH2_MSG_NEWKEYS \x82\xCC
@@ -5774,7 +5706,7 @@
 	int ret, hashlen;
 	Key *hostkey = NULL;  // hostkey
 
-	notify_verbose_message(pvar, "SSH2_MSG_KEX_DH_GEX_REPLY was received.", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_KEX_DH_GEX_REPLY was received.");
 
 	memset(&hostkey, 0, sizeof(hostkey));
 
@@ -5928,7 +5860,7 @@
 	begin_send_packet(pvar, SSH2_MSG_NEWKEYS, 0);
 	finish_send_packet(pvar);
 
-	notify_verbose_message(pvar, "SSH2_MSG_NEWKEYS was sent at handle_SSH2_dh_gex_reply().", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_NEWKEYS was sent at handle_SSH2_dh_gex_reply().");
 
 	// SSH2_MSG_NEWKEYS\x82?\xE8\x8FI\x82\xED\x82\xC1\x82\xBD\x82\xA0\x82??L\x81[\x82???\x82\xE6\x82эĐ?\xE8\x82\xF0\x8Ds\x82\xA4
 	// \x91\x97\x90M\x97p\x82?Í\x86\x8C\xAE\x82\xCD SSH2_MSG_NEWKEYS \x82?\x97\x90M\x8C\xE3\x82?A\x8E\xF3\x90M\x97p\x82?\xCD SSH2_MSG_NEWKEYS \x82\xCC
@@ -6008,7 +5940,7 @@
 	int ret, hashlen;
 	Key *hostkey = NULL;  // hostkey
 
-	notify_verbose_message(pvar, "SSH2_MSG_KEX_ECDH_REPLY was received.", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_KEX_ECDH_REPLY was received.");
 
 	memset(&hostkey, 0, sizeof(hostkey));
 
@@ -6160,7 +6092,7 @@
 	begin_send_packet(pvar, SSH2_MSG_NEWKEYS, 0);
 	finish_send_packet(pvar);
 
-	notify_verbose_message(pvar, "SSH2_MSG_NEWKEYS was sent at handle_SSH2_ecdh_kex_reply().", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_NEWKEYS was sent at handle_SSH2_ecdh_kex_reply().");
 
 	// SSH2_MSG_NEWKEYS\x82?\xE8\x8FI\x82\xED\x82\xC1\x82\xBD\x82\xA0\x82??L\x81[\x82???\x82\xE6\x82эĐ?\xE8\x82\xF0\x8Ds\x82\xA4
 	// \x91\x97\x90M\x97p\x82?Í\x86\x8C\xAE\x82\xCD SSH2_MSG_NEWKEYS \x82?\x97\x90M\x8C\xE3\x82?A\x8E\xF3\x90M\x97p\x82?\xCD SSH2_MSG_NEWKEYS \x82\xCC
@@ -6307,7 +6239,7 @@
 	int type = (1 << SSH_AUTH_PASSWORD) | (1 << SSH_AUTH_RSA) |
 	           (1 << SSH_AUTH_TIS) | (1 << SSH_AUTH_PAGEANT);
 
-	notify_verbose_message(pvar, "SSH2_MSG_NEWKEYS was received(DH key generation is completed).", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_NEWKEYS was received(DH key generation is completed).");
 
 	// \x83\x8D\x83O\x8D?\xE6\x82?I\x97\xB9 (2005.3.7 yutaka)
 	if (LOG_LEVEL_SSHDUMP <= pvar->session_settings.LogLevel) {
@@ -6393,7 +6325,7 @@
 	SSH2_dispatch_add_message(SSH2_MSG_IGNORE); // XXX: Tru64 UNIX workaround   (2005.3.5 yutaka)
 	SSH2_dispatch_add_message(SSH2_MSG_DEBUG);
 
-	notify_verbose_message(pvar, "SSH2_MSG_SERVICE_REQUEST was sent at do_SSH2_userauth().", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_SERVICE_REQUEST was sent at do_SSH2_userauth().");
 
 	return TRUE;
 }
@@ -6401,14 +6333,13 @@
 
 static BOOL handle_SSH2_service_accept(PTInstVar pvar)
 {
-	char *data, *s, tmp[100];
+	char *data, *s;
 
 	// 6byte\x81i\x83T\x83C\x83Y\x81{\x83p\x83f\x83B\x83\x93\x83O\x81{\x83^\x83C\x83v\x81j\x82\xF0\x8E\xE6\x82菜\x82\xA2\x82\xBD\x88?~\x82?y\x83C\x83\x8D\x81[\x83h
 	data = pvar->ssh_state.payload;
 
 	s = buffer_get_string(&data, NULL);
-	_snprintf(tmp, sizeof(tmp), "SSH2_MSG_SERVICE_ACCEPT was received. service name=%s", s);
-	notify_verbose_message(pvar, tmp, LOG_LEVEL_VERBOSE);
+	logprintf(LOG_LEVEL_VERBOSE, "SSH2_MSG_SERVICE_ACCEPT was received. service name=%s", s);
 
 	SSH2_dispatch_init(5);
 	SSH2_dispatch_add_message(SSH2_MSG_IGNORE); // XXX: Tru64 UNIX workaround   (2005.3.5 yutaka)
@@ -6428,7 +6359,6 @@
 	SSH2_dispatch_add_message(SSH2_MSG_USERAUTH_BANNER);
 	SSH2_dispatch_add_message(SSH2_MSG_DEBUG);  // support for authorized_keys command (2006.2.23 yutaka)
 
-
 	return do_SSH2_authrequest(pvar);
 }
 
@@ -6584,7 +6514,6 @@
 
 	}
 
-
 	// \x83p\x83P\x83b\x83g\x91\x97\x90M
 	len = buffer_len(msg);
 	outmsg = begin_send_packet(pvar, SSH2_MSG_USERAUTH_REQUEST, len);
@@ -6593,11 +6522,9 @@
 	buffer_free(msg);
 
 	{
-		char buf[128];
-		_snprintf_s(buf, sizeof(buf), _TRUNCATE,
-		            "SSH2_MSG_USERAUTH_REQUEST was sent do_SSH2_authrequest(). (method %d)",
-		            pvar->auth_state.cur_cred.method);
-		notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
+		logprintf(LOG_LEVEL_VERBOSE,
+			"SSH2_MSG_USERAUTH_REQUEST was sent do_SSH2_authrequest(). (method %d)",
+			pvar->auth_state.cur_cred.method);
 	}
 
 	return TRUE;
@@ -6653,9 +6580,9 @@
 			finish_send_packet(pvar);
 			buffer_free(msg);
 			if (SSHv1(pvar)) {
-				notify_verbose_message(pvar, "SSH_MSG_IGNORE was sent at ssh_heartbeat_dlg_proc().", LOG_LEVEL_SSHDUMP);
+				logputs(LOG_LEVEL_SSHDUMP, "SSH_MSG_IGNORE was sent at ssh_heartbeat_dlg_proc().");
 			} else {
-				notify_verbose_message(pvar, "SSH2_MSG_IGNORE was sent at ssh_heartbeat_dlg_proc().", LOG_LEVEL_SSHDUMP);
+				logputs(LOG_LEVEL_SSHDUMP, "SSH2_MSG_IGNORE was sent at ssh_heartbeat_dlg_proc().");
 			}
 			}
 			return TRUE;
@@ -6767,7 +6694,7 @@
 	int len;
 	Channel_t *c;
 
-	notify_verbose_message(pvar, "SSH2_MSG_USERAUTH_SUCCESS was received.", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_USERAUTH_SUCCESS was received.");
 
 	// \x83p\x83X\x83\x8F\x81[\x83h\x82?j\x8A\xFC (2006.8.22 yutaka)
 	if (pvar->settings.remember_password == 0) {
@@ -6817,12 +6744,12 @@
 	finish_send_packet(pvar);
 	buffer_free(msg);
 
-	notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_OPEN was sent at handle_SSH2_userauth_success().", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_OPEN was sent at handle_SSH2_userauth_success().");
 
 	// \x83n\x81[\x83g\x83r\x81[\x83g\x81E\x83X\x83\x8C\x83b\x83h\x82?J\x8En (2004.12.11 yutaka)
 	start_ssh_heartbeat_thread(pvar);
 
-	notify_verbose_message(pvar, "User authentication is successful and SSH heartbeat thread is starting.", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "User authentication is successful and SSH heartbeat thread is starting.");
 
 	return TRUE;
 }
@@ -6834,9 +6761,8 @@
 	char *data;
 	char *cstring;
 	int partial;
-	char buf[1024];
 
-	notify_verbose_message(pvar, "SSH2_MSG_USERAUTH_FAILURE was received.", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_USERAUTH_FAILURE was received.");
 
 	// 6byte\x81i\x83T\x83C\x83Y\x81{\x83p\x83f\x83B\x83\x93\x83O\x81{\x83^\x83C\x83v\x81j\x82\xF0\x8E\xE6\x82菜\x82\xA2\x82\xBD\x88?~\x82?y\x83C\x83\x8D\x81[\x83h
 	data = pvar->ssh_state.payload;
@@ -6876,8 +6802,7 @@
 			return FALSE;
 
 		pvar->ssh2_authlist = cstring; // \x95s\x97v\x82??\xC1\x82\xBD\x82\xE7\x83t\x83\x8A\x81[\x82\xB7\x82邱\x82\xC6
-		_snprintf_s(buf, sizeof(buf), _TRUNCATE, "method list from server: %s", cstring);
-		notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
+		logprintf(LOG_LEVEL_VERBOSE, "method list from server: %s", cstring);
 
 		if (pvar->ssh2_authmethod == SSH_AUTH_TIS &&
 		    pvar->ask4passwd &&
@@ -6949,7 +6874,7 @@
 static BOOL handle_SSH2_userauth_banner(PTInstVar pvar)
 {
 	//
-	notify_verbose_message(pvar, "SSH2_MSG_USERAUTH_BANNER was received.", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_USERAUTH_BANNER was received.");
 
 	return TRUE;
 }
@@ -6997,7 +6922,7 @@
 	char *name, *inst, *lang;
 	char lprompt[512];
 
-	notify_verbose_message(pvar, "SSH2_MSG_USERAUTH_INFO_REQUEST was received.", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_USERAUTH_INFO_REQUEST was received.");
 
 	// 6byte\x81i\x83T\x83C\x83Y\x81{\x83p\x83f\x83B\x83\x93\x83O\x81{\x83^\x83C\x83v\x81j\x82\xF0\x8E\xE6\x82菜\x82\xA2\x82\xBD\x88?~\x82?y\x83C\x83\x8D\x81[\x83h
 	data = pvar->ssh_state.payload;
@@ -7080,7 +7005,7 @@
 	finish_send_packet(pvar);
 	buffer_free(msg);
 
-	notify_verbose_message(pvar, "SSH2_MSG_USERAUTH_INFO_RESPONSE was sent at handle_SSH2_userauth_inforeq().", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_USERAUTH_INFO_RESPONSE was sent at handle_SSH2_userauth_inforeq().");
 	return TRUE;
 }
 
@@ -7099,7 +7024,7 @@
 		unsigned char *signedmsg;
 		int signedlen;
 
-		notify_verbose_message(pvar, "SSH2_MSG_USERAUTH_PK_OK was received.", LOG_LEVEL_VERBOSE);
+		logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_USERAUTH_PK_OK was received.");
 
 		username = pvar->auth_state.user;  // \x83\x86\x81[\x83U\x96\xBC
 
@@ -7183,7 +7108,7 @@
 		finish_send_packet(pvar);
 		buffer_free(msg);
 
-		notify_verbose_message(pvar, "SSH2_MSG_USERAUTH_REQUEST was sent at handle_SSH2_userauth_inforeq().", LOG_LEVEL_VERBOSE);
+		logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_USERAUTH_REQUEST was sent at handle_SSH2_userauth_inforeq().");
 
 		pvar->pageant_keyfinal = TRUE;
 
@@ -7307,10 +7232,9 @@
 	unsigned char *outmsg;
 	char *connect_id = "ssh-connection";
 	char *info, *lang;
-	char buf[128];
 	struct change_password cp;
 
-	notify_verbose_message(pvar, "SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ was received.", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ was received.");
 
 	memset(&cp, 0, sizeof(cp));
 	cp.pvar = pvar;
@@ -7332,8 +7256,7 @@
 
 	info = buffer_get_string(&data, NULL);
 	lang = buffer_get_string(&data, NULL);
-	_snprintf_s(buf, sizeof(buf), _TRUNCATE, "%s: info %s lang %s\n", __FUNCTION__, info, lang);
-	notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
+	logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": info %s lang %s\n", info, lang);
 	free(info);
 	free(lang);
 
@@ -7487,7 +7410,7 @@
 	buffer_free(msg);
 	buffer_free(ttymsg);
 
-	notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_REQUEST was sent at send_pty_request().", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_REQUEST was sent at send_pty_request().");
 	logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH2_MSG_CHANNEL_REQUEST. "
 	          "local: %d, remote: %d, request-type: %s, "
 	          "term: %s, cols: %d, rows: %d, x: %d, y: %d, "
@@ -7519,7 +7442,7 @@
 	int want_reply = 1; // true
 #endif
 
-	notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_OPEN_CONFIRMATION was received.", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_OPEN_CONFIRMATION was received.");
 
 	// 6byte\x81i\x83T\x83C\x83Y\x81{\x83p\x83f\x83B\x83\x93\x83O\x81{\x83^\x83C\x83v\x81j\x82\xF0\x8E\xE6\x82菜\x82\xA2\x82\xBD\x88?~\x82?y\x83C\x83\x8D\x81[\x83h
 	data = pvar->ssh_state.payload;
@@ -7632,7 +7555,7 @@
 	char tmpbuf[256];
 	char *rmsg;
 
-	notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_OPEN_FAILURE was received.", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_OPEN_FAILURE was received.");
 
 	// 6byte\x81i\x83T\x83C\x83Y\x81{\x83p\x83f\x83B\x83\x93\x83O\x81{\x83^\x83C\x83v\x81j\x82\xF0\x8E\xE6\x82菜\x82\xA2\x82\xBD\x88?~\x82?y\x83C\x83\x8D\x81[\x83h
 	data = pvar->ssh_state.payload;
@@ -7696,7 +7619,7 @@
 	unsigned char *outmsg;
 	int type;
 
-	notify_verbose_message(pvar, "SSH2_MSG_GLOBAL_REQUEST was received.", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_GLOBAL_REQUEST was received.");
 
 	// SSH2 packet format:
 	// [size(4) + padding size(1) + type(1)] + [payload(N) + padding(X)]
@@ -7748,7 +7671,7 @@
 static BOOL handle_SSH2_request_success(PTInstVar pvar)
 {	
 	// \x95K\x97v\x82ł\xA0\x82\xEA\x82?\x8D\x83O\x82\xF0\x8E\xE6\x82\xE9\x81B\x93\xC1\x82?\xBD\x82\xE0\x82\xB5\x82?\xAD\x82Ă\xE0\x82悢\x81B
-	notify_verbose_message(pvar, "SSH2_MSG_REQUEST_SUCCESS was received.", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_REQUEST_SUCCESS was received.");
 
 	client_global_request_reply(pvar, SSH2_MSG_REQUEST_SUCCESS, 0, NULL);
 
@@ -7759,7 +7682,7 @@
 static BOOL handle_SSH2_request_failure(PTInstVar pvar)
 {	
 	// \x95K\x97v\x82ł\xA0\x82\xEA\x82?\x8D\x83O\x82\xF0\x8E\xE6\x82\xE9\x81B\x93\xC1\x82?\xBD\x82\xE0\x82\xB5\x82?\xAD\x82Ă\xE0\x82悢\x81B
-	notify_verbose_message(pvar, "SSH2_MSG_REQUEST_FAILURE was received.", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_REQUEST_FAILURE was received.");
 
 	client_global_request_reply(pvar, SSH2_MSG_REQUEST_FAILURE, 0, NULL);
 
@@ -7774,12 +7697,10 @@
 #else
 	int want_reply = 1; // true
 #endif
-	char buf[128];
 
-	_snprintf_s(buf, sizeof(buf), _TRUNCATE,
-	            "SSH2_MSG_CHANNEL_SUCCESS was received(nego_status %d).",
-	            pvar->session_nego_status);
-	notify_verbose_message(pvar, buf, LOG_LEVEL_VERBOSE);
+	logprintf(LOG_LEVEL_VERBOSE,
+		"SSH2_MSG_CHANNEL_SUCCESS was received(nego_status %d).",
+		pvar->session_nego_status);
 
 	if (pvar->session_nego_status == 1) {
 		// find channel by shell id(2005.2.27 yutaka)
@@ -7828,7 +7749,7 @@
 	data = pvar->ssh_state.payload;
 	channel_id = get_uint32_MSBfirst(data);
 
-	notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_FAILURE was received.", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_FAILURE was received.");
 
 	c = ssh2_channel_lookup(channel_id);
 	if (c == NULL) {
@@ -7849,9 +7770,7 @@
 			if (pvar->session_nego_status == 1) {
 				// \x83\x8A\x83\x82\x81[\x83g\x82\xC5 auth-agent-req ＠ openssh.com \x82\xAA\x83T\x83|\x81[\x83g\x82\xB3\x82\xEA\x82Ă?\xA2\x82?\xC5
 				// \x83G\x83\x89\x81[\x82?C\x82?\xB9\x82\xB8\x8E\x9F\x82?i\x82\xDE
-				notify_verbose_message(pvar,
-					"auth-agent-req ＠ openssh.com is not supported by remote host.",
-					LOG_LEVEL_VERBOSE);
+				logputs(LOG_LEVEL_VERBOSE, "auth-agent-req ＠ openssh.com is not supported by remote host.");
 
 				return send_pty_request(pvar, c);
 			}
@@ -7894,7 +7813,7 @@
 		finish_send_packet(pvar);
 		buffer_free(msg);
 
-		notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_WINDOW_ADJUST was sent at do_SSH2_adjust_window_size().", LOG_LEVEL_SSHDUMP);
+		logputs(LOG_LEVEL_SSHDUMP, "SSH2_MSG_CHANNEL_WINDOW_ADJUST was sent at do_SSH2_adjust_window_size().");
 		// \x83N\x83\x89\x83C\x83A\x83\x93\x83g\x82\xCCwindow size\x82??
 		c->local_window = c->local_window_max;
 	}
@@ -7908,7 +7827,6 @@
 		buffer_t *msg;
 		unsigned char *outmsg;
 		int len;
-		char log[128];
 
 		// \x82\xB1\x82\xCCchannel\x82??\xA2\x82\xC4close\x82?M\x8Dς??瑗\x82\xE7\x82?\xA2
 		if (c->state & SSH_CHANNEL_STATE_CLOSE_SENT) {
@@ -7931,8 +7849,7 @@
 
 		c->state |= SSH_CHANNEL_STATE_CLOSE_SENT;
 
-		_snprintf_s(log, sizeof(log), _TRUNCATE, "SSH2_MSG_CHANNEL_CLOSE was sent at ssh2_channel_send_close(). local:%d remote:%d", c->self_id, c->remote_id);
-		notify_verbose_message(pvar, log, LOG_LEVEL_VERBOSE);
+		logprintf(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_CLOSE was sent at ssh2_channel_send_close(). local:%d remote:%d", c->self_id, c->remote_id);
 	}
 }
 
@@ -8580,7 +8497,6 @@
 	int id;
 	unsigned int str_len;
 	Channel_t *c;
-	char log[128];
 
 	// 6byte\x81i\x83T\x83C\x83Y\x81{\x83p\x83f\x83B\x83\x93\x83O\x81{\x83^\x83C\x83v\x81j\x82\xF0\x8E\xE6\x82菜\x82\xA2\x82\xBD\x88?~\x82?y\x83C\x83\x8D\x81[\x83h
 	data = pvar->ssh_state.payload;
@@ -8599,8 +8515,7 @@
 		return FALSE;
 	}
 
-	_snprintf_s(log, sizeof(log), _TRUNCATE, "SSH2_MSG_CHANNEL_DATA was received. local:%d remote:%d", c->self_id, c->remote_id);
-	notify_verbose_message(pvar, log, LOG_LEVEL_SSHDUMP);
+	logprintf(LOG_LEVEL_SSHDUMP, "SSH2_MSG_CHANNEL_DATA was received. local:%d remote:%d", c->self_id, c->remote_id);
 
 	// string length
 	str_len = get_uint32_MSBfirst(data);
@@ -8666,7 +8581,7 @@
 	Channel_t *c;
 	int data_type;
 
-	notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_EXTENDED_DATA was received.", LOG_LEVEL_SSHDUMP);
+	logputs(LOG_LEVEL_SSHDUMP, "SSH2_MSG_CHANNEL_EXTENDED_DATA was received.");
 
 	// 6byte\x81i\x83T\x83C\x83Y\x81{\x83p\x83f\x83B\x83\x93\x83O\x81{\x83^\x83C\x83v\x81j\x82\xF0\x8E\xE6\x82菜\x82\xA2\x82\xBD\x88?~\x82?y\x83C\x83\x8D\x81[\x83h
 	data = pvar->ssh_state.payload;
@@ -8740,7 +8655,6 @@
 	char *data;
 	int id;
 	Channel_t *c;
-	char log[128];
 
 	// \x90?f\x8E\x9E\x82?T\x81[\x83o\x82\xAA SSH2_MSG_CHANNEL_EOF \x82?\xC1\x82Ă\xAD\x82\xE9\x82?ŁA\x83`\x83\x83\x83l\x83\x8B\x82\xF0\x89\xF0\x95\xFA\x82\xB7\x82\xE9\x81B(2005.6.19 yutaka)
 
@@ -8759,8 +8673,7 @@
 		return FALSE;
 	}
 
-	_snprintf_s(log, sizeof(log), _TRUNCATE, "SSH2_MSG_CHANNEL_EOF was received. local:%d remote:%d", c->self_id, c->remote_id);
-	notify_verbose_message(pvar, log, LOG_LEVEL_VERBOSE);
+	logprintf(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_EOF was received. local:%d remote:%d", c->self_id, c->remote_id);
 
 	if (c->type == TYPE_PORTFWD) {
 		FWD_channel_input_eof(pvar, c->local_num);
@@ -8789,7 +8702,7 @@
 	buffer_t *msg;
 	unsigned char *outmsg;
 
-	notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_OPEN was received.", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_OPEN was received.");
 
 	// 6byte\x81i\x83T\x83C\x83Y\x81{\x83p\x83f\x83B\x83\x93\x83O\x81{\x83^\x83C\x83v\x81j\x82\xF0\x8E\xE6\x82菜\x82\xA2\x82\xBD\x88?~\x82?y\x83C\x83\x8D\x81[\x83h
 	data = pvar->ssh_state.payload;
@@ -8905,7 +8818,7 @@
 			finish_send_packet(pvar);
 			buffer_free(msg);
 
-			notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_OPEN_FAILURE was sent at handle_SSH2_channel_open().", LOG_LEVEL_VERBOSE);
+			logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_OPEN_FAILURE was sent at handle_SSH2_channel_open().");
 		}
 
 	} else {
@@ -8925,7 +8838,6 @@
 	char *data;
 	int id;
 	Channel_t *c;
-	char log[128];
 
 	// \x83R\x83l\x83N\x83V\x83\x87\x83\x93\x90?f\x8E\x9E\x82?A\x83p\x83P\x83b\x83g\x83_\x83\x93\x83v\x82\xF0\x83t\x83@\x83C\x83\x8B\x82?|\x82\xAB\x8Fo\x82\xB7\x81B
 	if (LOG_LEVEL_SSHDUMP <= pvar->session_settings.LogLevel) {
@@ -8946,8 +8858,7 @@
 		return FALSE;
 	}
 
-	_snprintf_s(log, sizeof(log), _TRUNCATE, "SSH2_MSG_CHANNEL_CLOSE was received. local:%d remote:%d", c->self_id, c->remote_id);
-	notify_verbose_message(pvar, log, LOG_LEVEL_VERBOSE);
+	logprintf(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_CLOSE was received. local:%d remote:%d", c->self_id, c->remote_id);
 
 	if (c->type == TYPE_SHELL || c->type == TYPE_SUBSYSTEM_GEN) {
 		ssh2_channel_send_close(pvar, c);
@@ -8980,7 +8891,6 @@
 	return TRUE;
 }
 
-
 static BOOL handle_SSH2_channel_request(PTInstVar pvar)
 {
 	int len;
@@ -8993,7 +8903,6 @@
 	char *emsg = "exit-status";
 	int estat = 0;
 	Channel_t *c;
-	char log[128];
 
 	// 6byte\x81i\x83T\x83C\x83Y\x81{\x83p\x83f\x83B\x83\x93\x83O\x81{\x83^\x83C\x83v\x81j\x82\xF0\x8E\xE6\x82菜\x82\xA2\x82\xBD\x88?~\x82?y\x83C\x83\x8D\x81[\x83h
 	data = pvar->ssh_state.payload;
@@ -9019,8 +8928,7 @@
 	reply = data[0];
 	data += 1;
 
-	_snprintf_s(log, sizeof(log), _TRUNCATE, "SSH2_MSG_CHANNEL_REQUEST was received. local:%d remote:%d %s reply:%d", c->self_id, c->remote_id, str, reply);
-	notify_verbose_message(pvar, log, LOG_LEVEL_VERBOSE);
+	logprintf(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_REQUEST was received. local:%d remote:%d %s reply:%d", c->self_id, c->remote_id, str, reply);
 
 	// \x8FI\x97\xB9\x83R\x81[\x83h\x82\xAA\x8A??\xEA\x82Ă\xA2\x82\xE9\x82?\xE7\x82\xCE
 	if (memcmp(str, emsg, strlen(emsg)) == 0) {
@@ -9054,9 +8962,9 @@
 		buffer_free(msg);
 
 		if (success) {
-			notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_SUCCESS was sent at handle_SSH2_channel_request().", LOG_LEVEL_VERBOSE);
+			logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_SUCCESS was sent at handle_SSH2_channel_request().");
 		} else {
-			notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_FAILURE was sent at handle_SSH2_channel_request().", LOG_LEVEL_VERBOSE);
+			logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_FAILURE was sent at handle_SSH2_channel_request().");
 		}
 	}
 
@@ -9072,7 +8980,7 @@
 	unsigned int adjust;
 	Channel_t *c;
 
-	notify_verbose_message(pvar, "SSH2_MSG_CHANNEL_WINDOW_ADJUST was received.", LOG_LEVEL_SSHDUMP);
+	logputs(LOG_LEVEL_SSHDUMP, "SSH2_MSG_CHANNEL_WINDOW_ADJUST was received.");
 
 	// 6byte\x81i\x83T\x83C\x83Y\x81{\x83p\x83f\x83B\x83\x93\x83O\x81{\x83^\x83C\x83v\x81j\x82\xF0\x8E\xE6\x82菜\x82\xA2\x82\xBD\x88?~\x82?y\x83C\x83\x8D\x81[\x83h
 	data = pvar->ssh_state.payload;

Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c	2017-06-19 12:50:21 UTC (rev 6808)
+++ trunk/ttssh2/ttxssh/ttxssh.c	2017-06-19 12:50:42 UTC (rev 6809)
@@ -846,8 +846,7 @@
 		SetCustomNotifyIcon(SecureNotifyIcon);
 	}
 
-	notify_verbose_message(pvar, "Entering secure mode",
-	                       LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "Entering secure mode");
 }
 
 void notify_closed_connection(PTInstVar pvar, char *send_msg)
@@ -893,7 +892,7 @@
 		}
 	}
 	if (msg[0] != 0) {
-		notify_verbose_message(pvar, msg, LOG_LEVEL_ERROR);
+		logputs(LOG_LEVEL_ERROR, msg);
 		add_err_msg(pvar, msg);
 	}
 }
@@ -901,7 +900,7 @@
 void notify_fatal_error(PTInstVar pvar, char *msg, BOOL send_disconnect)
 {
 	if (msg[0] != 0) {
-		notify_verbose_message(pvar, msg, LOG_LEVEL_FATAL);
+		logputs(LOG_LEVEL_FATAL, msg);
 		add_err_msg(pvar, msg);
 	}
 
@@ -920,7 +919,7 @@
 	}
 }
 
-void notify_verbose_message(PTInstVar pvar, char *msg, int level)
+void logputs(int level, char *msg)
 {
 	if (level <= pvar->session_settings.LogLevel) {
 		char buf[1024];
@@ -956,7 +955,7 @@
 		vsnprintf_s(buff, sizeof(buff), _TRUNCATE, fmt, params);
 		va_end(params);
 
-		notify_verbose_message(pvar, buff, level);
+		logputs(level, buff);
 	}
 }
 
@@ -1014,7 +1013,7 @@
 		vsnprintf_s(buff, sizeof(buff), _TRUNCATE, fmt, params);
 		va_end(params);
 
-		notify_verbose_message(pvar, buff, level);
+		logputs(level, buff);
 
 		addr = 0;
 		byte_cnt = 0;
@@ -1026,7 +1025,7 @@
 
 			if (byte_cnt == 16) {
 				format_line_hexdump(buff, sizeof(buff), addr, bytes, byte_cnt);
-				notify_verbose_message(pvar, buff, level);
+				logputs(level, buff);
 
 				addr += 16;
 				byte_cnt = 0;
@@ -1036,7 +1035,7 @@
 
 		if (byte_cnt > 0) {
 			format_line_hexdump(buff, sizeof(buff), addr, bytes, byte_cnt);
-			notify_verbose_message(pvar, buff, level);
+			logputs(level, buff);
 		}
 	}
 }
@@ -1050,8 +1049,8 @@
 
 		pvar->session_settings = pvar->settings;
 
-		notify_verbose_message(pvar, "---------------------------------------------------------------------", LOG_LEVEL_VERBOSE);
-		notify_verbose_message(pvar, "Initiating SSH session", LOG_LEVEL_VERBOSE);
+		logputs(LOG_LEVEL_VERBOSE, "---------------------------------------------------------------------");
+		logputs(LOG_LEVEL_VERBOSE, "Initiating SSH session");
 
 		FWDUI_load_settings(pvar);
 
@@ -1091,8 +1090,7 @@
 	if (pvar->session_settings.Enabled) {
 		pvar->socket = INVALID_SOCKET;
 
-		notify_verbose_message(pvar, "Terminating SSH session...",
-		                       LOG_LEVEL_VERBOSE);
+		logputs(LOG_LEVEL_VERBOSE, "Terminating SSH session...");
 
 		*hooks->Precv = pvar->Precv;
 		*hooks->Psend = pvar->Psend;
@@ -1656,7 +1654,7 @@
 	(pvar->ReadIniFile) (fileName, ts);
 	read_ssh_options(pvar, fileName);
 	pvar->settings = *pvar->ts_SSH;
-	notify_verbose_message(pvar, "Reading INI file", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "Reading INI file");
 	FWDUI_load_settings(pvar);
 }
 
@@ -1665,7 +1663,7 @@
 	(pvar->WriteIniFile) (fileName, ts);
 	*pvar->ts_SSH = pvar->settings;
 	clear_local_settings(pvar);
-	notify_verbose_message(pvar, "Writing INI file", LOG_LEVEL_VERBOSE);
+	logputs(LOG_LEVEL_VERBOSE, "Writing INI file");
 	write_ssh_options(pvar, fileName, pvar->ts_SSH, TRUE);
 }
 

Modified: trunk/ttssh2/ttxssh/ttxssh.h
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.h	2017-06-19 12:50:21 UTC (rev 6808)
+++ trunk/ttssh2/ttxssh/ttxssh.h	2017-06-19 12:50:42 UTC (rev 6809)
@@ -342,7 +342,7 @@
 void notify_closed_connection(PTInstVar pvar, char *send_msg);
 void notify_nonfatal_error(PTInstVar pvar, char *msg);
 void notify_fatal_error(PTInstVar pvar, char *msg, BOOL send_disconnect);
-void notify_verbose_message(PTInstVar pvar, char *msg, int level);
+void logputs(int level, char *msg);
 void logprintf(int level, char *fmt, ...);
 void logprintf_hexdump(int level, char *data, int len, char *fmt, ...);
 

From svnnotify ＠ sourceforge.jp  Mon Jun 19 21:51:04 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 19 Jun 2017 21:51:04 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY4MTBdICDlkIzjgZjkuovmn4Tjgavlr74=?=
 =?utf-8?b?44GZ44KL44Ot44Kw44GMMuihjOWHuuOBpuOBhOOBn+OBruOCkuS/ruatow==?=
 =?utf-8?b?44CC?=
Message-ID: <1497876664.377845.99620.nullmailer@users.sourceforge.jp>

Revision: 6810
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6810
Author:   doda
Date:     2017-06-19 21:51:04 +0900 (Mon, 19 Jun 2017)
Log Message:
-----------
同じ事柄に対するログが2行出ていたのを修正。

古いログ出力を消し忘れてた orz

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/ssh.c

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2017-06-19 12:50:42 UTC (rev 6809)
+++ trunk/ttssh2/ttxssh/ssh.c	2017-06-19 12:51:04 UTC (rev 6810)
@@ -7410,7 +7410,6 @@
 	buffer_free(msg);
 	buffer_free(ttymsg);
 
-	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_REQUEST was sent at send_pty_request().");
 	logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH2_MSG_CHANNEL_REQUEST. "
 	          "local: %d, remote: %d, request-type: %s, "
 	          "term: %s, cols: %d, rows: %d, x: %d, y: %d, "

From svnnotify ＠ sourceforge.jp  Mon Jun 19 21:51:25 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 19 Jun 2017 21:51:25 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B6811=5D__SSH2=5FMSG=5FCHANNEL=5FREQU?=
 =?utf-8?b?RVNUIOOBruWPluOCiuaJseOBhOOBvuOCj+OCiuOCkuS/ruatow==?=
Message-ID: <1497876685.656488.99843.nullmailer@users.sourceforge.jp>

Revision: 6811
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6811
Author:   doda
Date:     2017-06-19 21:51:25 +0900 (Mon, 19 Jun 2017)
Log Message:
-----------
SSH2_MSG_CHANNEL_REQUEST の取り扱いまわりを修正

・want_reply が 1 の時にログが文字化けするのを修正
・exit-status をログに記録
・keepalive ＠ openssh.com を受けた時に SSH2_MSG_CHANNEL_SUCCESS を返すようにした (意味無いけれど)

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/ssh.c

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2017-06-19 12:51:04 UTC (rev 6810)
+++ trunk/ttssh2/ttxssh/ssh.c	2017-06-19 12:51:25 UTC (rev 6811)
@@ -8895,12 +8895,9 @@
 	int len;
 	char *data;
 	int id;
-	int buflen;
-	char *str;
-	int reply;
+	char *request;
+	int want_reply;
 	int success = 0;
-	char *emsg = "exit-status";
-	int estat = 0;
 	Channel_t *c;
 
 	// 6byte\x81i\x83T\x83C\x83Y\x81{\x83p\x83f\x83B\x83\x93\x83O\x81{\x83^\x83C\x83v\x81j\x82\xF0\x8E\xE6\x82菜\x82\xA2\x82\xBD\x88?~\x82?y\x83C\x83\x8D\x81[\x83h
@@ -8908,9 +8905,7 @@
 	// \x83p\x83P\x83b\x83g\x83T\x83C\x83Y - (\x83p\x83f\x83B\x83\x93\x83O\x83T\x83C\x83Y+1)\x81G\x90^\x82?p\x83P\x83b\x83g\x83T\x83C\x83Y
 	len = pvar->ssh_state.payloadlen;
 
-	//debug_print(98, data, len);
-
-	// ID(4) + string(any) + reply(1) + exit status(4)
+	// ID(4) + string(any) + want_reply(1) + exit status(4)
 	id = get_uint32_MSBfirst(data);
 	data += 4;
 	c = ssh2_channel_lookup(id);
@@ -8919,23 +8914,33 @@
 		return FALSE;
 	}
 
-	buflen = get_uint32_MSBfirst(data);
-	data += 4;
-	str = data;
-	data += buflen;
+	request = buffer_get_string(&data, NULL);
 
-	reply = data[0];
+	want_reply = data[0];
 	data += 1;
 
-	logprintf(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_REQUEST was received. local:%d remote:%d %s reply:%d", c->self_id, c->remote_id, str, reply);
+	logprintf(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_REQUEST was received. "
+		"local:%d remote:%d request:%s want_reply:%d",
+		c->self_id, c->remote_id, request?request:"(null)", want_reply);
 
-	// \x8FI\x97\xB9\x83R\x81[\x83h\x82\xAA\x8A??\xEA\x82Ă\xA2\x82\xE9\x82?\xE7\x82\xCE
-	if (memcmp(str, emsg, strlen(emsg)) == 0) {
-		success = 1;
-		estat = get_uint32_MSBfirst(data);
+	if (request) {
+		if (strcmp(request, "exit-status") == 0) {
+			// \x8FI\x97\xB9\x83R\x81[\x83h\x82\xAA\x8A??\xEA\x82Ă\xA2\x82\xE9\x82?\xE7\x82\xCE
+			int estat = get_uint32_MSBfirst(data);
+			success = 1;
+			logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": exit-status=%d", estat);
+		}
+		else if (strcmp(request, "keepalive ＠ openssh.com") == 0) {
+			// OpenSSH client \x82ł\xCD success = 1 \x82?\xB5\x82Ă\xA2\x82?\xA2\x82\xAF\x82\xEA\x82?A
+			// server \x91\xA4\x82\xCD SUCCESS/FAILURE \x82?\xBF\x82\xE7\x82ł\xE0 OK \x82??\xC5
+			// \x82??\x82\xA6\x82\xB8 SUCCESS \x82\xF0\x95?\xB7\x81B
+			success = 1;
+		}
+
+		free(request);
 	}
 
-	if (reply) {
+	if (want_reply) {
 		buffer_t *msg;
 		unsigned char *outmsg;
 		int len;
@@ -8961,9 +8966,9 @@
 		buffer_free(msg);
 
 		if (success) {
-			logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_SUCCESS was sent at handle_SSH2_channel_request().");
+			logputs(LOG_LEVEL_VERBOSE, __FUNCTION__ ": SSH2_MSG_CHANNEL_SUCCESS was sent.");
 		} else {
-			logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_FAILURE was sent at handle_SSH2_channel_request().");
+			logputs(LOG_LEVEL_VERBOSE, __FUNCTION__ ": SSH2_MSG_CHANNEL_FAILURE was sent.");
 		}
 	}
 

From svnnotify ＠ sourceforge.jp  Mon Jun 19 21:51:45 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 19 Jun 2017 21:51:45 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY4MTJdICDjg7tidWZmZXJfZ2V0X3N0cmlu?=
 =?utf-8?b?ZyDjgYzov5TjgZfjgZ/poJjln5/jga4gZnJlZSDmvI/jgozjgpLkv67mraM=?=
Message-ID: <1497876705.411197.100171.nullmailer@users.sourceforge.jp>

Revision: 6812
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6812
Author:   doda
Date:     2017-06-19 21:51:45 +0900 (Mon, 19 Jun 2017)
Log Message:
-----------
・buffer_get_string が返した領域の free 漏れを修正
・buffer_get_string の戻り値のチェックの強化
・ログ出力強化

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/buffer.c
    trunk/ttssh2/ttxssh/ssh.c

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/buffer.c
===================================================================
--- trunk/ttssh2/ttxssh/buffer.c	2017-06-19 12:51:25 UTC (rev 6811)
+++ trunk/ttssh2/ttxssh/buffer.c	2017-06-19 12:51:45 UTC (rev 6812)
@@ -227,6 +227,7 @@
 
 	ptr = malloc(buflen + 1);
 	if (ptr == NULL) {
+		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": malloc failed.");
 		if (buflen_ptr != NULL)
 			*buflen_ptr = 0;
 		return NULL;

Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2017-06-19 12:51:25 UTC (rev 6811)
+++ trunk/ttssh2/ttxssh/ssh.c	2017-06-19 12:51:45 UTC (rev 6812)
@@ -78,6 +78,10 @@
 // channel data structure
 #define CHANNEL_MAX 100
 
+//
+// msg \x82\xAA NULL \x82ł?\xB3\x82\xA2\x8E\x96\x82???BNULL \x82??\x82\xCD "(null)" \x82\xF0\x95?\xB7\x81B
+//
+#define NonNull(msg) ((msg)?(msg):"(null)")
 
 static struct global_confirm global_confirms;
 
@@ -6333,13 +6337,16 @@
 
 static BOOL handle_SSH2_service_accept(PTInstVar pvar)
 {
-	char *data, *s;
+	char *data, *svc;
 
 	// 6byte\x81i\x83T\x83C\x83Y\x81{\x83p\x83f\x83B\x83\x93\x83O\x81{\x83^\x83C\x83v\x81j\x82\xF0\x8E\xE6\x82菜\x82\xA2\x82\xBD\x88?~\x82?y\x83C\x83\x8D\x81[\x83h
 	data = pvar->ssh_state.payload;
 
-	s = buffer_get_string(&data, NULL);
-	logprintf(LOG_LEVEL_VERBOSE, "SSH2_MSG_SERVICE_ACCEPT was received. service name=%s", s);
+	if ((svc = buffer_get_string(&data, NULL)) == NULL) {
+		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_get_string returns NULL.");
+	}
+	logprintf(LOG_LEVEL_VERBOSE, "SSH2_MSG_SERVICE_ACCEPT was received. service-name=%s", NonNull(svc));
+	free(svc);
 
 	SSH2_dispatch_init(5);
 	SSH2_dispatch_add_message(SSH2_MSG_IGNORE); // XXX: Tru64 UNIX workaround   (2005.3.5 yutaka)
@@ -6937,14 +6944,24 @@
 	inst = buffer_get_string(&data, NULL);
 	lang = buffer_get_string(&data, NULL);
 	lprompt[0] = 0;
-	if (strlen(inst) > 0) {
+	if (inst == NULL) {
+		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_get_string returns NULL. (inst)");
+	}
+	else if (strlen(inst) > 0) {
 		strncat_s(lprompt, sizeof(lprompt), inst, _TRUNCATE);
 		strncat_s(lprompt, sizeof(lprompt), "\r\n", _TRUNCATE);
 	}
-	if (strlen(lang) > 0) {
+	if (lang == NULL) {
+		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_get_string returns NULL. (lang)");
+	}
+	else if (strlen(lang) > 0) {
 		strncat_s(lprompt, sizeof(lprompt), lang, _TRUNCATE);
 		strncat_s(lprompt, sizeof(lprompt), "\r\n", _TRUNCATE);
 	}
+
+	logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": user=%s, inst=%s, lang=%s",
+		NonNull(name), NonNull(inst), NonNull(lang));
+
 	free(name);
 	free(inst);
 	free(lang);
@@ -7256,7 +7273,14 @@
 
 	info = buffer_get_string(&data, NULL);
 	lang = buffer_get_string(&data, NULL);
-	logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": info %s lang %s\n", info, lang);
+	if (info == NULL || lang == NULL) {
+		logprintf(LOG_LEVEL_ERROR,
+			__FUNCTION__ ": buffer_get_string returns NULL. info=%s, lang=%s",
+			NonNull(info), NonNull(lang));
+	}
+	else {
+		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": info=%s, lang=%s\n", info, lang);
+	}
 	free(info);
 	free(lang);
 
@@ -7587,10 +7611,13 @@
 
 	cstring = buffer_get_string(&data, NULL);
 
+	if (cstring == NULL) {
+		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_get_string returns NULL");
+	}
 	UTIL_get_lang_msg("MSG_SSH_CHANNEL_OPEN_ERROR", pvar,
 	                  "SSH2_MSG_CHANNEL_OPEN_FAILURE was received.\r\nchannel [%d]: reason: %s(%d) message: %s");
 	_snprintf_s(tmpbuf, sizeof(tmpbuf), _TRUNCATE, pvar->ts->UIMsg,
-	            id, rmsg, reason, cstring);
+	            id, rmsg, reason, NonNull(cstring));
 	notify_nonfatal_error(pvar, tmpbuf);
 
 	free(cstring);
@@ -7641,8 +7668,12 @@
 	data++;
 	len--;
 
-	// OpenSSH 6.8\x82ł?A\x83T\x81[\x83o\x82?z\x83X\x83g\x8C\xAE\x82\xAA\x8DX\x90V\x82\xB3\x82\xEA\x82\xE9\x82?A\x89\xBA\x8BL\x82??m\x82\xAA\x97\x88\x82\xE9\x81B
-	if (strcmp(rtype, "hostkeys-00 ＠ openssh.com") == 0) {
+	if (rtype == NULL) {
+		// rtype \x82\xAA NULL \x82Ŗ\xB3\x82\xA2\x8E\x96\x82??\xD8
+		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_get_string returns NULL.");
+	}
+	else if (strcmp(rtype, "hostkeys-00 ＠ openssh.com") == 0) {
+		// OpenSSH 6.8\x82ł?A\x83T\x81[\x83o\x82?z\x83X\x83g\x8C\xAE\x82\xAA\x8DX\x90V\x82\xB3\x82\xEA\x82\xE9\x82?A\x82\xB1\x82??m\x82\xAA\x97\x88\x82\xE9\x81B
 		// OpenSSH 6.8\x82?\xC0\x91\x95\x82ł?A\x8F\xED\x82?\xAC\x8C\xF7\x82ŕ?\xB7\x82悤\x82??\xC1\x82Ă\xA2\x82邽\x82?A
 		// \x82\xBB\x82\xEA\x82?\x87\x82?\x82\xC4 Tera Term \x82ł\xE0\x90\xAC\x8C\xF7\x82??\xB7\x82\xB1\x82??\xB7\x82\xE9\x81B
 		success = update_client_input_hostkeys(pvar, data, len);
@@ -8701,7 +8732,7 @@
 	buffer_t *msg;
 	unsigned char *outmsg;
 
-	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_OPEN was received.");
+	logputs(LOG_LEVEL_VERBOSE, __FUNCTION__ ": SSH2_MSG_CHANNEL_OPEN was received.");
 
 	// 6byte\x81i\x83T\x83C\x83Y\x81{\x83p\x83f\x83B\x83\x93\x83O\x81{\x83^\x83C\x83v\x81j\x82\xF0\x8E\xE6\x82菜\x82\xA2\x82\xBD\x88?~\x82?y\x83C\x83\x8D\x81[\x83h
 	data = pvar->ssh_state.payload;
@@ -8719,8 +8750,16 @@
 	remote_maxpacket = get_uint32_MSBfirst(data);
 	data += 4;
 
+	logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__
+		": type=%s, channel=%d, init_winsize=%d, max_packetsize:%d",
+		NonNull(ctype), remote_id, remote_window, remote_maxpacket);
+
 	// check Channel Type(string)
-	if (strcmp(ctype, "forwarded-tcpip") == 0) { // port-forwarding(remote to local)
+	if (ctype == NULL) {
+		// ctype \x82\xAA NULL \x82Ŗ\xB3\x82\xA2\x8E\x96\x82?????A\x90\xE6\x82?`\x83F\x83b\x83N\x82\xB7\x82\xE9
+		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_get_string returns NULL. (ctype)");
+	}
+	else if (strcmp(ctype, "forwarded-tcpip") == 0) { // port-forwarding(remote to local)
 		char *listen_addr, *orig_addr;
 		int listen_port, orig_port;
 
@@ -8732,29 +8771,37 @@
 		orig_port = get_uint32_MSBfirst(data);  // 32776
 		data += 4;
 
-		// searching request entry by listen_port & create_local_channel
-		FWD_open(pvar, remote_id, listen_addr, listen_port, orig_addr, orig_port,
-			&chan_num);
+		if (listen_addr && orig_addr) {
+			logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__
+				": %s: listen_addr=%s, listen_port=%d, orig_addr=%s, orig_port=%d",
+				ctype, listen_addr, listen_port, orig_addr, orig_port);
+			// searching request entry by listen_port & create_local_channel
+			FWD_open(pvar, remote_id, listen_addr, listen_port, orig_addr, orig_port, &chan_num);
 
+			// channel\x82\xF0\x83A\x83\x8D\x83P\x81[\x83g\x82\xB5\x81A\x95K\x97v\x82?\xEE\x95\xF1\x81iremote window size\x81j\x82\xF0\x82\xB1\x82\xB1\x82?\xE6\x82\xC1\x82Ă\xA8\x82\xAD\x81B
+			// changed window size from 128KB to 32KB. (2006.3.6 yutaka)
+			// changed window size from 32KB to 128KB. (2007.10.29 maya)
+			c = ssh2_channel_new(CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, TYPE_PORTFWD, chan_num);
+			if (c == NULL) {
+				// \x93]\x91\x97\x83`\x83\x83\x83l\x83\x8B\x93\xE0\x82?\xA0\x82\xE9\x83\\x83P\x83b\x83g\x82?\xF0\x95\xFA\x98R\x82\xEA\x82\xF0\x8FC\x90\xB3 (2007.7.26 maya)
+				FWD_free_channel(pvar, chan_num);
+				UTIL_get_lang_msg("MSG_SSH_NO_FREE_CHANNEL", pvar,
+				                  "Could not open new channel. TTSSH is already opening too many channels.");
+				notify_nonfatal_error(pvar, pvar->ts->UIMsg);
+				return FALSE;
+			}
+			c->remote_id = remote_id;
+			c->remote_window = remote_window;
+			c->remote_maxpacket = remote_maxpacket;
+		}
+		else {
+			logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": %s: buffer_get_string returns NULL. "
+				"linsten_addr=%s, orig_addr=%s",
+				ctype, NonNull(listen_addr), NonNull(orig_addr));
+		}
 		free(listen_addr);
 		free(orig_addr);
 
-		// channel\x82\xF0\x83A\x83\x8D\x83P\x81[\x83g\x82\xB5\x81A\x95K\x97v\x82?\xEE\x95\xF1\x81iremote window size\x81j\x82\xF0\x82\xB1\x82\xB1\x82?\xE6\x82\xC1\x82Ă\xA8\x82\xAD\x81B
-		// changed window size from 128KB to 32KB. (2006.3.6 yutaka)
-		// changed window size from 32KB to 128KB. (2007.10.29 maya)
-		c = ssh2_channel_new(CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, TYPE_PORTFWD, chan_num);
-		if (c == NULL) {
-			// \x93]\x91\x97\x83`\x83\x83\x83l\x83\x8B\x93\xE0\x82?\xA0\x82\xE9\x83\\x83P\x83b\x83g\x82?\xF0\x95\xFA\x98R\x82\xEA\x82\xF0\x8FC\x90\xB3 (2007.7.26 maya)
-			FWD_free_channel(pvar, chan_num);
-			UTIL_get_lang_msg("MSG_SSH_NO_FREE_CHANNEL", pvar,
-			                  "Could not open new channel. TTSSH is already opening too many channels.");
-			notify_nonfatal_error(pvar, pvar->ts->UIMsg);
-			return FALSE;
-		}
-		c->remote_id = remote_id;
-		c->remote_window = remote_window;
-		c->remote_maxpacket = remote_maxpacket;
-
 	} else if (strcmp(ctype, "x11") == 0) { // port-forwarding(X11)
 		// X application\x82\xF0\x83^\x81[\x83~\x83i\x83\x8B\x8F\xE3\x82?\xC0\x8Ds\x82\xB7\x82\xE9\x82?ASSH2_MSG_CHANNEL_OPEN \x82\xAA\x91\x97\x82\xE7\x82\xEA\x82Ă\xAD\x82\xE9\x81B
 		char *orig_str;
@@ -8763,6 +8810,10 @@
 		orig_str = buffer_get_string(&data, NULL);  // "127.0.0.1"
 		orig_port = get_uint32_MSBfirst(data);
 		data += 4;
+
+		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": %s: orig_addr=%s, orig_port=%d",
+			ctype, orig_str, orig_port);
+
 		free(orig_str);
 
 		// X server(port 6000)\x82??\xB1\x82\xB7\x82\xE9\x81B\x90?\xB1\x82?\xB8\x94s\x82\xB7\x82\xE9\x82\xC6Tera Term\x8E\xA9\x90g\x82\xAA\x90?f\x82\xB3\x82\xEA\x82\xE9\x81B
@@ -8817,12 +8868,11 @@
 			finish_send_packet(pvar);
 			buffer_free(msg);
 
-			logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_OPEN_FAILURE was sent at handle_SSH2_channel_open().");
+			logputs(LOG_LEVEL_VERBOSE, __FUNCTION__ ": SSH2_MSG_CHANNEL_OPEN_FAILURE was sent.");
 		}
 
 	} else {
 		// unknown type(unsupported)
-
 	}
 
 	free(ctype);
@@ -8900,6 +8950,8 @@
 	int success = 0;
 	Channel_t *c;
 
+	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_REQUEST was received.");
+
 	// 6byte\x81i\x83T\x83C\x83Y\x81{\x83p\x83f\x83B\x83\x93\x83O\x81{\x83^\x83C\x83v\x81j\x82\xF0\x8E\xE6\x82菜\x82\xA2\x82\xBD\x88?~\x82?y\x83C\x83\x8D\x81[\x83h
 	data = pvar->ssh_state.payload;
 	// \x83p\x83P\x83b\x83g\x83T\x83C\x83Y - (\x83p\x83f\x83B\x83\x93\x83O\x83T\x83C\x83Y+1)\x81G\x90^\x82?p\x83P\x83b\x83g\x83T\x83C\x83Y
@@ -8919,27 +8971,29 @@
 	want_reply = data[0];
 	data += 1;
 
-	logprintf(LOG_LEVEL_VERBOSE, "SSH2_MSG_CHANNEL_REQUEST was received. "
-		"local:%d remote:%d request:%s want_reply:%d",
-		c->self_id, c->remote_id, request?request:"(null)", want_reply);
+	logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__
+		": local=%d, remote=%d, request=%s, want_reply=%d",
+		c->self_id, c->remote_id, NonNull(request), want_reply);
 
-	if (request) {
-		if (strcmp(request, "exit-status") == 0) {
-			// \x8FI\x97\xB9\x83R\x81[\x83h\x82\xAA\x8A??\xEA\x82Ă\xA2\x82\xE9\x82?\xE7\x82\xCE
-			int estat = get_uint32_MSBfirst(data);
-			success = 1;
-			logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": exit-status=%d", estat);
-		}
-		else if (strcmp(request, "keepalive ＠ openssh.com") == 0) {
-			// OpenSSH client \x82ł\xCD success = 1 \x82?\xB5\x82Ă\xA2\x82?\xA2\x82\xAF\x82\xEA\x82?A
-			// server \x91\xA4\x82\xCD SUCCESS/FAILURE \x82?\xBF\x82\xE7\x82ł\xE0 OK \x82??\xC5
-			// \x82??\x82\xA6\x82\xB8 SUCCESS \x82\xF0\x95?\xB7\x81B
-			success = 1;
-		}
-
-		free(request);
+	if (request == NULL) {
+		// request \x82\xAA NULL \x82Ŗ\xB3\x82\xA2\x8E\x96\x82??\xD8
+		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_get_string returns NULL. (request)");
 	}
+	else if (strcmp(request, "exit-status") == 0) {
+		// \x8FI\x97\xB9\x83R\x81[\x83h\x82\xAA\x8A??\xEA\x82Ă\xA2\x82\xE9\x82?\xE7\x82\xCE
+		int estat = get_uint32_MSBfirst(data);
+		success = 1;
+		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": exit-status=%d", estat);
+	}
+	else if (strcmp(request, "keepalive ＠ openssh.com") == 0) {
+		// OpenSSH client \x82ł\xCD success = 1 \x82?\xB5\x82Ă\xA2\x82?\xA2\x82\xAF\x82\xEA\x82?A
+		// server \x91\xA4\x82\xCD SUCCESS/FAILURE \x82?\xBF\x82\xE7\x82ł\xE0 OK \x82??\xC5
+		// \x82??\x82\xA6\x82\xB8 SUCCESS \x82\xF0\x95?\xB7\x81B
+		success = 1;
+	}
 
+	free(request);
+
 	if (want_reply) {
 		buffer_t *msg;
 		unsigned char *outmsg;

From svnnotify ＠ sourceforge.jp  Wed Jun 21 19:08:55 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 21 Jun 2017 19:08:55 +0900
Subject: [Ttssh2-commit] =?utf-8?q?=5B6813=5D__session=5Fsettings=2ELogLev?=
 =?utf-8?b?ZWwg44KS5aSW44Gr6KaL44Gb44Gq44GE44KI44GG44Gr44GZ44KL54K644CB?=
 =?utf-8?b?TG9nTGV2ZWwgKCkgIOODnuOCr+ODree1jOeUseOBp+OCouOCr+OCu+OCuQ==?=
 =?utf-8?b?44GZ44KL44KI44GG44Gr44GX44Gf44CC?=
Message-ID: <1498039735.962698.53014.nullmailer@users.sourceforge.jp>

Revision: 6813
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6813
Author:   doda
Date:     2017-06-21 19:08:55 +0900 (Wed, 21 Jun 2017)
Log Message:
-----------
session_settings.LogLevel を外に見せないようにする為、LogLevel() マクロ経由でアクセスするようにした。

本当は pvar を渡す必要も無くしたい……

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/ssh.c
    trunk/ttssh2/ttxssh/ttxssh.h

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2017-06-19 12:51:45 UTC (rev 6812)
+++ trunk/ttssh2/ttxssh/ssh.c	2017-06-21 10:08:55 UTC (rev 6813)
@@ -2955,7 +2955,7 @@
 void SSH_send(PTInstVar pvar, unsigned char const *buf, unsigned int buflen)
 {
 	// RAW\x83p\x83P\x83b\x83g\x83_\x83\x93\x83v\x82\xF0\x92?\xC1 (2008.8.15 yutaka)
-	if (LOG_LEVEL_SSHDUMP <= pvar->session_settings.LogLevel) {
+	if (LogLevel(pvar, LOG_LEVEL_SSHDUMP)) {
 		init_memdump();
 		push_memdump("SSH sending packet", "SSH_send", (char *)buf, buflen);
 	}
@@ -6246,7 +6246,7 @@
 	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_NEWKEYS was received(DH key generation is completed).");
 
 	// \x83\x8D\x83O\x8D?\xE6\x82?I\x97\xB9 (2005.3.7 yutaka)
-	if (LOG_LEVEL_SSHDUMP <= pvar->session_settings.LogLevel) {
+	if (LogLevel(pvar, LOG_LEVEL_SSHDUMP)) {
 		save_memdump(LOGDUMP);
 	}
 	finish_memdump();
@@ -8552,7 +8552,7 @@
 	data += 4;
 
 	// RAW\x83p\x83P\x83b\x83g\x83_\x83\x93\x83v\x82\xF0\x92?\xC1 (2008.8.15 yutaka)
-	if (LOG_LEVEL_SSHDUMP <= pvar->session_settings.LogLevel) {
+	if (LogLevel(pvar, LOG_LEVEL_SSHDUMP)) {
 		init_memdump();
 		push_memdump("SSH receiving packet", "PKT_recv", (char *)data, str_len);
 	}

Modified: trunk/ttssh2/ttxssh/ttxssh.h
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.h	2017-06-19 12:51:45 UTC (rev 6812)
+++ trunk/ttssh2/ttxssh/ttxssh.h	2017-06-21 10:08:55 UTC (rev 6813)
@@ -338,6 +338,8 @@
 #define SSHv1(pvar) ((pvar)->protocol_major == 1)
 #define SSHv2(pvar) ((pvar)->protocol_major == 2)
 
+#define LogLevel(pvar, level) ((pvar)->session_settings.LogLevel >= (level))
+
 void notify_established_secure_connection(PTInstVar pvar);
 void notify_closed_connection(PTInstVar pvar, char *send_msg);
 void notify_nonfatal_error(PTInstVar pvar, char *msg);

From svnnotify ＠ sourceforge.jp  Wed Jun 21 19:09:12 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 21 Jun 2017 19:09:12 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY4MTRdICDjg53jg7zjg4jou6LpgIHoqK0=?=
 =?utf-8?b?5a6a6Zai6YCj44Gu44OH44OQ44OD44Kw55So44Ot44Kw5Ye65Yqb44KS6L+9?=
 =?utf-8?b?5Yqg44CC?=
Message-ID: <1498039752.771752.53406.nullmailer@users.sourceforge.jp>

Revision: 6814
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6814
Author:   doda
Date:     2017-06-21 19:09:12 +0900 (Wed, 21 Jun 2017)
Log Message:
-----------
ポート転送設定関連のデバッグ用ログ出力を追加。

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/fwd.c

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/fwd.c
===================================================================
--- trunk/ttssh2/ttxssh/fwd.c	2017-06-21 10:08:55 UTC (rev 6813)
+++ trunk/ttssh2/ttxssh/fwd.c	2017-06-21 10:09:12 UTC (rev 6814)
@@ -1137,6 +1137,45 @@
 		ptr_to_saved_sockets[i].num_listening_sockets = 0;
 	}
 
+	//
+	// \x91\xBC\x82\xCC LOG_LEVEL_VERBOSE \x82?o\x97?\xB5\x82Ă\xA2\x82?\x83O\x82?\xE4\x82?āA
+	// \x82\xB3\x82\xE7\x82?\x82\x82\xA2\x83\x8D\x83O\x83\x8C\x83x\x83\x8B\x82?o\x97?\xB5\x82\xBD\x82\xA2\x82??b\x92\xE8\x82\xC5 150 \x82?\xB7\x82\xE9\x81B
+	// \x91\xBC\x82?\xE0\x8A??\xC4 LOG_LEVEL \x82?\x9D\x82\xB5\x82\xBD\x82\xA2\x81c\x81c
+	//
+	if (LogLevel(pvar, 150)) {
+		logprintf(150, __FUNCTION__ ": old specs: %d", pvar->fwd_state.num_requests);
+		for (i=0; i < pvar->fwd_state.num_requests; i++) {
+			FWDRequestSpec *spec = &pvar->fwd_state.requests[i].spec;
+			char *ftype, *bind_addr = spec->bind_address;
+			switch (spec->type) {
+			  case FWD_LOCAL_TO_REMOTE: ftype = "LtoR"; break;
+			  case FWD_REMOTE_TO_LOCAL: ftype = "RtoL"; break;
+			  case FWD_REMOTE_X11_TO_LOCAL: ftype = "X11"; bind_addr = ftype; break;
+			  default: ftype = "Unknown"; break;
+			}
+			logprintf(150, "  request %d: type=%s, bind_address=%s, "
+				"from_port=%d, to_host=%s, to_port=%d, %s",
+				i, ftype, bind_addr, spec->from_port,
+				spec->to_host, spec->to_port,
+				(pvar->fwd_state.requests[i].status&FWD_DELETED)?"deleted, ":"");
+		}
+		logprintf(150, __FUNCTION__ ": listening specs: %d", pvar->fwd_state.num_server_listening_specs);
+		for (i=0; i < pvar->fwd_state.num_server_listening_specs; i++) {
+			FWDRequestSpec *listener = &pvar->fwd_state.server_listening_specs[i];
+			char *ftype, *bind_addr = listener->bind_address;
+			switch (listener->type) {
+			  case FWD_LOCAL_TO_REMOTE: ftype = "LtoR"; break;
+			  case FWD_REMOTE_TO_LOCAL: ftype = "RtoL"; break;
+			  case FWD_REMOTE_X11_TO_LOCAL: ftype = "X11";  bind_addr = ftype; break;
+			  default: ftype = "Unknown"; break;
+			}
+			logprintf(150, "  listen %d: type=%s, bind_address=%s, "
+				"from_port=%d, to_host=%s, to_port=%d, %s",
+				i, ftype, bind_addr, listener->from_port,
+				listener->to_host, listener->to_port, "");
+		}
+	}
+
 	for (i = pvar->fwd_state.num_requests - 1; i >= 0; i--) {
 		if ((pvar->fwd_state.requests[i].status & FWD_DELETED) == 0) {
 			FWDRequestSpec *cur_spec =

From svnnotify ＠ sourceforge.jp  Wed Jun 21 19:09:29 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Wed, 21 Jun 2017 19:09:29 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY4MTVdICDjg63jgrDlh7rlipvjgpLov70=?=
 =?utf-8?b?5YqgICgg44Od44O844OI6Lui6YCB6KaB5rGC6Zai6YCjICk=?=
Message-ID: <1498039769.981172.53587.nullmailer@users.sourceforge.jp>

Revision: 6815
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6815
Author:   doda
Date:     2017-06-21 19:09:29 +0900 (Wed, 21 Jun 2017)
Log Message:
-----------
ログ出力を追加 (ポート転送要求関連)

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/ssh.c

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2017-06-21 10:09:12 UTC (rev 6814)
+++ trunk/ttssh2/ttxssh/ssh.c	2017-06-21 10:09:29 UTC (rev 6815)
@@ -3501,6 +3501,7 @@
 	msg = buffer_init();
 	if (msg == NULL) {
 		// TODO: error check
+		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL");
 		return;
 	}
 	buffer_put_int(msg, c->remote_id);  // remote ID
@@ -3541,9 +3542,12 @@
 	if (SSHv1(pvar)) {
 		int host_len = strlen(to_local_host);
 		unsigned char *outmsg =
-			begin_send_packet(pvar, SSH_CMSG_PORT_FORWARD_REQUEST,
-			                  12 + host_len);
+			begin_send_packet(pvar, SSH_CMSG_PORT_FORWARD_REQUEST, 12 + host_len);
 
+		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": Forwarding request (SSH1 RtoL): "
+			"remote_port=%d, to_host=%s, to_port=%d",
+			from_server_port, to_local_host, to_local_port);
+
 		set_uint32(outmsg, from_server_port);
 		set_uint32(outmsg + 4, host_len);
 		memcpy(outmsg + 8, to_local_host, host_len);
@@ -3552,20 +3556,29 @@
 
 		enque_forwarding_request_handlers(pvar);
 
+		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH_CMSG_PORT_FORWARD_REQUEST."
+			"remote_port=%d, to_host=%s, to_port=%d",
+			from_server_port, to_local_host, to_local_port);
+
 	} else {
 		// SSH2 port-forwading remote to local (2005.6.21 yutaka)
 		buffer_t *msg;
-		char *s;
+		char *req;
 		unsigned char *outmsg;
 		int len;
 
+		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": Forwarding request (SSH2 RtoL): "
+			"bind_addr=%s, remote_port=%d, to_host=%s, to_port=%d",
+			bind_address, from_server_port, to_local_host, to_local_port);
+
 		msg = buffer_init();
 		if (msg == NULL) {
 			// TODO: error check
+			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL");
 			return;
 		}
-		s = "tcpip-forward";
-		buffer_put_string(msg, s, strlen(s)); // ctype
+		req = "tcpip-forward";
+		buffer_put_string(msg, req, strlen(req)); // ctype
 		buffer_put_char(msg, 1);  // want reply
 		buffer_put_string(msg, bind_address, strlen(bind_address));
 
@@ -3577,7 +3590,9 @@
 		finish_send_packet(pvar);
 		buffer_free(msg);
 
-		logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_GLOBAL_REQUEST was sent at SSH_request_forwarding().");
+		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH2_MSG_GLOBAL_REQUEST. "
+			"request=%s, want_reply=%d, bind_address=%s, remote_port=%d",
+			req, 1, bind_address, from_server_port);
 	}
 }
 

From svnnotify ＠ sourceforge.jp  Thu Jun 22 00:31:10 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Thu, 22 Jun 2017 00:31:10 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY4MTZdICDoi7HoqLM=?=
Message-ID: <1498059070.079085.39069.nullmailer@users.sourceforge.jp>

Revision: 6816
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6816
Author:   yutakapon
Date:     2017-06-22 00:31:09 +0900 (Thu, 22 Jun 2017)
Log Message:
-----------
英訳

Modified Paths:
--------------
    trunk/doc/en/html/about/copyright.html
    trunk/doc/en/html/about/history.html
    trunk/doc/en/html/setup/teraterm-misc.html
    trunk/doc/en/html/setup/teraterm.html

-------------- next part --------------
Modified: trunk/doc/en/html/about/copyright.html
===================================================================
--- trunk/doc/en/html/about/copyright.html	2017-06-21 10:09:29 UTC (rev 6815)
+++ trunk/doc/en/html/about/copyright.html	2017-06-21 15:31:09 UTC (rev 6816)
@@ -13,7 +13,7 @@
 <h1>License and Copyright</h1>
 
 <h2>Contents</h2>
-<!--h3>\x8D\\x90\xAC\x83\x82\x83W\x83\x85\x81[\x83\x8B</h3-->
+<h3>Composition Module</h3>
 <ul>
   <li><a href="#license_teraterm">Tera Term</a> ... 3-clause BSD license</li>
   <li><a href="#license_ttssh">TTSSH</a> ... 3-clause BSD license</li>
@@ -25,7 +25,7 @@
   <li>Collector ... Freeware. Source code is not available.</li>
   <li>LogMeTT, TTLEditor ... Freeware. Proprietary license. Source code is not available.</li>
 </ul>
-<!--h3>\x8Eg\x97p\x82\xB5\x82Ă\xA2\x82?\x83C\x83u\x83\x89\x83\x8A(\x83\\x81[\x83X\x83R\x81[\x83h)</h3-->
+<h3>Using Library(Source Code)</h3>
 <ul>
   <li>Oniguruma ... <a href="../reference/Oniguruma-LICENSE.txt">2-clause BSD license</a></li>
   <li>SFMT ... <a href="../reference/SFMT-LICENSE.txt">3-clause BSD license</a></li>

Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2017-06-21 10:09:29 UTC (rev 6815)
+++ trunk/doc/en/html/about/history.html	2017-06-21 15:31:09 UTC (rev 6816)
@@ -35,15 +35,15 @@
 <ul class="history">
   <li>Changes
     <ul>
-      <!--li>\x83\x8D\x83O\x82?s\x93\xAA\x82??\xC1\x82\xB7\x82\xE9\x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82?t\x83H\x81[\x83}\x83b\x83g\x82\xF0\x8Ew\x92\xE8\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B
+      <li>added configuration of timestamp format at the start of log file.
         <ul>
-          <li>teraterm.ini \x82\xC9 <a href="../setup/teraterm-misc.html#LogTimestampFormat">LogTimestampFormat</a> \x83G\x83\x93\x83g\x83\x8A\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B\x83f\x83t\x83H\x83\x8B\x83g\x82\xCD"%a %b %e %H:%M:%S.%N %Y"\x81B</li>
-          <li>\x83f\x83t\x83H\x83\x8B\x83g\x82?t\x83H\x81[\x83}\x83b\x83g\x82\xCD RFC 3339 \x8C`\x8E\xAE\x82?ύX\x82\xB3\x82?\x81B\x88?O\x82?t\x83H\x81[\x83}\x83b\x83g\x82??\xB7\x82?\xCD LogTimestampFormat \x82\xC9 "%a %b %e %H:%M:%S.%N %Y" \x82\xF0\x90??\x82\xE9\x81B</li>
+          <li>added the <a href="../setup/teraterm-misc.html#LogTimestampFormat">LogTimestampFormat</a> entry in the teraterm.ini file. The default is "%a %b %e %H:%M:%S.%N %Y".</li>
+          <li>The default format is changed to RFC 3339 style. Specify the "%a %b %e %H:%M:%S.%N %Y" at the LogTimestampFormat entry to restore before format.</li>
         </ul></li>
-      <li>\x83\x8D\x83O\x82?s\x93\xAA\x82??\xC1\x82\xB7\x82\xE9\x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82?\x9E\x8D\x8F\x82\xC9UTC\x82\xF0\x8Eg\x97p\x82ł\xAB\x82\xE9\x82悤\x82?\xB5\x82\xBD\x81B
+      <li>UTC can be used at timestamp format at the start of log file.
         <ul>
-          <li>teraterm.ini \x82\xC9 <a href="../setup/teraterm-misc.html#LogTimestampUTC">LogTimestampUTC</a> \x83G\x83\x93\x83g\x83\x8A\x82\xF0\x92?\xC1\x82\xB5\x82\xBD\x81B\x83f\x83t\x83H\x83\x8B\x83g\x82\xCDoff\x81B</li>
-        </ul></li-->
+          <li>added the <a href="../setup/teraterm-misc.html#LogTimestampUTC">LogTimestampUTC</a> entry in the teraterm.ini file. The default is off.</li>
+        </ul></li>
     </ul>
   </li>
 
@@ -2915,13 +2915,13 @@
     </ul>
   </li-->
 
-  <!--li>Bug fixes
+  <li>Bug fixes
     <ul>
-      <li>\x83p\x83X\x83\x8F\x81[\x83h\x94F\x8F?\x9E\x82?p\x83X\x83\x8F\x81[\x83h\x95ύX\x83_\x83C\x83A\x83\x8D\x83O\x82ŃL\x83\x83\x83\x93\x83Z\x83\x8B\x82\xB5\x82\xBD\x8E\x9E\x82?A\x83f\x83o\x83b\x83O\x83\x8D\x83O\x82?S\x83~\x82\xAA\x8Fo\x97?\xB3\x82\xEA\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
-      <li>SSHv1 \x90?\xB1\x8E\x9E\x82?E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x95ύX\x92?m\x82ŁA\x90\xB3\x82\xB5\x82\xA2\x83E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y(\x83s\x83N\x83Z\x83\x8B\x90\x94)\x82\xF0\x92?m\x82\xB7\x82\xE9\x82悤\x82?C\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+      <li>When the password chaning dialog is canceled on password authentication, corrupted character will output at the debug lof.</li>
+      <li>When the chaging window size is notified on SSHv1 connection, right window size(pixel count) is notified.</li>
       <li>When the window size change is notified, the right window size(pixel) can be reported.</li>
     </ul>
-  </li-->
+  </li>
 
   <li>Misc
     <ul>

Modified: trunk/doc/en/html/setup/teraterm-misc.html
===================================================================
--- trunk/doc/en/html/setup/teraterm-misc.html	2017-06-21 10:09:29 UTC (rev 6815)
+++ trunk/doc/en/html/setup/teraterm-misc.html	2017-06-21 15:31:09 UTC (rev 6816)
@@ -353,11 +353,11 @@
 </pre>
 
 
-<h1><a name="LogTimestampFormat"><!--\x83\x8D\x83O\x82?s\x93\xAA\x82??\xC1\x82\xB7\x82\xE9\x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82?t\x83H\x81[\x83}\x83b\x83g\x82\xF0\x8Ew\x92?\x82\xE9--></a></h1>
+<h1><a name="LogTimestampFormat">Specify timestamp format at the start of log file</a></h1>
 
-<!--p>
-Tera Term \x82?\x8D\x83O\x83t\x83@\x83C\x83\x8B\x82?\x91\x82\xAB\x8D\x9E\x82?\x9E\x82?s\x93\xAA\x82?^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82\xF0\x8F\x91\x82\xAB\x8D\x9E\x82?\xB1\x82?\xAA\x82ł\xAB\x82?\xB7\x82\xAA\x81A\x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82?t\x83H\x81[\x83}\x83b\x83g\x82\xF0\x8Ew\x92?\x82邱\x82?\xAA\x82ł\xAB\x82?\xB7\x81B
-</p-->
+<p>
+When the log file is written, the timestamp can be added at the start of line and the timestamp format can be specified.
+</p>
 
 <pre>
 SYNOPSIS:
@@ -388,14 +388,14 @@
 </pre>
 
 
-<h1><a name="LogTimestampUTC"><!--\x83\x8D\x83O\x82?s\x93\xAA\x82??\xC1\x82\xB7\x82\xE9\x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82?\x9E\x8D\x8F\x82\xC9UTC\x82\xF0\x8Eg\x97p\x82\xB7\x82\xE9--></a></h1>
+<h1><a name="LogTimestampUTC">UTC is used as timestamp at the start of log file</a></h1>
 
-<!--p>
-Tera Term \x82?\x8D\x83O\x83t\x83@\x83C\x83\x8B\x82?\x91\x82\xAB\x8D\x9E\x82?\x9E\x82?s\x93\xAA\x82?^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82\xF0\x8F\x91\x82\xAB\x8D\x9E\x82?\xB1\x82?\xAA\x82ł\xAB\x82?\xB7\x82\xAA\x81A\x92?\xED\x82?\x8D\x81[\x83J\x83\x8B\x93\xFA\x8E\x9E\x82\xF0\x8Eg\x97p\x82\xB5\x82?\xB7\x81B<br>
-\x89Ď\x9E\x8A??Ή\x9E\x82\xB5\x82\xBD\x83\x8D\x81[\x83J\x83\x8B\x93\xFA\x8E\x9E\x82\xF0\x8Eg\x97p\x82\xB5\x82Ă\xA2\x82\xE9\x82?A\x89Ď\x9E\x8A???\xE8\x91?\xA6\x83^\x83C\x83~\x83\x93\x83O\x82?\x9E\x8D\x8F\x82\xAA\x90i\x82?i\x82?\xBD\x82??\xE9\x81j\x82\xBD\x82???}\x82\xB5\x82?\xA2\x8E\x9E\x8D\x8F\x82\xAA\x8BL\x98^\x82\xB3\x82\xEA\x82邱\x82?\xAA\x82\xA0\x82\xE8\x82?\xB7\x81B<br>
-UTC \x82?\xFA\x8E\x9E\x82??Ď\x9E\x8A?\xAA\x82?\xA2\x82\xBD\x82?A\x82\xB1\x82?\xE2\x91\xE8\x82\xF0\x89\xF1\x94\xF0\x82\xB7\x82邱\x82?\xAA\x82ł\xAB\x82?\xB7\x81B<br>
-\x83\x8D\x81[\x83J\x83\x8B\x93\xFA\x8E\x9E\x82?\xA9\x82\xED\x82\xE8\x82\xC9 UTC \x82?\xFA\x8E\x9E\x82\xF0\x8Eg\x97p\x82\xB7\x82\xE9\x8F?\x82?A\x90?\xE8\x83t\x83@\x83C\x83\x8B\x82\xCC [Tera Term] \x83Z\x83N\x83V\x83\x87\x83\x93\x82\xCC LogTimestampUTC \x8Ds\x82\xF0\x88?\xBA\x82?悤\x82?ύX\x82\xB5\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
-</p-->
+<p>
+When the log file is written, the timestamp can be added at the start of log file. Basically, local time is used. <br>
+When local time is used for summer time, the clock will go or back at summer time switching. So, unexpected clock will be recorded. <br>
+Fortunately, this problem can be avoided because UTC timestamp does not support summer time. <br>
+If UTC timestamp is used instead of local time, change the LogTimestampUTC entry of [Tera Term] section in the following:
+</p>
 
 <pre>
 LogTimestampUTC=on

Modified: trunk/doc/en/html/setup/teraterm.html
===================================================================
--- trunk/doc/en/html/setup/teraterm.html	2017-06-21 10:09:29 UTC (rev 6815)
+++ trunk/doc/en/html/setup/teraterm.html	2017-06-21 15:31:09 UTC (rev 6816)
@@ -175,8 +175,8 @@
  <li><a href="teraterm-misc.html#ClickableUrlBrowser">A browser by using Clickable URL</a></li>
  <li><a href="teraterm-misc.html#LogLockExclusive">Exclusive-lock log file</a></li>
  <li><a href="teraterm-misc.html#DeferredLogWriteMode">Deferred log write mode</a></li>
- <!--li><a href="teraterm-misc.html#LogTimestampFormat">\x83\x8D\x83O\x82?s\x93\xAA\x82??\xC1\x82\xB7\x82\xE9\x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82?t\x83H\x81[\x83}\x83b\x83g\x82\xF0\x8Ew\x92?\x82\xE9</a></li>
- <li><a href="teraterm-misc.html#LogTimestampUTC">\x83\x8D\x83O\x82?s\x93\xAA\x82??\xC1\x82\xB7\x82\xE9\x83^\x83C\x83\x80\x83X\x83^\x83\x93\x83v\x82?\x9E\x8D\x8F\x82\xC9UTC\x82\xF0\x8Eg\x97p\x82\xB7\x82\xE9</a></li-->
+ <li><a href="teraterm-misc.html#LogTimestampFormat">Specify timestamp format at the start of log file</a></li>
+ <li><a href="teraterm-misc.html#LogTimestampUTC">UTC is used at timestamp format of the start of log file</a></li-->
 </ul>
 
 </body>

From svnnotify ＠ sourceforge.jp  Fri Jun 23 23:58:55 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Fri, 23 Jun 2017 23:58:55 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY4MTddICDplqLmlbDjgpLnp7vli5U=?=
Message-ID: <1498229935.287018.83020.nullmailer@users.sourceforge.jp>

Revision: 6817
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6817
Author:   maya
Date:     2017-06-23 23:58:54 +0900 (Fri, 23 Jun 2017)
Log Message:
-----------
関数を移動

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/kex.c
    trunk/ttssh2/ttxssh/kex.h
    trunk/ttssh2/ttxssh/key.c
    trunk/ttssh2/ttxssh/key.h

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/kex.c
===================================================================
--- trunk/ttssh2/ttxssh/kex.c	2017-06-21 15:31:09 UTC (rev 6816)
+++ trunk/ttssh2/ttxssh/kex.c	2017-06-23 14:58:54 UTC (rev 6817)
@@ -461,84 +461,6 @@
 }
 
 
-// from openssh 5.8p1 key.c
-int key_ec_validate_public(const EC_GROUP *group, const EC_POINT *public)
-{
-	BN_CTX *bnctx;
-	EC_POINT *nq = NULL;
-	BIGNUM *order, *x, *y, *tmp;
-	int ret = -1;
-
-	if ((bnctx = BN_CTX_new()) == NULL) {
-		return ret;
-	}
-	BN_CTX_start(bnctx);
-
-	/*
-	 * We shouldn't ever hit this case because bignum_get_ecpoint()
-	 * refuses to load GF2m points.
-	 */
-	if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) !=
-	    NID_X9_62_prime_field) {
-		goto out;
-	}
-
-	/* Q != infinity */
-	if (EC_POINT_is_at_infinity(group, public)) {
-		goto out;
-	}
-
-	if ((x = BN_CTX_get(bnctx)) == NULL ||
-	    (y = BN_CTX_get(bnctx)) == NULL ||
-	    (order = BN_CTX_get(bnctx)) == NULL ||
-		(tmp = BN_CTX_get(bnctx)) == NULL) {
-		goto out;
-	}
-
-	/* log2(x) > log2(order)/2, log2(y) > log2(order)/2 */
-	if (EC_GROUP_get_order(group, order, bnctx) != 1) {
-		goto out;
-	}
-	if (EC_POINT_get_affine_coordinates_GFp(group, public,
-		x, y, bnctx) != 1) {
-		goto out;
-	}
-	if (BN_num_bits(x) <= BN_num_bits(order) / 2) {
-		goto out;
-	}
-	if (BN_num_bits(y) <= BN_num_bits(order) / 2) {
-		goto out;
-	}
-
-	/* nQ == infinity (n == order of subgroup) */
-	if ((nq = EC_POINT_new(group)) == NULL) {
-		goto out;
-	}
-	if (EC_POINT_mul(group, nq, NULL, public, order, bnctx) != 1) {
-		goto out;
-	}
-	if (EC_POINT_is_at_infinity(group, nq) != 1) {
-		goto out;
-	}
-
-	/* x < order - 1, y < order - 1 */
-	if (!BN_sub(tmp, order, BN_value_one())) {
-		goto out;
-	}
-	if (BN_cmp(x, tmp) >= 0) {
-		goto out;
-	}
-	if (BN_cmp(y, tmp) >= 0) {
-		goto out;
-	}
-	ret = 0;
- out:
-	BN_CTX_free(bnctx);
-	EC_POINT_free(nq);
-	return ret;
-}
-
-
 static u_char *derive_key(int id, int need, u_char *hash, BIGNUM *shared_secret,
                           char *session_id, int session_id_len,
                           const EVP_MD *evp_md)

Modified: trunk/ttssh2/ttxssh/kex.h
===================================================================
--- trunk/ttssh2/ttxssh/kex.h	2017-06-21 15:31:09 UTC (rev 6816)
+++ trunk/ttssh2/ttxssh/kex.h	2017-06-23 14:58:54 UTC (rev 6817)
@@ -78,6 +78,5 @@
                                unsigned int *hashlen);
 
 int dh_pub_is_valid(DH *dh, BIGNUM *dh_pub);
-int key_ec_validate_public(const EC_GROUP *group, const EC_POINT *public);
 void kex_derive_keys(PTInstVar pvar, int need, u_char *hash, BIGNUM *shared_secret,
                      char *session_id, int session_id_len);

Modified: trunk/ttssh2/ttxssh/key.c
===================================================================
--- trunk/ttssh2/ttxssh/key.c	2017-06-21 15:31:09 UTC (rev 6816)
+++ trunk/ttssh2/ttxssh/key.c	2017-06-23 14:58:54 UTC (rev 6817)
@@ -26,7 +26,6 @@
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #include "key.h"
-#include "kex.h"
 #include "resource.h"
 
 #include <openssl/rsa.h>
@@ -1803,42 +1802,6 @@
 		BN_CTX_free(ctx);
 }
 
-static int key_ec_validate_private(EC_KEY *key)
-{
-	BN_CTX *bnctx = NULL;
-	BIGNUM *order, *tmp;
-	int ret = -1;
-
-	if ((bnctx = BN_CTX_new()) == NULL)
-		goto out;
-	BN_CTX_start(bnctx);
-
-	if ((order = BN_CTX_get(bnctx)) == NULL ||
-	    (tmp = BN_CTX_get(bnctx)) == NULL)
-		goto out;
-
-	/* log2(private) > log2(order)/2 */
-	if (EC_GROUP_get_order(EC_KEY_get0_group(key), order, bnctx) != 1)
-		goto out;
-	if (BN_num_bits(EC_KEY_get0_private_key(key)) <=
-	    BN_num_bits(order) / 2) {
-		goto out;
-	}
-
-	/* private < order - 1 */
-	if (!BN_sub(tmp, order, BN_value_one()))
-		goto out;
-	if (BN_cmp(EC_KEY_get0_private_key(key), tmp) >= 0) {
-		goto out;
-	}
-	ret = 0;
-
-out:
-	if (bnctx)
-		BN_CTX_free(bnctx);
-	return ret;
-}
-
 Key *key_private_deserialize(buffer_t *blob)
 {
 	int success = 0;
@@ -1892,18 +1855,14 @@
 			if (nid != keytype_to_cipher_nid(skt))
 				goto ecdsa_error;
 
-			k->ecdsa = EC_KEY_new_by_curve_name(nid);
-			if (k->ecdsa == NULL)
+			if ((k->ecdsa = EC_KEY_new_by_curve_name(nid)) == NULL)
 				goto ecdsa_error;
-
-			q = EC_POINT_new(EC_KEY_get0_group(k->ecdsa));
-			if (q == NULL)
+			if ((q = EC_POINT_new(EC_KEY_get0_group(k->ecdsa))) == NULL)
 				goto ecdsa_error;
-
 			if ((exponent = BN_new()) == NULL)
 				goto ecdsa_error;
-			buffer_get_ecpoint_msg(blob,
-				EC_KEY_get0_group(k->ecdsa), q);
+
+			buffer_get_ecpoint_msg(blob, EC_KEY_get0_group(k->ecdsa), q);
 			buffer_get_bignum2_msg(blob, exponent);
 			if (EC_KEY_set_public_key(k->ecdsa, q) != 1)
 				goto ecdsa_error;
@@ -1910,7 +1869,7 @@
 			if (EC_KEY_set_private_key(k->ecdsa, exponent) != 1)
 				goto ecdsa_error;
 			if (key_ec_validate_public(EC_KEY_get0_group(k->ecdsa),
-				EC_KEY_get0_public_key(k->ecdsa)) != 0)
+			                           EC_KEY_get0_public_key(k->ecdsa)) != 0)
 				goto ecdsa_error;
 			if (key_ec_validate_private(k->ecdsa) != 0)
 				goto ecdsa_error;
@@ -1965,6 +1924,119 @@
 }
 
 
+int key_ec_validate_private(EC_KEY *key)
+{
+	BN_CTX *bnctx = NULL;
+	BIGNUM *order, *tmp;
+	int ret = -1;
+
+	if ((bnctx = BN_CTX_new()) == NULL)
+		goto out;
+	BN_CTX_start(bnctx);
+
+	if ((order = BN_CTX_get(bnctx)) == NULL ||
+	    (tmp = BN_CTX_get(bnctx)) == NULL)
+		goto out;
+
+	/* log2(private) > log2(order)/2 */
+	if (EC_GROUP_get_order(EC_KEY_get0_group(key), order, bnctx) != 1)
+		goto out;
+	if (BN_num_bits(EC_KEY_get0_private_key(key)) <=
+	    BN_num_bits(order) / 2) {
+		goto out;
+	}
+
+	/* private < order - 1 */
+	if (!BN_sub(tmp, order, BN_value_one()))
+		goto out;
+	if (BN_cmp(EC_KEY_get0_private_key(key), tmp) >= 0) {
+		goto out;
+	}
+	ret = 0;
+
+out:
+	if (bnctx)
+		BN_CTX_free(bnctx);
+	return ret;
+}
+
+// from openssh 5.8p1 key.c
+int key_ec_validate_public(const EC_GROUP *group, const EC_POINT *public)
+{
+	BN_CTX *bnctx;
+	EC_POINT *nq = NULL;
+	BIGNUM *order, *x, *y, *tmp;
+	int ret = -1;
+
+	if ((bnctx = BN_CTX_new()) == NULL) {
+		return ret;
+	}
+	BN_CTX_start(bnctx);
+
+	/*
+	* We shouldn't ever hit this case because bignum_get_ecpoint()
+	* refuses to load GF2m points.
+	*/
+	if (EC_METHOD_get_field_type(EC_GROUP_method_of(group)) !=
+		NID_X9_62_prime_field) {
+		goto out;
+	}
+
+	/* Q != infinity */
+	if (EC_POINT_is_at_infinity(group, public)) {
+		goto out;
+	}
+
+	if ((x = BN_CTX_get(bnctx)) == NULL ||
+		(y = BN_CTX_get(bnctx)) == NULL ||
+		(order = BN_CTX_get(bnctx)) == NULL ||
+		(tmp = BN_CTX_get(bnctx)) == NULL) {
+		goto out;
+	}
+
+	/* log2(x) > log2(order)/2, log2(y) > log2(order)/2 */
+	if (EC_GROUP_get_order(group, order, bnctx) != 1) {
+		goto out;
+	}
+	if (EC_POINT_get_affine_coordinates_GFp(group, public,
+		x, y, bnctx) != 1) {
+		goto out;
+	}
+	if (BN_num_bits(x) <= BN_num_bits(order) / 2) {
+		goto out;
+	}
+	if (BN_num_bits(y) <= BN_num_bits(order) / 2) {
+		goto out;
+	}
+
+	/* nQ == infinity (n == order of subgroup) */
+	if ((nq = EC_POINT_new(group)) == NULL) {
+		goto out;
+	}
+	if (EC_POINT_mul(group, nq, NULL, public, order, bnctx) != 1) {
+		goto out;
+	}
+	if (EC_POINT_is_at_infinity(group, nq) != 1) {
+		goto out;
+	}
+
+	/* x < order - 1, y < order - 1 */
+	if (!BN_sub(tmp, order, BN_value_one())) {
+		goto out;
+	}
+	if (BN_cmp(x, tmp) >= 0) {
+		goto out;
+	}
+	if (BN_cmp(y, tmp) >= 0) {
+		goto out;
+	}
+	ret = 0;
+out:
+	BN_CTX_free(bnctx);
+	EC_POINT_free(nq);
+	return ret;
+}
+
 static void hostkeys_update_ctx_free(struct hostkeys_update_ctx *ctx)
 {
 	size_t i;

Modified: trunk/ttssh2/ttxssh/key.h
===================================================================
--- trunk/ttssh2/ttxssh/key.h	2017-06-21 15:31:09 UTC (rev 6816)
+++ trunk/ttssh2/ttxssh/key.h	2017-06-23 14:58:54 UTC (rev 6817)
@@ -50,6 +50,7 @@
 char *get_sshname_from_key(Key *key);
 enum hostkey_type get_keytype_from_name(char *name);
 char *curve_keytype_to_name(ssh_keytype type);
+ssh_keytype key_curve_name_to_keytype(char *name);
 
 Key *key_new_private(int type);
 Key *key_new(int type);
@@ -68,6 +69,9 @@
 void key_private_serialize(Key *key, buffer_t *b);
 Key *key_private_deserialize(buffer_t *blob);
 
+int key_ec_validate_private(EC_KEY *key);
+int key_ec_validate_public(const EC_GROUP *group, const EC_POINT *public);
+
 int update_client_input_hostkeys(PTInstVar pvar, char *dataptr, int datalen);
 
 #endif

From svnnotify ＠ sourceforge.jp  Sat Jun 24 00:00:44 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sat, 24 Jun 2017 00:00:44 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY4MThdICDlhazplovpjbXoqo3oqLzjgadF?=
 =?utf-8?b?Q0RTQSAsIEVkMjU1MTnjga5QdVRUWeW9ouW8j+enmOWvhumNteOBq+Wvvg==?=
 =?utf-8?b?5b+c?=
Message-ID: <1498230044.908221.87660.nullmailer@users.sourceforge.jp>

Revision: 6818
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6818
Author:   maya
Date:     2017-06-24 00:00:44 +0900 (Sat, 24 Jun 2017)
Log Message:
-----------
公開鍵認証でECDSA,Ed25519のPuTTY形式秘密鍵に対応

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/keyfiles.c

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/keyfiles.c
===================================================================
--- trunk/ttssh2/ttxssh/keyfiles.c	2017-06-23 14:58:54 UTC (rev 6817)
+++ trunk/ttssh2/ttxssh/keyfiles.c	2017-06-23 15:00:44 UTC (rev 6818)
@@ -794,6 +794,18 @@
 			else if (strncmp(line + strlen("PuTTY-User-Key-File-2: "), "ssh-rsa", strlen("ssh-rsa")) == 0) {
 				result->type = KEY_RSA;
 			}
+			else if (strncmp(line + strlen("PuTTY-User-Key-File-2: "), "ecdsa-sha2-nistp256", strlen("ecdsa-sha2-nistp256")) == 0) {
+				result->type = KEY_ECDSA256;
+			}
+			else if (strncmp(line + strlen("PuTTY-User-Key-File-2: "), "ecdsa-sha2-nistp384", strlen("ecdsa-sha2-nistp384")) == 0) {
+				result->type = KEY_ECDSA384;
+			}
+			else if (strncmp(line + strlen("PuTTY-User-Key-File-2: "), "ecdsa-sha2-nistp521", strlen("ecdsa-sha2-nistp521")) == 0) {
+				result->type = KEY_ECDSA521;
+			}
+			else if (strncmp(line + strlen("PuTTY-User-Key-File-2: "), "ssh-ed25519", strlen("ssh-ed25519")) == 0) {
+				result->type = KEY_ED25519;
+			}
 			else {
 				strncpy_s(errmsg, errmsg_len, "not a PuTTY SSH-2 private key", _TRUNCATE);
 				goto error;
@@ -1086,6 +1098,98 @@
 
 		break;
 	}
+	case KEY_ECDSA256:
+	case KEY_ECDSA384:
+	case KEY_ECDSA521:
+	{
+		char *pubkey_type, *pub, *pri;
+		int success = 0;
+		unsigned int nid;
+		char *curve = NULL;
+		ssh_keytype skt;
+		BIGNUM *exponent = NULL;
+		EC_POINT *q = NULL;
+
+		pub = pubkey->buf;
+		pri = prikey->buf;
+		pubkey_type = buffer_get_string(&pub, NULL);
+		if ((result->type == KEY_ECDSA256 && strcmp(pubkey_type, "ecdsa-sha2-nistp256") != 0) ||
+		    (result->type == KEY_ECDSA384 && strcmp(pubkey_type, "ecdsa-sha2-nistp384") != 0) ||
+		    (result->type == KEY_ECDSA521 && strcmp(pubkey_type, "ecdsa-sha2-nistp521") != 0)) {
+			strncpy_s(errmsg, errmsg_len, "key type error", _TRUNCATE);
+			free(pubkey_type);
+			goto error;
+		}
+		free(pubkey_type);
+
+		nid = keytype_to_cipher_nid(result->type);
+		curve = buffer_get_string(&pub, NULL);
+		skt = key_curve_name_to_keytype(curve);
+		if (nid != keytype_to_cipher_nid(skt))
+			goto ecdsa_error;
+
+		if ((result->ecdsa = EC_KEY_new_by_curve_name(nid)) == NULL)
+			goto ecdsa_error;
+		if ((q = EC_POINT_new(EC_KEY_get0_group(result->ecdsa))) == NULL)
+			goto ecdsa_error;
+		if ((exponent = BN_new()) == NULL)
+			goto ecdsa_error;
+
+		buffer_get_ecpoint(&pub, EC_KEY_get0_group(result->ecdsa), q);
+		buffer_get_bignum2(&pri, exponent);
+		if (EC_KEY_set_public_key(result->ecdsa, q) != 1)
+			goto ecdsa_error;
+		if (EC_KEY_set_private_key(result->ecdsa, exponent) != 1)
+			goto ecdsa_error;
+		if (key_ec_validate_public(EC_KEY_get0_group(result->ecdsa),
+		                           EC_KEY_get0_public_key(result->ecdsa)) != 0)
+			goto ecdsa_error;
+		if (key_ec_validate_private(result->ecdsa) != 0)
+			goto ecdsa_error;
+
+		success = 1;
+
+ecdsa_error:
+		free(curve);
+		if (exponent)
+			BN_clear_free(exponent);
+		if (q)
+			EC_POINT_free(q);
+		if (success == 0)
+			goto error;
+
+		break;
+	}
+	case KEY_ED25519:
+	{
+		char *pubkey_type, *pub, *pri;
+		unsigned int pklen, sklen;
+		char *sk;
+		pub = pubkey->buf;
+		pri = prikey->buf;
+		pubkey_type = buffer_get_string(&pub, NULL);
+		if (strcmp(pubkey_type, "ssh-ed25519") != 0) {
+			strncpy_s(errmsg, errmsg_len, "key type error", _TRUNCATE);
+			free(pubkey_type);
+			goto error;
+		}
+		free(pubkey_type);
+
+		result->ed25519_pk = buffer_get_string(&pub, &pklen);
+		sk = buffer_get_string(&pri, &sklen);
+		result->ed25519_sk = malloc(pklen + sklen + 1);
+		memcpy(result->ed25519_sk, sk, sklen);
+		memcpy(result->ed25519_sk + sklen, result->ed25519_pk, pklen);
+		result->ed25519_sk[sklen + pklen] = '\0';
+		free(sk);
+
+		if (pklen != ED25519_PK_SZ)
+			goto error;
+		if (sklen + pklen != ED25519_SK_SZ)
+			goto error;
+
+		break;
+	}
 	default:
 		strncpy_s(errmsg, errmsg_len, "key type error", _TRUNCATE);
 		goto error;

From svnnotify ＠ sourceforge.jp  Sat Jun 24 16:13:44 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Sat, 24 Jun 2017 16:13:44 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY4MTldICDjg5XjgqHjgqTjg6vjga7ooYw=?=
 =?utf-8?b?6aCt44Gn44GC44KL44GT44Go44KS5piO56K644Gq6KGo54++44Gr5L+u5q2j?=
 =?utf-8?b?44GX44Gf44CC?=
Message-ID: <1498288424.755810.103943.nullmailer@users.sourceforge.jp>

Revision: 6819
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6819
Author:   yutakapon
Date:     2017-06-24 16:13:44 +0900 (Sat, 24 Jun 2017)
Log Message:
-----------
ファイルの行頭であることを明確な表現に修正した。
内部指摘によるフィードバック
[Ttssh2-devel 3312] 

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/en/html/setup/teraterm-misc.html
    trunk/doc/en/html/setup/teraterm.html

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2017-06-23 15:00:44 UTC (rev 6818)
+++ trunk/doc/en/html/about/history.html	2017-06-24 07:13:44 UTC (rev 6819)
@@ -35,12 +35,12 @@
 <ul class="history">
   <li>Changes
     <ul>
-      <li>added configuration of timestamp format at the start of log file.
+      <li>added configuration of timestamp format at the start of log file's line.
         <ul>
           <li>added the <a href="../setup/teraterm-misc.html#LogTimestampFormat">LogTimestampFormat</a> entry in the teraterm.ini file. The default is "%a %b %e %H:%M:%S.%N %Y".</li>
           <li>The default format is changed to RFC 3339 style. Specify the "%a %b %e %H:%M:%S.%N %Y" at the LogTimestampFormat entry to restore before format.</li>
         </ul></li>
-      <li>UTC can be used at timestamp format at the start of log file.
+      <li>UTC can be used at timestamp format at the start of log file's line.
         <ul>
           <li>added the <a href="../setup/teraterm-misc.html#LogTimestampUTC">LogTimestampUTC</a> entry in the teraterm.ini file. The default is off.</li>
         </ul></li>

Modified: trunk/doc/en/html/setup/teraterm-misc.html
===================================================================
--- trunk/doc/en/html/setup/teraterm-misc.html	2017-06-23 15:00:44 UTC (rev 6818)
+++ trunk/doc/en/html/setup/teraterm-misc.html	2017-06-24 07:13:44 UTC (rev 6819)
@@ -353,7 +353,7 @@
 </pre>
 
 
-<h1><a name="LogTimestampFormat">Specify timestamp format at the start of log file</a></h1>
+<h1><a name="LogTimestampFormat">Specify timestamp format at the start of log file's line</a></h1>
 
 <p>
 When the log file is written, the timestamp can be added at the start of line and the timestamp format can be specified.
@@ -388,10 +388,10 @@
 </pre>
 
 
-<h1><a name="LogTimestampUTC">UTC is used as timestamp at the start of log file</a></h1>
+<h1><a name="LogTimestampUTC">UTC is used as timestamp at the start of log file's line</a></h1>
 
 <p>
-When the log file is written, the timestamp can be added at the start of log file. Basically, local time is used. <br>
+When the log file is written, the timestamp can be added at the start of log file's line. Basically, local time is used. <br>
 When local time is used for summer time, the clock will go or back at summer time switching. So, unexpected clock will be recorded. <br>
 Fortunately, this problem can be avoided because UTC timestamp does not support summer time. <br>
 If UTC timestamp is used instead of local time, change the LogTimestampUTC entry of [Tera Term] section in the following:

Modified: trunk/doc/en/html/setup/teraterm.html
===================================================================
--- trunk/doc/en/html/setup/teraterm.html	2017-06-23 15:00:44 UTC (rev 6818)
+++ trunk/doc/en/html/setup/teraterm.html	2017-06-24 07:13:44 UTC (rev 6819)
@@ -175,8 +175,8 @@
  <li><a href="teraterm-misc.html#ClickableUrlBrowser">A browser by using Clickable URL</a></li>
  <li><a href="teraterm-misc.html#LogLockExclusive">Exclusive-lock log file</a></li>
  <li><a href="teraterm-misc.html#DeferredLogWriteMode">Deferred log write mode</a></li>
- <li><a href="teraterm-misc.html#LogTimestampFormat">Specify timestamp format at the start of log file</a></li>
- <li><a href="teraterm-misc.html#LogTimestampUTC">UTC is used at timestamp format of the start of log file</a></li-->
+ <li><a href="teraterm-misc.html#LogTimestampFormat">Specify timestamp format at the start of log file's line</a></li>
+ <li><a href="teraterm-misc.html#LogTimestampUTC">UTC is used at timestamp format of the start of log file's line</a></li-->
 </ul>
 
 </body>

From svnnotify ＠ sourceforge.jp  Mon Jun 26 19:37:56 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 26 Jun 2017 19:37:56 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY4MjBdICByNjgwOSDjgafjga7jg5/jgrk=?=
 =?utf-8?b?44KS5L+u5q2j?=
Message-ID: <1498473476.014296.74466.nullmailer@users.sourceforge.jp>

Revision: 6820
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6820
Author:   doda
Date:     2017-06-26 19:37:55 +0900 (Mon, 26 Jun 2017)
Log Message:
-----------
r6809 でのミスを修正

Revision Links:
--------------
    http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6809

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/fwd.c

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/fwd.c
===================================================================
--- trunk/ttssh2/ttxssh/fwd.c	2017-06-24 07:13:44 UTC (rev 6819)
+++ trunk/ttssh2/ttxssh/fwd.c	2017-06-26 10:37:55 UTC (rev 6820)
@@ -1050,12 +1050,11 @@
 		}
 		if (s == INVALID_SOCKET) {
 			if (report_error) {
-				char buf[256];
 				UTIL_get_lang_msg("MSG_FWD_SOCKET_ERROR", pvar,
 				                  "Some socket(s) required for port forwarding could not be initialized.\n"
 				                  "Some port forwarding services may not be available.\n"
 				                  "(errno %d)");
-				logprintf(LOG_LEVEL_WARNING, buf, pvar->ts->UIMsg, WSAGetLastError());
+				logprintf(LOG_LEVEL_WARNING, pvar->ts->UIMsg, WSAGetLastError());
 			}
 			freeaddrinfo(res0);
 			/* free(request->listening_sockets); /* DO NOT FREE HERE, listening_sockets'll be freed in FWD_end */

From svnnotify ＠ sourceforge.jp  Mon Jun 26 19:38:04 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 26 Jun 2017 19:38:04 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY4MjFdICDjgrPjg6Hjg7Pjg4jkv67mraMg?=
 =?utf-8?q?=28_H-MAC_-=3E_HMAC=29?=
Message-ID: <1498473484.589277.75511.nullmailer@users.sourceforge.jp>

Revision: 6821
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6821
Author:   doda
Date:     2017-06-26 19:38:04 +0900 (Mon, 26 Jun 2017)
Log Message:
-----------
コメント修正 (H-MAC -> HMAC)

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/ssh.c
    trunk/ttssh2/ttxssh/ttxssh.c

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2017-06-26 10:37:55 UTC (rev 6820)
+++ trunk/ttssh2/ttxssh/ssh.c	2017-06-26 10:38:04 UTC (rev 6821)
@@ -4506,7 +4506,7 @@
 	myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = buf; 
 }
 
-// H-MAC\x83A\x83\x8B\x83S\x83\x8A\x83Y\x83\x80\x97D\x90?\x88??\x9E\x82\xB6\x82āAmyproposal[]\x82\xF0\x8F\x91\x82\xAB\x8A\xB7\x82\xA6\x82\xE9\x81B
+// HMAC\x83A\x83\x8B\x83S\x83\x8A\x83Y\x83\x80\x97D\x90?\x88??\x9E\x82\xB6\x82āAmyproposal[]\x82\xF0\x8F\x91\x82\xAB\x8A\xB7\x82\xA6\x82\xE9\x81B
 // (2011.2.28 yutaka)
 void SSH2_update_hmac_myproposal(PTInstVar pvar)
 {

Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c	2017-06-26 10:37:55 UTC (rev 6820)
+++ trunk/ttssh2/ttxssh/ttxssh.c	2017-06-26 10:38:04 UTC (rev 6821)
@@ -438,7 +438,7 @@
 	// Host Key algorithm order
 	READ_STD_STRING_OPTION(HostKeyOrder);
 	normalize_host_key_order(settings->HostKeyOrder);
-	// H-MAC order
+	// HMAC order
 	READ_STD_STRING_OPTION(MacOrder);
 	normalize_mac_order(settings->MacOrder);
 	// Compression algorithm order

From svnnotify ＠ sourceforge.jp  Mon Jun 26 19:38:16 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 26 Jun 2017 19:38:16 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY4MjJdICDjg4fjg5Djg4PjgrDjgZfmmJM=?=
 =?utf-8?b?44GV44Gu54K6IGVudW0g44Gr5aSJ5pu0?=
Message-ID: <1498473496.020273.75599.nullmailer@users.sourceforge.jp>

Revision: 6822
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6822
Author:   doda
Date:     2017-06-26 19:38:15 +0900 (Mon, 26 Jun 2017)
Log Message:
-----------
デバッグし易さの為 enum に変更

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/fwd.h
    trunk/ttssh2/ttxssh/fwdui.c

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/fwd.h
===================================================================
--- trunk/ttssh2/ttxssh/fwd.h	2017-06-26 10:38:04 UTC (rev 6821)
+++ trunk/ttssh2/ttxssh/fwd.h	2017-06-26 10:38:15 UTC (rev 6822)
@@ -72,9 +72,9 @@
 } FWDChannel;
 
 /* Request types */
-#define FWD_LOCAL_TO_REMOTE              1
-#define FWD_REMOTE_TO_LOCAL              2
-#define FWD_REMOTE_X11_TO_LOCAL          3
+typedef enum {
+	FWD_NONE, FWD_LOCAL_TO_REMOTE, FWD_REMOTE_TO_LOCAL, FWD_REMOTE_X11_TO_LOCAL
+} FWDType;
 
 /* If 'type' is FWD_REMOTE_X11_TO_LOCAL, then from_port must be
    -1, to_port must be 6000 + display number, and to_host must
@@ -84,7 +84,7 @@
    at one time.
 */
 typedef struct {
-  int type;
+  FWDType type;
   int from_port;
   char from_port_name[32];
   int to_port;

Modified: trunk/ttssh2/ttxssh/fwdui.c
===================================================================
--- trunk/ttssh2/ttxssh/fwdui.c	2017-06-26 10:38:04 UTC (rev 6821)
+++ trunk/ttssh2/ttxssh/fwdui.c	2017-06-26 10:38:15 UTC (rev 6822)
@@ -989,7 +989,7 @@
 	}
 }
 
-static void shift_over_input(HWND dlg, int type, WORD rtl_item,
+static void shift_over_input(HWND dlg, FWDType type, WORD rtl_item,
 							 WORD ltr_item)
 {
 	HWND shift_from;
@@ -1018,7 +1018,7 @@
 
 static void set_dir_options_status(HWND dlg)
 {
-	int type = IsDlgButtonChecked(dlg, IDC_SSHFWDREMOTETOLOCAL)
+	FWDType type = IsDlgButtonChecked(dlg, IDC_SSHFWDREMOTETOLOCAL)
 		? FWD_REMOTE_TO_LOCAL : FWD_LOCAL_TO_REMOTE;
 
 	shift_over_input(dlg, type, IDC_SSHRTLFROMPORT, IDC_SSHLTRFROMPORT);
@@ -1106,7 +1106,7 @@
 	fill_service_names(dlg, IDC_SSHLTRTOPORT);
 }
 
-static void grab_control_text(HWND dlg, int type, WORD rtl_item,
+static void grab_control_text(HWND dlg, FWDType type, WORD rtl_item,
                               WORD ltr_item, char *buf, int bufsize)
 {
 	GetDlgItemText(dlg, type == FWD_REMOTE_TO_LOCAL ? rtl_item : ltr_item,
@@ -1118,7 +1118,7 @@
                              HWND dlg)
 {
 	FWDRequestSpec new_spec;
-	int type = IsDlgButtonChecked(dlg, IDC_SSHFWDREMOTETOLOCAL)
+	FWDType type = IsDlgButtonChecked(dlg, IDC_SSHFWDREMOTETOLOCAL)
 		? FWD_REMOTE_TO_LOCAL : FWD_LOCAL_TO_REMOTE;
 	char buf[1024];
 

From svnnotify ＠ sourceforge.jp  Mon Jun 26 19:38:26 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 26 Jun 2017 19:38:26 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY4MjNdICDmjqXntprliY3jgavjgoLjg60=?=
 =?utf-8?b?44Kw5Ye65Yqb44GM6KGM44GI44KL44KI44GG44Gr5aSJ5pu044CC?=
Message-ID: <1498473506.984846.75755.nullmailer@users.sourceforge.jp>

Revision: 6823
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6823
Author:   doda
Date:     2017-06-26 19:38:26 +0900 (Mon, 26 Jun 2017)
Log Message:
-----------
接続前にもログ出力が行えるように変更。

pvar->session_settings は接続前は値が入っていないので、参照する設定を pvar->setteings に変更。
これに伴い「設定の読み込み」で LogLevel が変更になった場合に値が更新されるようになる。

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/ttxssh.c
    trunk/ttssh2/ttxssh/ttxssh.h

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c	2017-06-26 10:38:15 UTC (rev 6822)
+++ trunk/ttssh2/ttxssh/ttxssh.c	2017-06-26 10:38:26 UTC (rev 6823)
@@ -921,7 +921,7 @@
 
 void logputs(int level, char *msg)
 {
-	if (level <= pvar->session_settings.LogLevel) {
+	if (level <= pvar->settings.LogLevel) {
 		char buf[1024];
 		int file;
 
@@ -950,7 +950,7 @@
 	char buff[4096];
 	va_list params;
 
-	if (level <= pvar->session_settings.LogLevel) {
+	if (level <= pvar->settings.LogLevel) {
 		va_start(params, fmt);
 		vsnprintf_s(buff, sizeof(buff), _TRUNCATE, fmt, params);
 		va_end(params);
@@ -1008,7 +1008,7 @@
 	int byte_cnt;
 	int i;
 
-	if (level <= pvar->session_settings.LogLevel) {
+	if (level <= pvar->settings.LogLevel) {
 		va_start(params, fmt);
 		vsnprintf_s(buff, sizeof(buff), _TRUNCATE, fmt, params);
 		va_end(params);

Modified: trunk/ttssh2/ttxssh/ttxssh.h
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.h	2017-06-26 10:38:15 UTC (rev 6822)
+++ trunk/ttssh2/ttxssh/ttxssh.h	2017-06-26 10:38:26 UTC (rev 6823)
@@ -338,7 +338,7 @@
 #define SSHv1(pvar) ((pvar)->protocol_major == 1)
 #define SSHv2(pvar) ((pvar)->protocol_major == 2)
 
-#define LogLevel(pvar, level) ((pvar)->session_settings.LogLevel >= (level))
+#define LogLevel(pvar, level) ((pvar)->settings.LogLevel >= (level))
 
 void notify_established_secure_connection(PTInstVar pvar);
 void notify_closed_connection(PTInstVar pvar, char *send_msg);

From svnnotify ＠ sourceforge.jp  Mon Jun 26 19:38:37 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 26 Jun 2017 19:38:37 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY4MjRdICDjg63jgrDlh7rlipvjgpLlvLc=?=
 =?utf-8?b?5YyW?=
Message-ID: <1498473517.710830.75905.nullmailer@users.sourceforge.jp>

Revision: 6824
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6824
Author:   doda
Date:     2017-06-26 19:38:37 +0900 (Mon, 26 Jun 2017)
Log Message:
-----------
ログ出力を強化

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/ssh.c

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2017-06-26 10:38:26 UTC (rev 6823)
+++ trunk/ttssh2/ttxssh/ssh.c	2017-06-26 10:38:37 UTC (rev 6824)
@@ -349,10 +349,12 @@
 	Channel_t *c;
 
 	if (id < 0 || id >= CHANNEL_MAX) {
+		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": invalid channel id. (%d)", id);
 		return (NULL);
 	}
 	c = &channels[id];
 	if (c->used == 0) { // already freed
+		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": channel was already freed. id:%d", id);
 		return (NULL);
 	}
 	return (c);
@@ -1068,6 +1070,7 @@
 			msg = buffer_init();
 			if (msg == NULL) {
 				// TODO: error check
+				logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
 				return;
 			}
 
@@ -2075,6 +2078,8 @@
 
 	if (handle_message_count >= HANDLE_MESSAGE_MAX) {
 		// TODO: error check
+		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": too many handlers. handlers:%d, max:%d",
+			handle_message_count, HANDLE_MESSAGE_MAX);
 		return;
 	}
 
@@ -2766,6 +2771,7 @@
 		msg = buffer_init();
 		if (msg == NULL) {
 			// TODO: error check
+			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
 			return;
 		}
 		buffer_put_int(msg, SSH2_DISCONNECT_BY_APPLICATION);
@@ -2840,12 +2846,16 @@
 		Channel_t *c;
 
 		c = ssh2_channel_lookup(pvar->shell_id);
-		if (c == NULL)
+		if (c == NULL) {
+			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": shell channel not found.");
 			return;
+		}
 
+
 		msg = buffer_init();
 		if (msg == NULL) {
 			// TODO: error check
+			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
 			return;
 		}
 		buffer_put_int(msg, c->remote_id);
@@ -2885,11 +2895,14 @@
 		Channel_t *c;
 
 		c = ssh2_channel_lookup(pvar->shell_id);
-		if (c == NULL)
+		if (c == NULL) {
+			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": shell channel not found.");
 			goto error;
+		}
 
 		msg = buffer_init();
 		if (msg == NULL) {
+			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
 			goto error;
 		}
 		buffer_put_int(msg, c->remote_id);
@@ -3015,7 +3028,12 @@
 
 	} else { // for SSH2(yutaka)
 		Channel_t *c = ssh2_channel_lookup(pvar->shell_id);
-		SSH2_send_channel_data(pvar, c, (unsigned char *)buf, buflen, 0);
+		if (c == NULL) {
+			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": shell channel not found.");
+		}
+		else {
+			SSH2_send_channel_data(pvar, c, (unsigned char *)buf, buflen, 0);
+		}
 	}
 
 }
@@ -3270,6 +3288,8 @@
 	if (pvar->rekeying) {
 		// TODO: \x97\x9D\x91z\x82?\xB5\x82Ă?p\x83P\x83b\x83g\x94j\x8A\xFC\x82ł??\xAD\x81A\x83p\x83P\x83b\x83g\x93??\xE6\x82\xE8\x92x\x89\x84\x82?\xB5\x82\xBD\x82\xA2\x82?\xB1\x82?\x82\xAA\x81A
 		// \x8F\xAB\x97\x88\x92\xBC\x82\xB7\x82\xB1\x82??\xB7\x82\xE9\x81B
+		logputs(LOG_LEVEL_INFO, __FUNCTION__ ": now rekeying. data is not sent.");
+
 		c = NULL;
 
 		return;
@@ -3298,6 +3318,7 @@
 		msg = buffer_init();
 		if (msg == NULL) {
 			// TODO: error check
+			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
 			return;
 		}
 		buffer_put_int(msg, c->remote_id);
@@ -3309,9 +3330,9 @@
 		memcpy(outmsg, buffer_ptr(msg), len);
 		finish_send_packet(pvar);
 		buffer_free(msg);
-		//debug_print(1, pvar->ssh_state.outbuf, 7 + 4 + 1 + 1 + len);
 
-		logprintf(LOG_LEVEL_SSHDUMP, "SSH2_MSG_CHANNEL_DATA was sent at SSH2_send_channel_data(). local:%d remote:%d", c->self_id, c->remote_id);
+		logprintf(LOG_LEVEL_SSHDUMP, __FUNCTION__ ": sending SSH2_MSG_CHANNEL_DATA. "
+			"local:%d remote:%d len:%d", c->self_id, c->remote_id, buflen);
 
 		// remote window size\x82?\xB2\x90\xAE
 		if (buflen <= c->remote_window) {
@@ -3396,6 +3417,7 @@
 		msg = buffer_init();
 		if (msg == NULL) {
 			// TODO: error check
+			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
 			return;
 		}
 		buffer_put_int(msg, remote_channel_num);
@@ -3425,6 +3447,7 @@
 	msg = buffer_init();
 	if (msg == NULL) {
 		// TODO: error check
+		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
 		return;
 	}
 	buffer_put_int(msg, c->remote_id);
@@ -3493,6 +3516,8 @@
 	if (pvar->rekeying) {
 		// TODO: \x97\x9D\x91z\x82?\xB5\x82Ă?p\x83P\x83b\x83g\x94j\x8A\xFC\x82ł??\xAD\x81A\x83p\x83P\x83b\x83g\x93??\xE6\x82\xE8\x92x\x89\x84\x82?\xB5\x82\xBD\x82\xA2\x82?\xB1\x82?\x82\xAA\x81A
 		// \x8F\xAB\x97\x88\x92\xBC\x82\xB7\x82\xB1\x82??\xB7\x82\xE9\x81B
+		logputs(LOG_LEVEL_INFO, __FUNCTION__ ": now rekeying. data is not sent.");
+
 		c = NULL;
 
 		return;
@@ -3501,7 +3526,7 @@
 	msg = buffer_init();
 	if (msg == NULL) {
 		// TODO: error check
-		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL");
+		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
 		return;
 	}
 	buffer_put_int(msg, c->remote_id);  // remote ID
@@ -3574,7 +3599,7 @@
 		msg = buffer_init();
 		if (msg == NULL) {
 			// TODO: error check
-			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL");
+			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
 			return;
 		}
 		req = "tcpip-forward";
@@ -3607,6 +3632,7 @@
 		msg = buffer_init();
 		if (msg == NULL) {
 			// TODO: error check
+			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
 			return;
 		}
 		s = "cancel-tcpip-forward";
@@ -3669,12 +3695,15 @@
 		msg = buffer_init();
 		if (msg == NULL) {
 			// TODO: error check
+			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
 			return;
 		}
 
 		c = ssh2_channel_lookup(pvar->shell_id);
-		if (c == NULL)
+		if (c == NULL) {
+			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": shell channel not found.");
 			return;
+		}
 
 		// making the fake data	
 		newlen = 2 * auth_data_len + 1;
@@ -3759,6 +3788,8 @@
 			if (pvar->rekeying) {
 				// TODO: \x97\x9D\x91z\x82?\xB5\x82Ă?p\x83P\x83b\x83g\x94j\x8A\xFC\x82ł??\xAD\x81A\x83p\x83P\x83b\x83g\x93??\xE6\x82\xE8\x92x\x89\x84\x82?\xB5\x82\xBD\x82\xA2\x82?\xB1\x82?\x82\xAA\x81A
 				// \x8F\xAB\x97\x88\x92\xBC\x82\xB7\x82\xB1\x82??\xB7\x82\xE9\x81B
+				logputs(LOG_LEVEL_INFO, __FUNCTION__ ": now rekeying. channel open request is not sent.");
+
 				c = NULL;
 
 				return;
@@ -3779,6 +3810,7 @@
 			msg = buffer_init();
 			if (msg == NULL) {
 				// TODO: error check
+				logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
 				return;
 			}
 			s = "direct-tcpip";
@@ -4545,6 +4577,7 @@
 	msg = buffer_init();
 	if (msg == NULL) {
 		// TODO: error check
+		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
 		return;
 	}
 	if (pvar->my_kex != NULL)
@@ -5140,6 +5173,7 @@
 	msg = buffer_init();
 	if (msg == NULL) {
 		// TODO: error check
+		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
 		return;
 	}
 
@@ -5425,6 +5459,7 @@
 	msg = buffer_init();
 	if (msg == NULL) {
 		// TODO: error check
+		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
 		return;
 	}
 
@@ -6328,6 +6363,7 @@
 	msg = buffer_init();
 	if (msg == NULL) {
 		// TODO: error check
+		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
 		return FALSE;
 	}
 	s = "ssh-userauth";
@@ -6396,6 +6432,7 @@
 	msg = buffer_init();
 	if (msg == NULL) {
 		// TODO: error check
+		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
 		return FALSE;
 	}
 
@@ -6588,6 +6625,7 @@
 			msg = buffer_init();
 			if (msg == NULL) {
 				// TODO: error check
+				logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
 				return FALSE;
 			}
 			s = "ssh-heartbeat";
@@ -6753,6 +6791,7 @@
 	msg = buffer_init();
 	if (msg == NULL) {
 		// TODO: error check
+		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
 		return FALSE;
 	}
 	s = "session";
@@ -6985,11 +7024,14 @@
 	num = get_uint32_MSBfirst(data);
 	data += 4;
 
+	logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ": prompts=%d", num);
+
 	///////// step2
 	// \x83T\x81[\x83o\x82?p\x83X\x83t\x83\x8C\x81[\x83Y\x82?\xE9
 	msg = buffer_init();
 	if (msg == NULL) {
 		// TODO: error check
+		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
 		return FALSE;
 	}
 	buffer_put_int(msg, num);
@@ -7010,6 +7052,12 @@
 
 		// get boolean
 		echo = data[0];
+		data[0] = '\0'; // \x83\x8D\x83O\x8Fo\x97???A\x88?\x93I\x82\xC9 NUL Terminate \x82\xB7\x82\xE9
+
+		logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__ ":   prompt[%d]=\"%s\", echo=%d, pass-state=%d",
+			i, prompt, slen, pvar->keyboard_interactive_password_input);
+
+		data[0] = echo; // \x83\x8D\x83O\x8Fo\x97?\xF0\x8Ds\x82\xC1\x82\xBD\x82?ŁA\x8C\xB3\x82?l\x82?\x91\x82\xAB\x96?\xB7
 		data += 1;
 
 		// keyboard-interactive method (2005.3.12 yutaka)
@@ -7037,7 +7085,7 @@
 	finish_send_packet(pvar);
 	buffer_free(msg);
 
-	logputs(LOG_LEVEL_VERBOSE, "SSH2_MSG_USERAUTH_INFO_RESPONSE was sent at handle_SSH2_userauth_inforeq().");
+	logputs(LOG_LEVEL_VERBOSE, __FUNCTION__ ": sending SSH2_MSG_USERAUTH_INFO_RESPONSE.");
 	return TRUE;
 }
 
@@ -7302,6 +7350,7 @@
 	msg = buffer_init();
 	if (msg == NULL) {
 		// TODO: error check
+		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
 		return FALSE;
 	}
 
@@ -7390,11 +7439,13 @@
 	msg = buffer_init();
 	if (msg == NULL) {
 		// TODO: error check
+		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL. (msg)");
 		return FALSE;
 	}
 	ttymsg = buffer_init();
 	if (ttymsg == NULL) {
 		// TODO: error check
+		logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL. (ttymsg)");
 		buffer_free(msg);
 		return FALSE;
 	}
@@ -7493,6 +7544,7 @@
 	c = ssh2_channel_lookup(id);
 	if (c == NULL) {
 		// TODO:
+		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": channel not found. (%d)", id);
 		return FALSE;
 	}
 
@@ -7606,6 +7658,7 @@
 	c = ssh2_channel_lookup(id);
 	if (c == NULL) {
 		// TODO: SSH2_MSG_DISCONNECT\x82?\xE9
+		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": channel not found. (%d)", id);
 		return FALSE;
 	}
 
@@ -7752,6 +7805,7 @@
 		c = ssh2_channel_lookup(pvar->shell_id);
 		if (c == NULL) {
 			// TODO: error check
+			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": shell channel not found.");
 			return FALSE;
 		}
 		pvar->agentfwd_enable = TRUE;
@@ -7764,6 +7818,7 @@
 		c = ssh2_channel_lookup(pvar->shell_id);
 		if (c == NULL) {
 			// TODO: error check
+			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": shell channel not found.");
 			return FALSE;
 		}
 
@@ -7799,6 +7854,7 @@
 	c = ssh2_channel_lookup(channel_id);
 	if (c == NULL) {
 		// TODO: error check
+		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": channel not found. (%d)", channel_id);
 		return FALSE;
 	}
 
@@ -7847,6 +7903,7 @@
 		msg = buffer_init();
 		if (msg == NULL) {
 			// TODO: error check
+			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
 			return;
 		}
 		buffer_put_int(msg, c->remote_id);
@@ -7882,6 +7939,7 @@
 		msg = buffer_init();
 		if (msg == NULL) {
 			// TODO: error check
+			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
 			return;
 		}
 		buffer_put_int(msg, c->remote_id);
@@ -8548,8 +8606,6 @@
 	// \x83p\x83P\x83b\x83g\x83T\x83C\x83Y - (\x83p\x83f\x83B\x83\x93\x83O\x83T\x83C\x83Y+1)\x81G\x90^\x82?p\x83P\x83b\x83g\x83T\x83C\x83Y
 	len = pvar->ssh_state.payloadlen;
 
-	//debug_print(80, data, len);
-
 	// channel number
 	id = get_uint32_MSBfirst(data);
 	data += 4;
@@ -8557,17 +8613,16 @@
 	c = ssh2_channel_lookup(id);
 	if (c == NULL) {
 		// TODO:
+		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": channel not found. (%d)", id);
 		return FALSE;
 	}
 
-	logprintf(LOG_LEVEL_SSHDUMP, "SSH2_MSG_CHANNEL_DATA was received. local:%d remote:%d", c->self_id, c->remote_id);
-
 	// string length
 	str_len = get_uint32_MSBfirst(data);
 	data += 4;
 
-	// RAW\x83p\x83P\x83b\x83g\x83_\x83\x93\x83v\x82\xF0\x92?\xC1 (2008.8.15 yutaka)
 	if (LogLevel(pvar, LOG_LEVEL_SSHDUMP)) {
+		logprintf(LOG_LEVEL_SSHDUMP, "SSH2_MSG_CHANNEL_DATA was received. local:%d remote:%d len:%d", c->self_id, c->remote_id, str_len);
 		init_memdump();
 		push_memdump("SSH receiving packet", "PKT_recv", (char *)data, str_len);
 	}
@@ -8574,11 +8629,14 @@
 
 	// \x83o\x83b\x83t\x83@\x83T\x83C\x83Y\x82?`\x83F\x83b\x83N
 	if (str_len > c->local_maxpacket) {
-		// TODO: logging
+		logprintf(LOG_LEVEL_WARNING, __FUNCTION__ ": Data length is larger than local_maxpacket. "
+			"len:%d local_maxpacket:%d", str_len, c->local_maxpacket);
 	}
 	if (str_len > c->local_window) {
 		// TODO: logging
 		// local window size\x82\xE6\x82\xE8\x91?\x82?p\x83P\x83b\x83g\x82??Ă\xE9
+		logprintf(LOG_LEVEL_WARNING, __FUNCTION__ ": Data length is larger than local_window. "
+			"len:%d local_window:%d", str_len, c->local_window);
 		return FALSE;
 	}
 
@@ -8603,8 +8661,6 @@
 		}
 	}
 
-	//debug_print(200, data, strlen);
-
 	// \x83E\x83B\x83\x93\x83h\x83E\x83T\x83C\x83Y\x82?\xB2\x90\xAE
 	c->local_window -= str_len;
 
@@ -8642,6 +8698,7 @@
 	c = ssh2_channel_lookup(id);
 	if (c == NULL) {
 		// TODO:
+		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": channel not found. (%d)", id);
 		return FALSE;
 	}
 
@@ -8656,10 +8713,14 @@
 	// \x83o\x83b\x83t\x83@\x83T\x83C\x83Y\x82?`\x83F\x83b\x83N
 	if (strlen > c->local_maxpacket) {
 		// TODO: logging
+		logprintf(LOG_LEVEL_WARNING, __FUNCTION__ ": Data length is larger than local_maxpacket. "
+			"len:%d local_maxpacket:%d", strlen, c->local_maxpacket);
 	}
 	if (strlen > c->local_window) {
 		// TODO: logging
 		// local window size\x82\xE6\x82\xE8\x91?\x82?p\x83P\x83b\x83g\x82??Ă\xE9
+		logprintf(LOG_LEVEL_WARNING, __FUNCTION__ ": Data length is larger than local_window. "
+			"len:%d local_window:%d", strlen, c->local_window);
 		return FALSE;
 	}
 
@@ -8715,6 +8776,7 @@
 	c = ssh2_channel_lookup(id);
 	if (c == NULL) {
 		// TODO:
+		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": channel not found. (%d)", id);
 		return FALSE;
 	}
 
@@ -8870,6 +8932,7 @@
 			msg = buffer_init();
 			if (msg == NULL) {
 				// TODO: error check
+				logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
 				return FALSE;
 			}
 			buffer_put_int(msg, remote_id);
@@ -8919,6 +8982,7 @@
 	c = ssh2_channel_lookup(id);
 	if (c == NULL) {
 		// TODO:
+		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": channel not found. (%d)", id);
 		return FALSE;
 	}
 
@@ -8978,6 +9042,7 @@
 	c = ssh2_channel_lookup(id);
 	if (c == NULL) {
 		// TODO:
+		logprintf(LOG_LEVEL_ERROR, __FUNCTION__ ": channel not found. (%d)", id);
 		return FALSE;
 	}
 
@@ -9024,6 +9089,7 @@
 		msg = buffer_init();
 		if (msg == NULL) {
 			// TODO: error check
+			logputs(LOG_LEVEL_ERROR, __FUNCTION__ ": buffer_init returns NULL.");
 			return FALSE;
 		}
 		buffer_put_int(msg, c->remote_id);
@@ -9070,6 +9136,7 @@
 	if (c == NULL) {
 		// channel close\x8C\xE3\x82\xC9adjust message\x82\xAA\x92x\x82\xEA\x82Ă\xE2\x82\xC1\x82Ă\xAD\x82\xE9\x83P\x81[\x83X\x82\xE0\x82\xA0\x82邽\x82?A
 		// FALSE\x82ł??\xB3\x82?\xA2\x82悤\x82?\xB7\x82\xE9\x81B(2007.12.26 yutaka)
+		logprintf(LOG_LEVEL_WARNING, __FUNCTION__ ": channel not found. (%d)", id);
 		return TRUE;
 	}
 

From svnnotify ＠ sourceforge.jp  Mon Jun 26 21:08:36 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 26 Jun 2017 21:08:36 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY4MjVdICDlhazplovpjbXoqo3oqLzjgadF?=
 =?utf-8?b?Q0RTQeOBrlNFQ1NI5b2i5byP56eY5a+G6Y2144Gr5a++5b+c?=
Message-ID: <1498478916.961728.52654.nullmailer@users.sourceforge.jp>

Revision: 6825
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6825
Author:   maya
Date:     2017-06-26 21:08:36 +0900 (Mon, 26 Jun 2017)
Log Message:
-----------
公開鍵認証でECDSAのSECSH形式秘密鍵に対応

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/keyfiles.c

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/keyfiles.c
===================================================================
--- trunk/ttssh2/ttxssh/keyfiles.c	2017-06-26 10:38:37 UTC (rev 6824)
+++ trunk/ttssh2/ttxssh/keyfiles.c	2017-06-26 12:08:36 UTC (rev 6825)
@@ -1383,6 +1383,9 @@
 	else if (strncmp(blob->buf + blob->offset, "dl-modp{sign{dsa", strlen("dl-modp{sign{dsa") - 1) == 0) {
 		result->type = KEY_DSA;
 	}
+	else if (strncmp(blob->buf + blob->offset, "ec-modp", strlen("ec-modp") - 1) == 0) {
+		result->type = KEY_ECDSA256;
+	}
 	else {
 		strncpy_s(errmsg, errmsg_len, "unknown key type", _TRUNCATE);
 		goto error;
@@ -1522,6 +1525,73 @@
 
 		break;
 	}
+	case KEY_ECDSA256:
+	{
+		unsigned int dummy, nid;
+		int success = 0;
+		char *curve = NULL;
+		BIGNUM *exponent = NULL;
+		EC_POINT *q = NULL;
+		BN_CTX *ctx = NULL;
+
+		dummy = buffer_get_int(blob2);
+		curve = buffer_get_string_msg(blob2, NULL);
+
+		if (strncmp(curve, "nistp256", strlen("nistp256")) == 0) {
+			result->type = KEY_ECDSA256;
+		}
+		else if (strncmp(curve, "nistp384", strlen("nistp384")) == 0) {
+			result->type = KEY_ECDSA384;
+		}
+		else if (strncmp(curve, "nistp521", strlen("nistp521")) == 0) {
+			result->type = KEY_ECDSA521;
+		}
+		else {
+			strncpy_s(errmsg, errmsg_len, "key type error", _TRUNCATE);
+			goto error;
+		}
+
+		nid = keytype_to_cipher_nid(result->type);
+		if ((result->ecdsa = EC_KEY_new_by_curve_name(nid)) == NULL)
+			goto ecdsa_error;
+		if ((q = EC_POINT_new(EC_KEY_get0_group(result->ecdsa))) == NULL)
+			goto ecdsa_error;
+		if ((exponent = BN_new()) == NULL)
+			goto ecdsa_error;
+
+		buffer_get_bignum_SECSH(blob2, exponent);
+		if (EC_KEY_set_private_key(result->ecdsa, exponent) != 1)
+			goto ecdsa_error;
+		if (key_ec_validate_private(result->ecdsa) != 0)
+			goto ecdsa_error;
+
+		// \x83t\x83@\x83C\x83\x8B\x82??閧\x8C\xAE\x82\xB5\x82\xA9\x8Ai\x94[\x82\xB3\x82\xEA\x82Ă\xA2\x82?\xA2\x82?Ō\xF6\x8AJ\x8C\xAE\x82\xF0\x8Cv\x8EZ\x82ŋ\x81\x82?\xE9
+		if ((ctx = BN_CTX_new()) == NULL)
+			goto ecdsa_error;
+		if (!EC_POINT_mul(EC_KEY_get0_group(result->ecdsa), q, exponent, NULL, NULL, ctx)) {
+			goto ecdsa_error;
+		}
+		if (EC_KEY_set_public_key(result->ecdsa, q) != 1)
+			goto ecdsa_error;
+		if (key_ec_validate_public(EC_KEY_get0_group(result->ecdsa),
+		                           EC_KEY_get0_public_key(result->ecdsa)) != 0)
+			goto ecdsa_error;
+
+		success = 1;
+
+ecdsa_error:
+		free(curve);
+		if (exponent)
+			BN_clear_free(exponent);
+		if (q)
+			EC_POINT_free(q);
+		if (ctx)
+			BN_CTX_free(ctx);
+		if (success == 0)
+			goto error;
+
+		break;
+	}
 	default:
 		strncpy_s(errmsg, errmsg_len, "key type error", _TRUNCATE);
 		goto error;

From svnnotify ＠ sourceforge.jp  Mon Jun 26 21:30:46 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 26 Jun 2017 21:30:46 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY4MjZdICDlpInmm7TlsaXmrbTmm7TmlrAg?=
 =?utf-8?q?=28_r6818=2Cr6825=29?=
Message-ID: <1498480246.493924.84864.nullmailer@users.sourceforge.jp>

Revision: 6826
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6826
Author:   maya
Date:     2017-06-26 21:30:46 +0900 (Mon, 26 Jun 2017)
Log Message:
-----------
変更履歴更新 (r6818,r6825)

Revision Links:
--------------
    http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6818
    http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6825

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2017-06-26 12:08:36 UTC (rev 6825)
+++ trunk/doc/en/html/about/history.html	2017-06-26 12:30:46 UTC (rev 6826)
@@ -2910,10 +2910,12 @@
 
 <h3><a name="ttssh_2.82">2017.08.31 (Ver 2.82)</a></h3>
 <ul class="history">
-  <!--li>Changes
+  <li>Changes
     <ul>
+      <li>added support for the PuTTY format ECSDA private key and Ed25519 private key for SSH2 public key authentication.</li>
+      <li>added support for the SECSH(ssh.com) format ECSDA private key for SSH2 public key authentication.</li>
     </ul>
-  </li-->
+  </li>
 
   <li>Bug fixes
     <ul>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2017-06-26 12:08:36 UTC (rev 6825)
+++ trunk/doc/ja/html/about/history.html	2017-06-26 12:30:46 UTC (rev 6826)
@@ -2916,10 +2916,12 @@
 
 <h3><a name="ttssh_2.82">2017.08.31 (Ver 2.82)</a></h3>
 <ul class="history">
-  <!--li>\x95ύX
+  <li>\x95ύX
     <ul>
+      <li>SSH2 \x8C\xF6\x8AJ\x8C\xAE\x94F\x8F?ŁAPuTTY \x8C`\x8E\xAE\x82\xCC ECSDA \x94閧\x8C\xAE\x82\xA8\x82\xE6\x82\xD1 Ed25519 \x94閧\x8C\xAE\x82?Ή\x9E\x82\xB5\x82\xBD\x81B</li>
+      <li>SSH2 \x8C\xF6\x8AJ\x8C\xAE\x94F\x8F?ŁASECSH(ssh.com) \x8C`\x8E\xAE\x82\xCC ECSDA \x94閧\x8C\xAE\x82?Ή\x9E\x82\xB5\x82\xBD\x81B</li>
     </ul>
-  </li-->
+  </li>
 
   <li>\x83o\x83O\x8FC\x90\xB3
     <ul>

From svnnotify ＠ sourceforge.jp  Mon Jun 26 21:54:13 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 26 Jun 2017 21:54:13 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY4MjddICDlpInmm7TlsaXmrbTmm7TmlrA=?=
Message-ID: <1498481653.928120.117092.nullmailer@users.sourceforge.jp>

Revision: 6827
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6827
Author:   maya
Date:     2017-06-26 21:54:13 +0900 (Mon, 26 Jun 2017)
Log Message:
-----------
変更履歴更新

試訳と思われるものを削除

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2017-06-26 12:30:46 UTC (rev 6826)
+++ trunk/doc/en/html/about/history.html	2017-06-26 12:54:13 UTC (rev 6827)
@@ -2921,7 +2921,6 @@
     <ul>
       <li>When the password chaning dialog is canceled on password authentication, corrupted character will output at the debug lof.</li>
       <li>When the chaging window size is notified on SSHv1 connection, right window size(pixel count) is notified.</li>
-      <li>When the window size change is notified, the right window size(pixel) can be reported.</li>
     </ul>
   </li>
 

From svnnotify ＠ sourceforge.jp  Mon Jun 26 22:19:57 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Mon, 26 Jun 2017 22:19:57 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY4MjhdICDpjbXjg5XjgqHjgqTjg6vjga4=?=
 =?utf-8?b?44OV44Kp44O844Oe44OD44OI44KS6L+96KiY?=
Message-ID: <1498483197.644577.7640.nullmailer@users.sourceforge.jp>

Revision: 6828
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6828
Author:   maya
Date:     2017-06-26 22:19:57 +0900 (Mon, 26 Jun 2017)
Log Message:
-----------
鍵ファイルのフォーマットを追記

ドキュメントがあるわけではないので現状から。
動いているので間違ってはいないと思うが取れる裏がない。

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/keyfiles.c

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/keyfiles.c
===================================================================
--- trunk/ttssh2/ttxssh/keyfiles.c	2017-06-26 12:54:13 UTC (rev 6827)
+++ trunk/ttssh2/ttxssh/keyfiles.c	2017-06-26 13:19:57 UTC (rev 6828)
@@ -749,6 +749,33 @@
  *
  *    mpint  x                  (the private key parameter)
  *
+ * for "ecdsa-sha2-nistp256" or
+ *     "ecdsa-sha2-nistp384" or
+ *     "ecdsa-sha2-nistp521", it will be composed of
+ *
+ * "Public-Lines: " plus a number N.
+ *
+ *    string  "ecdsa-sha2-[identifier]" ("ecdsa-sha2-nistp256" or
+ *                                       "ecdsa-sha2-nistp384" or
+ *                                       "ecdsa-sha2-nistp521")
+ *    string  [identifier] ("nistp256" or "nistp384" or "nistp521")
+ *    string  Q            (EC_POINT)
+ *
+ * "Private-Lines: " plus a number N,
+ *
+ *    mpint  n
+ *
+ * for "ssh-ed25519", it will be composed of
+ *
+ * "Public-Lines: " plus a number N.
+ *
+ *    string "ssh-ed25519"
+ *    string key
+ *
+ * "Private-Lines: " plus a number N,
+ *
+ *    string key
+ *
  * "Private-MAC: " plus a hex, HMAC-SHA-1 of:
  *
  *    string name of algorithm ("ssh-dss", "ssh-rsa")
@@ -1261,6 +1288,7 @@
  * 
  *   `if-modn{sign{rsa-pkcs1-sha1},encrypt{rsa-pkcs1v2-oaep}}'
  *   `dl-modp{sign{dsa-nist-sha1},dh{plain}}'
+ *   `ec-modp'
  *
  * The encryption. The cipher-type string appears to be either
  *
@@ -1282,6 +1310,11 @@
  *  - mpint q
  *  - mpint y
  *  - mpint x
+ *
+ * For a ECDSA key, the payload blob contains:
+ *  - uint32 1
+ *  - string [identifier] ("nistp256" or "nistp384" or "nistp521")
+ *  - mpint  n
  */
 Key *read_SSH2_SECSH_private_key(PTInstVar pvar,
                                  FILE * fp,

From svnnotify ＠ sourceforge.jp  Tue Jun 27 12:10:06 2017
From: svnnotify ＠ sourceforge.jp (svnnotify ＠ sourceforge.jp)
Date: Tue, 27 Jun 2017 12:10:06 +0900
Subject: [Ttssh2-commit] =?utf-8?b?WzY4MjldICDjgrPjg7zjg4nmlbTnkIY=?=
Message-ID: <1498533006.883539.37087.nullmailer@users.sourceforge.jp>

Revision: 6829
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6829
Author:   doda
Date:     2017-06-27 12:10:06 +0900 (Tue, 27 Jun 2017)
Log Message:
-----------
コード整理

・不用な処理/変数を削除
・双方向で接続中を表す FWD_BOTH_CONNECTED を定義し、それを使うように
・ログ出力を微修正

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/fwd.c
    trunk/ttssh2/ttxssh/fwd.h

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/fwd.c
===================================================================
--- trunk/ttssh2/ttxssh/fwd.c	2017-06-26 13:19:57 UTC (rev 6828)
+++ trunk/ttssh2/ttxssh/fwd.c	2017-06-27 03:10:06 UTC (rev 6829)
@@ -231,8 +231,7 @@
 {
 	FWDChannel *channel = pvar->fwd_state.channels + channel_num;
 
-	if ((channel->status & (FWD_REMOTE_CONNECTED | FWD_LOCAL_CONNECTED))
-	 == (FWD_REMOTE_CONNECTED | FWD_LOCAL_CONNECTED)) {
+	if ((channel->status & FWD_BOTH_CONNECTED) == FWD_BOTH_CONNECTED) {
 		SSH_channel_input_eof(pvar, channel->remote_num, channel_num);
 		SSH_channel_output_eof(pvar, channel->remote_num);
 		channel->status |= FWD_CLOSED_LOCAL_IN | FWD_CLOSED_LOCAL_OUT;
@@ -599,8 +598,7 @@
 	char hname[NI_MAXHOST];
 	char strport[NI_MAXSERV]; // ws2tcpip.h
 	int addrlen = sizeof(addr);
-	char buf[1024];
-	BYTE *IP;
+	int port;
 	FWDChannel *channel;
 	FWDRequest *request = &pvar->fwd_state.requests[request_num];
 	BOOL is_localhost = FALSE;
@@ -610,8 +608,6 @@
 	if (s == INVALID_SOCKET)
 		return;
 
-	IP = (BYTE *) & ((struct sockaddr_in *) (&addr))->sin_addr.s_addr;
-
 	// SSH2 port-forwarding\x82??\xB1\x8C\xB3\x82?\x8A\x83\x82\x81[\x83g\x83|\x81[\x83g\x82\xAA\x95K\x97v\x81B(2005.2.27 yutaka)
 	if (getnameinfo
 	    ((struct sockaddr *) &addr, addrlen, hname, sizeof(hname),
@@ -618,13 +614,13 @@
 	     strport, sizeof(strport), NI_NUMERICHOST | NI_NUMERICSERV)) {
 		/* NOT REACHED */
 	}
-	logprintf(LOG_LEVEL_VERBOSE,
-	          "Host %s connecting to port %d; forwarding to %s:%d",
-	          hname, request->spec.from_port, request->spec.to_host,
+	port = atoi(strport);
+
+	logprintf(LOG_LEVEL_VERBOSE, __FUNCTION__
+	          ": Host %s(%d) connecting to port %d; forwarding to %s:%d",
+	          hname, port, request->spec.from_port, request->spec.to_host,
 	          request->spec.to_port);
 
-	strncpy_s(buf, sizeof(buf), hname, _TRUNCATE);
-
 	channel_num = alloc_channel(pvar, FWD_LOCAL_CONNECTED, request_num);
 	channel = pvar->fwd_state.channels + channel_num;
 
@@ -634,7 +630,7 @@
 
 	// add originator-port (2005.2.27 yutaka)
 	SSH_open_channel(pvar, channel_num, request->spec.to_host,
-	                 request->spec.to_port, buf, atoi(strport));
+	                 request->spec.to_port, hname, port);
 }
 
 static void write_local_connection_buffer(PTInstVar pvar, int channel_num)
@@ -641,8 +637,7 @@
 {
 	FWDChannel *channel = pvar->fwd_state.channels + channel_num;
 
-	if ((channel->status & (FWD_REMOTE_CONNECTED | FWD_LOCAL_CONNECTED))
-	 == (FWD_REMOTE_CONNECTED | FWD_LOCAL_CONNECTED)) {
+	if ((channel->status & FWD_BOTH_CONNECTED) == FWD_BOTH_CONNECTED) {
 		if (!UTIL_sock_write_more
 			(pvar, &channel->writebuf, channel->local_socket)) {
 			channel_error(pvar, "writing", channel_num, WSAGetLastError());
@@ -654,8 +649,7 @@
 {
 	FWDChannel *channel = pvar->fwd_state.channels + channel_num;
 
-	if ((channel->status & (FWD_REMOTE_CONNECTED | FWD_LOCAL_CONNECTED))
-	 != (FWD_REMOTE_CONNECTED | FWD_LOCAL_CONNECTED)) {
+	if ((channel->status & FWD_BOTH_CONNECTED) != FWD_BOTH_CONNECTED) {
 		return;
 	}
 

Modified: trunk/ttssh2/ttxssh/fwd.h
===================================================================
--- trunk/ttssh2/ttxssh/fwd.h	2017-06-26 13:19:57 UTC (rev 6828)
+++ trunk/ttssh2/ttxssh/fwd.h	2017-06-27 03:10:06 UTC (rev 6829)
@@ -36,6 +36,7 @@
 
 #define FWD_REMOTE_CONNECTED  0x01
 #define FWD_LOCAL_CONNECTED   0x02
+#define FWD_BOTH_CONNECTED    (FWD_REMOTE_CONNECTED | FWD_LOCAL_CONNECTED)
 #define FWD_CLOSED_REMOTE_IN  0x04
 #define FWD_CLOSED_REMOTE_OUT 0x08
 #define FWD_CLOSED_LOCAL_IN   0x10