Tera TermRevision: 9850
https://osdn.net/projects/ttssh2/scm/svn/commits/9850
Author: zmatsuo
Date: 2022-04-09 17:11:30 +0900 (Sat, 09 Apr 2022)
Log Message:
-----------
TopicName未指定時にデフォルト値を正しくセットしていなかった
- マクロ起動時の引数が未指定時
- TTPMACRO /D=TopicName
- ウィンドウハンドルを文字列化してTopicNameとする
Modified Paths:
--------------
trunk/teraterm/ttpmacro/ttl.cpp
-------------- next part --------------
Modified: trunk/teraterm/ttpmacro/ttl.cpp
===================================================================
--- trunk/teraterm/ttpmacro/ttl.cpp 2022-04-08 15:38:10 UTC (rev 9849)
+++ trunk/teraterm/ttpmacro/ttl.cpp 2022-04-09 08:11:30 UTC (rev 9850)
@@ -591,6 +591,13 @@
// link to Tera Term
if (wcslen(TopicName)==0)
{
+ char TopicNameA[11];
+ w = HIWORD(HMainWin);
+ Word2HexStr(w,TopicNameA);
+ w = LOWORD(HMainWin);
+ Word2HexStr(w,&(TopicNameA[4]));
+ ACPToWideChar_t(TopicNameA, TopicName, _countof(TopicName));
+
switch (mode) {
case RsvConnect:
strncpy_s(Cmnd, sizeof(Cmnd),TTERMCOMMAND, _TRUNCATE);
@@ -599,15 +606,9 @@
strncpy_s(Cmnd, sizeof(Cmnd),CYGTERMCOMMAND, _TRUNCATE);
break;
}
- char *TopicNameA = ToCharW(TopicName);
- w = HIWORD(HMainWin);
- Word2HexStr(w,TopicNameA);
- w = LOWORD(HMainWin);
- Word2HexStr(w,&(TopicNameA[4]));
strncat_s(Cmnd,sizeof(Cmnd),TopicNameA,_TRUNCATE);
strncat_s(Cmnd,sizeof(Cmnd)," ",_TRUNCATE);
strncat_s(Cmnd,sizeof(Cmnd),Str,_TRUNCATE);
- free(TopicNameA);
if (WinExec(Cmnd,SW_SHOW)<32)
return ErrCantConnect;
TTLStatus = IdTTLInitDDE;