svnno****@sourc*****
svnno****@sourc*****
2017年 7月 25日 (火) 17:45:35 JST
Tera TermRevision: 6881
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6881
Author: doda
Date: 2017-07-25 17:45:35 +0900 (Tue, 25 Jul 2017)
Log Message:
-----------
DDE コマンドを Tera Term 本体と ttpmacro で二重管理していたので、共に一つのファイルを参照するように変更した。
Modified Paths:
--------------
trunk/teraterm/teraterm/ttdde.c
trunk/teraterm/ttpmacro/ttmdde.h
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
Added Paths:
-----------
trunk/teraterm/common/ttddecmnd.h
-------------- next part --------------
Added: trunk/teraterm/common/ttddecmnd.h
===================================================================
--- trunk/teraterm/common/ttddecmnd.h (rev 0)
+++ trunk/teraterm/common/ttddecmnd.h 2017-07-25 08:45:35 UTC (rev 6881)
@@ -0,0 +1,90 @@
+/*
+ * Copyright (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 AUTHORS ``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 AUTHORS 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
+
+#define CmdSetHWnd ' '
+#define CmdSetFile '!'
+#define CmdSetBinary '"'
+#define CmdSetAppend '#'
+#define CmdSetXmodemOpt '$'
+#define CmdSetSync '%'
+
+#define CmdBPlusRecv '&'
+#define CmdBPlusSend '\''
+#define CmdChangeDir '('
+#define CmdClearScreen ')'
+#define CmdCloseWin '*'
+#define CmdConnect '+'
+#define CmdDisconnect ','
+#define CmdEnableKeyb '-'
+#define CmdGetTitle '.'
+#define CmdInit '/'
+#define CmdKmtFinish '0'
+#define CmdKmtGet '1'
+#define CmdKmtRecv '2'
+#define CmdKmtSend '3'
+#define CmdLoadKeyMap '4'
+#define CmdLogClose '5'
+#define CmdLogOpen '6'
+#define CmdLogPause '7'
+#define CmdLogStart '8'
+#define CmdLogWrite '9'
+#define CmdQVRecv ':'
+#define CmdQVSend ';'
+#define CmdRestoreSetup '<'
+#define CmdSendBreak '='
+#define CmdSendFile '>'
+#define CmdSendKCode '?'
+#define CmdSetEcho '@'
+#define CmdSetTitle 'A'
+#define CmdShowTT 'B'
+#define CmdXmodemSend 'C'
+#define CmdXmodemRecv 'D'
+#define CmdZmodemSend 'E'
+#define CmdZmodemRecv 'F'
+#define CmdCallMenu 'G'
+#define CmdScpSend 'H'
+#define CmdScpRcv 'I'
+#define CmdSetSecondFile 'J'
+#define CmdSetBaud 'K'
+#define CmdSetRts 'L'
+#define CmdSetDtr 'M'
+#define CmdGetHostname 'N'
+#define CmdSendBroadcast 'O'
+#define CmdSendMulticast 'P'
+#define CmdSetMulticastName 'Q'
+#define CmdSetDebug 'R'
+#define CmdYmodemSend 'S'
+#define CmdYmodemRecv 'T'
+#define CmdDispStr 'U'
+#define CmdLogInfo 'V'
+#define CmdLogRotate 'W'
+#define CmdLogAutoClose 'X'
+#define CmdGetModemStatus 'Y'
+#define CmdSetFlowCtrl 'Z'
Modified: trunk/teraterm/teraterm/ttdde.c
===================================================================
--- trunk/teraterm/teraterm/ttdde.c 2017-07-25 08:45:31 UTC (rev 6880)
+++ trunk/teraterm/teraterm/ttdde.c 2017-07-25 08:45:35 UTC (rev 6881)
@@ -43,6 +43,7 @@
#include "keyboard.h"
#include "ttdde.h"
+#include "ttddecmnd.h"
#include "commlib.h"
#include "vtwin.h"
@@ -335,67 +336,6 @@
return w;
}
-#define CmdSetHWnd ' '
-#define CmdSetFile '!'
-#define CmdSetBinary '"'
-#define CmdSetAppend '#'
-#define CmdSetXmodemOpt '$'
-#define CmdSetSync '%'
-
-#define CmdBPlusRecv '&'
-#define CmdBPlusSend '\''
-#define CmdChangeDir '('
-#define CmdClearScreen ')'
-#define CmdCloseWin '*'
-#define CmdConnect '+'
-#define CmdDisconnect ','
-#define CmdEnableKeyb '-'
-#define CmdGetTitle '.'
-#define CmdInit '/'
-#define CmdKmtFinish '0'
-#define CmdKmtGet '1'
-#define CmdKmtRecv '2'
-#define CmdKmtSend '3'
-#define CmdLoadKeyMap '4'
-#define CmdLogClose '5'
-#define CmdLogOpen '6'
-#define CmdLogPause '7'
-#define CmdLogStart '8'
-#define CmdLogWrite '9'
-#define CmdQVRecv ':'
-#define CmdQVSend ';'
-#define CmdRestoreSetup '<'
-#define CmdSendBreak '='
-#define CmdSendFile '>'
-#define CmdSendKCode '?'
-#define CmdSetEcho '@'
-#define CmdSetTitle 'A'
-#define CmdShowTT 'B'
-#define CmdXmodemSend 'C'
-#define CmdXmodemRecv 'D'
-#define CmdZmodemSend 'E'
-#define CmdZmodemRecv 'F'
-#define CmdCallMenu 'G'
-#define CmdScpSend 'H'
-#define CmdScpRcv 'I'
-#define CmdSetSecondFile 'J'
-#define CmdSetBaud 'K'
-#define CmdSetRts 'L'
-#define CmdSetDtr 'M'
-#define CmdGetHostname 'N'
-#define CmdSendBroadcast 'O'
-#define CmdSendMulticast 'P'
-#define CmdSetMulticastName 'Q'
-#define CmdSetDebug 'R'
-#define CmdYmodemSend 'S'
-#define CmdYmodemRecv 'T'
-#define CmdDispStr 'U'
-#define CmdLogInfo 'V'
-#define CmdLogRotate 'W'
-#define CmdLogAutoClose 'X'
-#define CmdGetModemStatus 'Y'
-#define CmdSetFlowCtrl 'Z'
-
HDDEDATA AcceptExecute(HSZ TopicHSz, HDDEDATA Data)
{
char Command[MaxStrLen + 1];
Modified: trunk/teraterm/ttpmacro/ttmdde.h
===================================================================
--- trunk/teraterm/ttpmacro/ttmdde.h 2017-07-25 08:45:31 UTC (rev 6880)
+++ trunk/teraterm/ttpmacro/ttmdde.h 2017-07-25 08:45:35 UTC (rev 6881)
@@ -29,67 +29,8 @@
/* TTMACRO.EXE, DDE routines */
-#define CmdSetHWnd ' '
-#define CmdSetFile '!'
-#define CmdSetBinary '"'
-#define CmdSetAppend '#'
-#define CmdSetXmodemOpt '$'
-#define CmdSetSync '%'
+#include "ttddecmnd.h"
-#define CmdBPlusRecv '&'
-#define CmdBPlusSend '\''
-#define CmdChangeDir '('
-#define CmdClearScreen ')'
-#define CmdCloseWin '*'
-#define CmdConnect '+'
-#define CmdDisconnect ','
-#define CmdEnableKeyb '-'
-#define CmdGetTitle '.'
-#define CmdInit '/'
-#define CmdKmtFinish '0'
-#define CmdKmtGet '1'
-#define CmdKmtRecv '2'
-#define CmdKmtSend '3'
-#define CmdLoadKeyMap '4'
-#define CmdLogClose '5'
-#define CmdLogOpen '6'
-#define CmdLogPause '7'
-#define CmdLogStart '8'
-#define CmdLogWrite '9'
-#define CmdQVRecv ':'
-#define CmdQVSend ';'
-#define CmdRestoreSetup '<'
-#define CmdSendBreak '='
-#define CmdSendFile '>'
-#define CmdSendKCode '?'
-#define CmdSetEcho '@'
-#define CmdSetTitle 'A'
-#define CmdShowTT 'B'
-#define CmdXmodemSend 'C'
-#define CmdXmodemRecv 'D'
-#define CmdZmodemSend 'E'
-#define CmdZmodemRecv 'F'
-#define CmdCallMenu 'G'
-#define CmdScpSend 'H'
-#define CmdScpRcv 'I'
-#define CmdSetSecondFile 'J'
-#define CmdSetBaud 'K'
-#define CmdSetRts 'L'
-#define CmdSetDtr 'M'
-#define CmdGetHostname 'N'
-#define CmdSendBroadcast 'O'
-#define CmdSendMulticast 'P'
-#define CmdSetMulticastName 'Q'
-#define CmdSetDebug 'R'
-#define CmdYmodemSend 'S'
-#define CmdYmodemRecv 'T'
-#define CmdDispStr 'U'
-#define CmdLogInfo 'V'
-#define CmdLogRotate 'W'
-#define CmdLogAutoClose 'X'
-#define CmdGetModemStatus 'Y'
-#define CmdSetFlowCtrl 'Z'
-
#ifdef __cplusplus
extern "C" {
#endif
Modified: trunk/teraterm/ttpmacro/ttpmacro.v10.vcxproj
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.v10.vcxproj 2017-07-25 08:45:31 UTC (rev 6880)
+++ trunk/teraterm/ttpmacro/ttpmacro.v10.vcxproj 2017-07-25 08:45:35 UTC (rev 6881)
@@ -150,6 +150,7 @@
<ClInclude Include="msgdlg.h" />
<ClInclude Include="statdlg.h" />
<ClInclude Include="stdafx.h" />
+ <ClInclude Include="..\common\ttddecmnd.h" />
<ClInclude Include="ttl.h" />
<ClInclude Include="..\common\ttlib.h" />
<ClInclude Include="ttm_res.h" />
Modified: trunk/teraterm/ttpmacro/ttpmacro.v10.vcxproj.filters
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.v10.vcxproj.filters 2017-07-25 08:45:31 UTC (rev 6880)
+++ trunk/teraterm/ttpmacro/ttpmacro.v10.vcxproj.filters 2017-07-25 08:45:35 UTC (rev 6881)
@@ -93,6 +93,9 @@
<ClInclude Include="stdafx.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\common\ttddecmnd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="ttl.h">
<Filter>Header Files</Filter>
</ClInclude>
Modified: trunk/teraterm/ttpmacro/ttpmacro.v11.vcxproj
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.v11.vcxproj 2017-07-25 08:45:31 UTC (rev 6880)
+++ trunk/teraterm/ttpmacro/ttpmacro.v11.vcxproj 2017-07-25 08:45:35 UTC (rev 6881)
@@ -150,6 +150,7 @@
<ClInclude Include="msgdlg.h" />
<ClInclude Include="statdlg.h" />
<ClInclude Include="stdafx.h" />
+ <ClInclude Include="..\common\ttddecmnd.h" />
<ClInclude Include="ttl.h" />
<ClInclude Include="..\common\ttlib.h" />
<ClInclude Include="ttm_res.h" />
Modified: trunk/teraterm/ttpmacro/ttpmacro.v11.vcxproj.filters
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.v11.vcxproj.filters 2017-07-25 08:45:31 UTC (rev 6880)
+++ trunk/teraterm/ttpmacro/ttpmacro.v11.vcxproj.filters 2017-07-25 08:45:35 UTC (rev 6881)
@@ -93,6 +93,9 @@
<ClInclude Include="stdafx.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\common\ttddecmnd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="ttl.h">
<Filter>Header Files</Filter>
</ClInclude>
Modified: trunk/teraterm/ttpmacro/ttpmacro.v12.vcxproj
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.v12.vcxproj 2017-07-25 08:45:31 UTC (rev 6880)
+++ trunk/teraterm/ttpmacro/ttpmacro.v12.vcxproj 2017-07-25 08:45:35 UTC (rev 6881)
@@ -153,6 +153,7 @@
<ClInclude Include="msgdlg.h" />
<ClInclude Include="statdlg.h" />
<ClInclude Include="stdafx.h" />
+ <ClInclude Include="..\common\ttddecmnd.h" />
<ClInclude Include="ttl.h" />
<ClInclude Include="ttmacro.h" />
<ClInclude Include="ttmbuff.h" />
Modified: trunk/teraterm/ttpmacro/ttpmacro.v12.vcxproj.filters
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.v12.vcxproj.filters 2017-07-25 08:45:31 UTC (rev 6880)
+++ trunk/teraterm/ttpmacro/ttpmacro.v12.vcxproj.filters 2017-07-25 08:45:35 UTC (rev 6881)
@@ -93,6 +93,9 @@
<ClInclude Include="stdafx.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\common\ttddecmnd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="ttl.h">
<Filter>Header Files</Filter>
</ClInclude>
Modified: trunk/teraterm/ttpmacro/ttpmacro.v14.vcxproj
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.v14.vcxproj 2017-07-25 08:45:31 UTC (rev 6880)
+++ trunk/teraterm/ttpmacro/ttpmacro.v14.vcxproj 2017-07-25 08:45:35 UTC (rev 6881)
@@ -146,6 +146,7 @@
<ClCompile Include="wait4all.c" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\common\ttddecmnd.h" />
<ClInclude Include="..\common\ttlib.h" />
<ClInclude Include="errdlg.h" />
<ClInclude Include="inpdlg.h" />
Modified: trunk/teraterm/ttpmacro/ttpmacro.v14.vcxproj.filters
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.v14.vcxproj.filters 2017-07-25 08:45:31 UTC (rev 6880)
+++ trunk/teraterm/ttpmacro/ttpmacro.v14.vcxproj.filters 2017-07-25 08:45:35 UTC (rev 6881)
@@ -93,6 +93,9 @@
<ClInclude Include="stdafx.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\common\ttddecmnd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="ttl.h">
<Filter>Header Files</Filter>
</ClInclude>
Modified: trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj 2017-07-25 08:45:31 UTC (rev 6880)
+++ trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj 2017-07-25 08:45:35 UTC (rev 6881)
@@ -147,6 +147,7 @@
<ClCompile Include="wait4all.c" />
</ItemGroup>
<ItemGroup>
+ <ClInclude Include="..\common\ttddecmnd.h" />
<ClInclude Include="..\common\ttlib.h" />
<ClInclude Include="errdlg.h" />
<ClInclude Include="inpdlg.h" />
Modified: trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters 2017-07-25 08:45:31 UTC (rev 6880)
+++ trunk/teraterm/ttpmacro/ttpmacro.v15.vcxproj.filters 2017-07-25 08:45:35 UTC (rev 6881)
@@ -93,6 +93,9 @@
<ClInclude Include="stdafx.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\common\ttddecmnd.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
<ClInclude Include="ttl.h">
<Filter>Header Files</Filter>
</ClInclude>
Modified: trunk/teraterm/ttpmacro/ttpmacro.v9.vcproj
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.v9.vcproj 2017-07-25 08:45:31 UTC (rev 6880)
+++ trunk/teraterm/ttpmacro/ttpmacro.v9.vcproj 2017-07-25 08:45:35 UTC (rev 6881)
@@ -268,6 +268,10 @@
>
</File>
<File
+ RelativePath="..\common\ttddecmnd.h"
+ >
+ </File>
+ <File
RelativePath="ttl.h"
>
</File>
Modified: trunk/teraterm/ttpmacro/ttpmacro.vcproj
===================================================================
--- trunk/teraterm/ttpmacro/ttpmacro.vcproj 2017-07-25 08:45:31 UTC (rev 6880)
+++ trunk/teraterm/ttpmacro/ttpmacro.vcproj 2017-07-25 08:45:35 UTC (rev 6881)
@@ -269,6 +269,10 @@
>
</File>
<File
+ RelativePath="..\common\ttddecmnd.h"
+ >
+ </File>
+ <File
RelativePath="ttl.h"
>
</File>