[Ttssh2-commit] [6895] パイプが使用中の場合のメッセージを追加。

svnno****@sourc***** svnno****@sourc*****
2017年 8月 9日 (水) 22:22:24 JST


Revision: 6895
          http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6895
Author:   doda
Date:     2017-08-09 22:22:24 +0900 (Wed, 09 Aug 2017)
Log Message:
-----------
パイプが使用中の場合のメッセージを追加。

COM ポートが他で使用中の時は ERROR_ACCESS_DENIED になるっぽい。

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/teraterm/teraterm/commlib.c

-------------- next part --------------
Modified: trunk/installer/release/lang/English.lng
===================================================================
--- trunk/installer/release/lang/English.lng	2017-08-09 13:08:47 UTC (rev 6894)
+++ trunk/installer/release/lang/English.lng	2017-08-09 13:22:24 UTC (rev 6895)
@@ -291,6 +291,7 @@
 MSG_CANTOPEN_ERROR=Cannot open %s. (0x%08x)
 MSG_CANTOPEN_ERROR_NOTFOUND=Cannot open %s. Not found.
 MSG_CANTOPEN_ERROR_DENIED=Cannot open %s. Access denied.
+MSG_CANTOPEN_ERROR_PIPEBUSY=Cannot open %s. Pipe is busy.
 MSG_CANTOPEN_FILE_ERROR=Cannot open file
 MSG_COMM_REFUSE_ERROR=Connection refused
 MSG_COMM_REACH_ERROR=Network cannot be reached

Modified: trunk/installer/release/lang/French.lng
===================================================================
--- trunk/installer/release/lang/French.lng	2017-08-09 13:08:47 UTC (rev 6894)
+++ trunk/installer/release/lang/French.lng	2017-08-09 13:22:24 UTC (rev 6895)
@@ -291,7 +291,8 @@
 MSG_INVALID_HOST_ERROR=H\xF4te invalide
 MSG_CANTOPEN_ERROR=Impossible d'ouvrir %s (0x%08x)
 MSG_CANTOPEN_ERROR_NOTFOUND=Cannot open %s. Not found.
-MSG_CANTOPEN_ERROR_DENIED=Cannot open %s. Access denied
+MSG_CANTOPEN_ERROR_DENIED=Cannot open %s. Access denied.
+MSG_CANTOPEN_ERROR_PIPEBUSY=Cannot open %s. Pipe is busy.
 MSG_CANTOPEN_FILE_ERROR=Impossible d'ouvrir le fichier
 MSG_COMM_REFUSE_ERROR=Connexion refus\xE9e
 MSG_COMM_REACH_ERROR=Imossible d'atteindre le r\xE9seau

Modified: trunk/installer/release/lang/German.lng
===================================================================
--- trunk/installer/release/lang/German.lng	2017-08-09 13:08:47 UTC (rev 6894)
+++ trunk/installer/release/lang/German.lng	2017-08-09 13:22:24 UTC (rev 6895)
@@ -291,7 +291,8 @@
 MSG_INVALID_HOST_ERROR=Falscher Hostname
 MSG_CANTOPEN_ERROR=Kann %s nicht \xF6ffnen (0x%08x)
 MSG_CANTOPEN_ERROR_NOTFOUND=Cannot open %s. Not found.
-MSG_CANTOPEN_ERROR_DENIED=Cannot open %s. Access denied
+MSG_CANTOPEN_ERROR_DENIED=Cannot open %s. Access denied.
+MSG_CANTOPEN_ERROR_PIPEBUSY=Cannot open %s. Pipe is busy.
 MSG_CANTOPEN_FILE_ERROR=Kann Datei nicht \xF6ffnen
 MSG_COMM_REFUSE_ERROR=Verbindung ist abgebrochen worden
 MSG_COMM_REACH_ERROR=Netzwerk ist nicht erreichbar

Modified: trunk/installer/release/lang/Japanese.lng
===================================================================
--- trunk/installer/release/lang/Japanese.lng	2017-08-09 13:08:47 UTC (rev 6894)
+++ trunk/installer/release/lang/Japanese.lng	2017-08-09 13:22:24 UTC (rev 6895)
@@ -291,6 +291,7 @@
 MSG_CANTOPEN_ERROR=%s\x82\xAA\x8AJ\x82\xAF\x82܂\xB9\x82\xF1 (0x%08x)
 MSG_CANTOPEN_ERROR_NOTFOUND=%s\x82\xAA\x8C\xA9\x82‚\xA9\x82\xE8\x82܂\xB9\x82\xF1\x81B
 MSG_CANTOPEN_ERROR_DENIED=%s\x82ւ̃A\x83N\x83Z\x83X\x82\xAA\x8B\x91\x94ۂ\xB3\x82\xEA\x82܂\xB5\x82\xBD\x81B
+MSG_CANTOPEN_ERROR_PIPEBUSY=%s\x82\xAA\x8AJ\x82\xAF\x82܂\xB9\x82\xF1\x81B\x91\xBC\x82Ŏg\x97p\x92\x86\x82ł\xB7\x81B
 MSG_CANTOPEN_FILE_ERROR=\x83t\x83@\x83C\x83\x8B\x82\xAA\x8AJ\x82\xAF\x82܂\xB9\x82\xF1
 MSG_COMM_REFUSE_ERROR=\x90ڑ\xB1\x82\xAA\x8B\x91\x94ۂ\xB3\x82\xEA\x82܂\xB5\x82\xBD
 MSG_COMM_REACH_ERROR=\x83l\x83b\x83g\x83\x8F\x81[\x83N\x82ɓ\x9E\x92B\x82ł\xAB\x82܂\xB9\x82\xF1

Modified: trunk/installer/release/lang/Korean.lng
===================================================================
--- trunk/installer/release/lang/Korean.lng	2017-08-09 13:08:47 UTC (rev 6894)
+++ trunk/installer/release/lang/Korean.lng	2017-08-09 13:22:24 UTC (rev 6895)
@@ -291,7 +291,8 @@
 MSG_INVALID_HOST_ERROR=\xC0߸\xF8\xB5\xC8 ȣ\xBD\xBAƮ
 MSG_CANTOPEN_ERROR=%s\xB8\xA6 \xBF\xAD \xBC\xF6 \xBE\xF8\xBD\xC0\xB4ϴ\xD9 (0x%08x)
 MSG_CANTOPEN_ERROR_NOTFOUND=Cannot open %s. Not found.
-MSG_CANTOPEN_ERROR_DENIED=Cannot open %s. Access denied
+MSG_CANTOPEN_ERROR_DENIED=Cannot open %s. Access denied.
+MSG_CANTOPEN_ERROR_PIPEBUSY=Cannot open %s. Pipe is busy.
 MSG_CANTOPEN_FILE_ERROR=\xC6\xC4\xC0\xCF\xC0\xBB \xBF\xAD \xBC\xF6 \xBE\xF8\xBD\xC0\xB4ϴ\xD9
 MSG_COMM_REFUSE_ERROR=\xBF\xAC\xB0\xE1\xC0\xCC \xB0źεƽ\xC0\xB4ϴ\xD9
 MSG_COMM_REACH_ERROR=\xB3\xD7Ʈ\xBF\xF7ũ\xBF\xA1 \xBF\xAC\xB0\xE1\xC7\xD2 \xBC\xF6 \xBE\xF8\xBD\xC0\xB4ϴ\xD9

Modified: trunk/installer/release/lang/Russian.lng
===================================================================
--- trunk/installer/release/lang/Russian.lng	2017-08-09 13:08:47 UTC (rev 6894)
+++ trunk/installer/release/lang/Russian.lng	2017-08-09 13:22:24 UTC (rev 6895)
@@ -291,7 +291,8 @@
 MSG_INVALID_HOST_ERROR=\xCD\xE5\xE2\xE5\xF0\xED\xFB\xE9 \xF5\xEE\xF1\xF2
 MSG_CANTOPEN_ERROR=\xCD\xE5 \xF3\xE4\xE0\xE5\xF2\xF1\xFF \xEE\xF2\xEA\xF0\xFB\xF2\xFC %s (0x%08x)
 MSG_CANTOPEN_ERROR_NOTFOUND=Cannot open %s. Not found.
-MSG_CANTOPEN_ERROR_DENIED=Cannot open %s. Access denied
+MSG_CANTOPEN_ERROR_DENIED=Cannot open %s. Access denied.
+MSG_CANTOPEN_ERROR_PIPEBUSY=Cannot open %s. Pipe is busy.
 MSG_CANTOPEN_FILE_ERROR=\xCD\xE5 \xF3\xE4\xE0\xE5\xF2\xF1\xFF \xEE\xF2\xEA\xF0\xFB\xF2\xFC \xF4\xE0\xE9\xEB
 MSG_COMM_REFUSE_ERROR=\xCE\xF2\xEA\xE0\xE7 \xE2 \xF1\xEE\xE5\xE4\xE8\xED\xE5\xED\xE8\xE8
 MSG_COMM_REACH_ERROR=\xD1\xE5\xF2\xFC \xED\xE5\xE4\xEE\xF1\xF2\xF3\xEF\xED\xE0

Modified: trunk/installer/release/lang/Simplified Chinese.lng
===================================================================
--- trunk/installer/release/lang/Simplified Chinese.lng	2017-08-09 13:08:47 UTC (rev 6894)
+++ trunk/installer/release/lang/Simplified Chinese.lng	2017-08-09 13:22:24 UTC (rev 6895)
@@ -291,7 +291,8 @@
 MSG_INVALID_HOST_ERROR=\xCE\xDEЧ\xB5\xC4\xD6\xF7\xBB\xFA\xB5\xD8ַ
 MSG_CANTOPEN_ERROR=%s \xB4\xF2\xBF\xAAʧ\xB0\xDC (0x%08x)
 MSG_CANTOPEN_ERROR_NOTFOUND=Cannot open %s. Not found.
-MSG_CANTOPEN_ERROR_DENIED=Cannot open %s. Access denied
+MSG_CANTOPEN_ERROR_DENIED=Cannot open %s. Access denied.
+MSG_CANTOPEN_ERROR_PIPEBUSY=Cannot open %s. Pipe is busy.
 MSG_CANTOPEN_FILE_ERROR=\xCEļ\xFE\xB4\xF2\xBF\xAAʧ\xB0\xDC
 MSG_COMM_REFUSE_ERROR=\xC1\xAC\xBDӱ\xBB\xBEܾ\xF8
 MSG_COMM_REACH_ERROR=\xCD\xF8\xC2粻\xBFɴ\xEF

Modified: trunk/installer/release/lang/Traditional Chinese.lng
===================================================================
--- trunk/installer/release/lang/Traditional Chinese.lng	2017-08-09 13:08:47 UTC (rev 6894)
+++ trunk/installer/release/lang/Traditional Chinese.lng	2017-08-09 13:22:24 UTC (rev 6895)
@@ -291,7 +291,8 @@
 MSG_INVALID_HOST_ERROR=\xB5L\xAEĪ\xBA\xA5D\xBE\xF7\xA6a\xA7}
 MSG_CANTOPEN_ERROR=%s \xA5\xB4\xB6}\xA5\xA2\xB1\xD1 (0x%08x)
 MSG_CANTOPEN_ERROR_NOTFOUND=Cannot open %s. Not found.
-MSG_CANTOPEN_ERROR_DENIED=Cannot open %s. Access denied
+MSG_CANTOPEN_ERROR_DENIED=Cannot open %s. Access denied.
+MSG_CANTOPEN_ERROR_PIPEBUSY=Cannot open %s. Pipe is busy.
 MSG_CANTOPEN_FILE_ERROR=\xA4\xE5\xA5󥴶}\xA5\xA2\xB1\xD1
 MSG_COMM_REFUSE_ERROR=\xB3s\xBDu\xB3Q\xA9ڵ\xB4
 MSG_COMM_REACH_ERROR=\xBA\xF4\xB8\x{1248E5}i\xB3s\xBDu

Modified: trunk/teraterm/teraterm/commlib.c
===================================================================
--- trunk/teraterm/teraterm/commlib.c	2017-08-09 13:08:47 UTC (rev 6894)
+++ trunk/teraterm/teraterm/commlib.c	2017-08-09 13:22:24 UTC (rev 6895)
@@ -543,6 +543,10 @@
 					get_lang_msg("MSG_CANTOPEN_ERROR_DENIED", ts->UIMsg, sizeof(ts->UIMsg), "Cannot open %s. Access denied.", ts->UILanguageFile);
 					_snprintf_s(ErrMsg, sizeof(ErrMsg), _TRUNCATE, ts->UIMsg, P);
 					break;
+				case ERROR_PIPE_BUSY:
+					get_lang_msg("MSG_CANTOPEN_ERROR_PIPEBUSY", ts->UIMsg, sizeof(ts->UIMsg), "Cannot open %s. Pipe is busy.", ts->UILanguageFile);
+					_snprintf_s(ErrMsg, sizeof(ErrMsg), _TRUNCATE, ts->UIMsg, P);
+					break;
 				default:
 					get_lang_msg("MSG_CANTOPEN_ERROR", ts->UIMsg, sizeof(ts->UIMsg), "Cannot open %s. (0x%08x)", ts->UILanguageFile);
 					_snprintf_s(ErrMsg, sizeof(ErrMsg), _TRUNCATE, ts->UIMsg, P, err);



Ttssh2-commit メーリングリストの案内