Tera TermRevision: 9137
https://osdn.net/projects/ttssh2/scm/svn/commits/9137
Author: zmatsuo
Date: 2021-01-27 23:40:46 +0900 (Wed, 27 Jan 2021)
Log Message:
-----------
処理できなかったときの戻り値を返す条件を変更
- 戻り値 DDE_FNOTPROCESSED
- トランザクションを無視する場合に返す
- r8788 で CBStartSend() の使用をやめた
- 文字送信 Unicode 化のため
- 処理しなかった時の条件を変更していなかった
Revision Links:
--------------
https://osdn.net/projects/ttssh2/scm/svn/commits/8788
Modified Paths:
--------------
trunk/teraterm/teraterm/ttdde.c
-------------- next part --------------
Modified: trunk/teraterm/teraterm/ttdde.c
===================================================================
--- trunk/teraterm/teraterm/ttdde.c 2021-01-27 14:40:25 UTC (rev 9136)
+++ trunk/teraterm/teraterm/ttdde.c 2021-01-27 14:40:46 UTC (rev 9137)
@@ -329,6 +329,7 @@
{
LPSTR DataPtr;
DWORD DataSize;
+ HDDEDATA result;
// \x98A\x91\xB1\x82\xB5\x82\xC4XTYP_POKE\x82\xAA\x83N\x83\x89\x83C\x83A\x83\x93\x83g\x81i\x83}\x83N\x83\x8D\x81j\x82\xA9\x82瑗\x82\xE7\x82\xEA\x82Ă\xAD\x82\xE9\x82ƁA\x83T\x81[\x83o\x81i\x96{\x91́j\x91\xA4\x82\xAA\x82܂\xBE
// \x83R\x83}\x83\x93\x83h\x82̓\\x82\xE8\x95t\x82\xAF\x82\xF0\x8Ds\x82\xC1\x82Ă\xA2\x82Ȃ\xA2\x8Fꍇ\x81ATalkStatus\x82\xCD IdTalkCB \x82ɂȂ̂ŁADDE_FNOTPROCESSED\x82\xF0
@@ -343,9 +344,9 @@
if (DdeCmpStringHandles(ItemHSz, Item) != 0) return DDE_FNOTPROCESSED;
+ result = (HDDEDATA)DDE_FNOTPROCESSED;
DataPtr = DdeAccessData(Data,&DataSize);
- if (DataPtr==NULL) return DDE_FNOTPROCESSED;
- {
+ if (DataPtr != NULL) {
wchar_t *strW = ToWcharU8(DataPtr);
if (strW != NULL) {
SendMem *sm = SendMemTextW(strW, 0);
@@ -353,14 +354,12 @@
SendMemInitEcho(sm, FALSE);
SendMemInitDelay(sm, SENDMEM_DELAYTYPE_PER_LINE, 10, 0);
SendMemStart(sm);
+ result = (HDDEDATA)DDE_FACK;
}
}
}
DdeUnaccessData(Data);
- if (TalkStatus==IdTalkCB)
- return (HDDEDATA)DDE_FACK;
- else
- return DDE_FNOTPROCESSED;
+ return result;
}
static WORD HexStr2Word(PCHAR Str)
@@ -1174,7 +1173,6 @@
// made after the link to TT(P)MACRO is established.
{
PROCESS_INFORMATION pi;
- int i;
char Cmnd[MAX_PATH+36]; // "TTPMACRO /D="(12) + TopicName(20) + " "(1) + MAX_PATH + " /S"(3)
STARTUPINFO si;
DWORD pri = NORMAL_PRIORITY_CLASS;
@@ -1193,6 +1191,7 @@
strncat_s(Cmnd,sizeof(Cmnd),TopicName,_TRUNCATE);
if (FName!=NULL)
{
+ size_t i;
strncat_s(Cmnd,sizeof(Cmnd)," ",_TRUNCATE);
i = strlen(Cmnd);
strncat_s(Cmnd,sizeof(Cmnd),FName,_TRUNCATE);