svnno****@sourc*****
svnno****@sourc*****
2013年 2月 18日 (月) 02:17:27 JST
Tera TermRevision: 5126
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/5126
Author: atsue
Date: 2013-02-18 02:17:26 +0900 (Mon, 18 Feb 2013)
Log Message:
-----------
ttermpro.exeとttpmacro.exeのインタフェース・通信部分の文字サイズを511バイトまで対応。
Modified Paths:
--------------
trunk/teraterm/teraterm/ttdde.c
trunk/teraterm/ttpmacro/ttmdde.c
trunk/teraterm/ttpmacro/ttmdlg.cpp
trunk/teraterm/ttpmacro/ttmdlg.h
trunk/teraterm/ttpmacro/ttmparse.h
trunk/teraterm/ttpset/ttset.c
-------------- next part --------------
Modified: trunk/teraterm/teraterm/ttdde.c
===================================================================
--- trunk/teraterm/teraterm/ttdde.c 2013-02-16 17:52:47 UTC (rev 5125)
+++ trunk/teraterm/teraterm/ttdde.c 2013-02-17 17:17:26 UTC (rev 5126)
@@ -26,6 +26,8 @@
#define ItemName "DATA"
#define ItemName2 "PARAM"
+#define MaxStrLen (LONG)512
+
char TopicName[21] = "";
HCONV ConvH = 0;
BOOL AdvFlag = FALSE;
@@ -47,11 +49,11 @@
static BOOL SyncRecv;
static LONG SyncFreeSpace;
-static char ParamFileName[MAX_PATH];
+static char ParamFileName[MaxStrLen];
static WORD ParamBinaryFlag;
static WORD ParamAppendFlag;
static WORD ParamXmodemOpt;
-static char ParamSecondFileName[MAX_PATH];
+static char ParamSecondFileName[MaxStrLen];
#define CBBufSize TermWidthMax
@@ -338,7 +340,7 @@
HDDEDATA AcceptExecute(HSZ TopicHSz, HDDEDATA Data)
{
- char Command[MAX_PATH + 1];
+ char Command[MaxStrLen + 1];
int i;
WORD w, c;
@@ -426,7 +428,7 @@
break;
}
{
- char Temp[MAX_PATH + 2];
+ char Temp[MaxStrLen + 2];
strncpy_s(Temp, sizeof(Temp),"a ", _TRUNCATE); // dummy exe name
strncat_s(Temp,sizeof(Temp),ParamFileName,_TRUNCATE);
if (LoadTTSET())
Modified: trunk/teraterm/ttpmacro/ttmdde.c
===================================================================
--- trunk/teraterm/ttpmacro/ttmdde.c 2013-02-16 17:52:47 UTC (rev 5125)
+++ trunk/teraterm/ttpmacro/ttmdde.c 2013-02-17 17:17:26 UTC (rev 5126)
@@ -825,7 +825,7 @@
void SetFile(PCHAR FN)
{
- char Cmd[1 + MAX_PATH];
+ char Cmd[1 + MaxStrLen];
#if 1
_snprintf_s(Cmd, sizeof(Cmd), _TRUNCATE, "%c%s", CmdSetFile, FN);
@@ -839,7 +839,7 @@
// add (2008.1.3 yutaka)
void SetSecondFile(PCHAR FN)
{
- char Cmd[1 + MAX_PATH];
+ char Cmd[1 + MaxStrLen];
#if 1
memset(Cmd, 0, sizeof(Cmd));
Modified: trunk/teraterm/ttpmacro/ttmdlg.cpp
===================================================================
--- trunk/teraterm/ttpmacro/ttmdlg.cpp 2013-02-16 17:52:47 UTC (rev 5125)
+++ trunk/teraterm/ttpmacro/ttmdlg.cpp 2013-02-17 17:17:26 UTC (rev 5126)
@@ -24,14 +24,14 @@
char FileName[MAX_PATH];
char TopicName[11];
char ShortName[MAX_PATH];
-char Param2[MAXPATHLEN];
-char Param3[MAXPATHLEN];
-char Param4[MAXPATHLEN];
-char Param5[MAXPATHLEN];
-char Param6[MAXPATHLEN];
-char Param7[MAXPATHLEN];
-char Param8[MAXPATHLEN];
-char Param9[MAXPATHLEN];
+char Param2[MaxStrLen];
+char Param3[MaxStrLen];
+char Param4[MaxStrLen];
+char Param5[MaxStrLen];
+char Param6[MaxStrLen];
+char Param7[MaxStrLen];
+char Param8[MaxStrLen];
+char Param9[MaxStrLen];
BOOL SleepFlag;
int ParamCnt; /* \x88\xF8\x90\x94\x82̌\x94 */
}
@@ -87,7 +87,7 @@
{
int i, j, k;
char *Param;
- char Temp[MAX_PATH];
+ char Temp[MaxStrLen];
// Get home directory
if (GetModuleFileName(AfxGetInstanceHandle(),FileName,sizeof(FileName)) == 0) {
Modified: trunk/teraterm/ttpmacro/ttmdlg.h
===================================================================
--- trunk/teraterm/ttpmacro/ttmdlg.h 2013-02-16 17:52:47 UTC (rev 5125)
+++ trunk/teraterm/ttpmacro/ttmdlg.h 2013-02-17 17:17:26 UTC (rev 5126)
@@ -8,6 +8,10 @@
extern "C" {
#endif
+#ifndef MaxStrLen // ttmparse.h\x82ł\xE0\x92\xE8\x8B`\x82\xB5\x82Ă\xA2\x82邽\x82ߓ\xF1\x8Fd\x92\xE8\x8B`\x96h\x8E~
+#define MaxStrLen (LONG)512
+#endif
+
void ParseParam(PBOOL IOption, PBOOL VOption);
BOOL GetFileName(HWND HWin);
void SetDlgPos(int x, int y);
@@ -22,14 +26,14 @@
extern char FileName[MAX_PATH];
extern char TopicName[11];
extern char ShortName[MAX_PATH];
-extern char Param2[MAXPATHLEN];
-extern char Param3[MAXPATHLEN];
-extern char Param4[MAXPATHLEN];
-extern char Param5[MAXPATHLEN];
-extern char Param6[MAXPATHLEN];
-extern char Param7[MAXPATHLEN];
-extern char Param8[MAXPATHLEN];
-extern char Param9[MAXPATHLEN];
+extern char Param2[MaxStrLen];
+extern char Param3[MaxStrLen];
+extern char Param4[MaxStrLen];
+extern char Param5[MaxStrLen];
+extern char Param6[MaxStrLen];
+extern char Param7[MaxStrLen];
+extern char Param8[MaxStrLen];
+extern char Param9[MaxStrLen];
extern BOOL SleepFlag;
extern int ParamCnt;
Modified: trunk/teraterm/ttpmacro/ttmparse.h
===================================================================
--- trunk/teraterm/ttpmacro/ttmparse.h 2013-02-16 17:52:47 UTC (rev 5125)
+++ trunk/teraterm/ttpmacro/ttmparse.h 2013-02-17 17:17:26 UTC (rev 5126)
@@ -254,7 +254,9 @@
typedef DWORD BINT;
#define MaxNameLen (LONG)32
+#ifndef MaxStrLen // ttmdlg.h\x82ł\xE0\x92\xE8\x8B`\x82\xB5\x82Ă\xA2\x82邽\x82ߓ\xF1\x8Fd\x92\xE8\x8B`\x96h\x8E~
#define MaxStrLen (LONG)512
+#endif
#define MaxLineLen (LONG)1024
#define INT_BIT (CHAR_BIT * sizeof(int))
Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c 2013-02-16 17:52:47 UTC (rev 5125)
+++ trunk/teraterm/ttpset/ttset.c 2013-02-17 17:17:26 UTC (rev 5126)
@@ -25,6 +25,8 @@
#define Section "Tera Term"
+#define MaxStrLen (LONG)512
+
static PCHAR far TermList[] =
{ "VT100", "VT100J", "VT101", "VT102", "VT102J", "VT220J", "VT282",
"VT320", "VT382", "VT420", "VT520", "VT525", NULL };
@@ -3194,8 +3196,8 @@
#ifdef NO_INET6
BYTE b;
#endif /* NO_INET6 */
- char Temp[MAX_PATH + 6]; // "/FD="(4) + `"'(1) + MAX_PATH + `"'(1)
- char Temp2[MAX_PATH + 6];
+ char Temp[MaxStrLen]; // ttpmacro\x82\xA9\x82\xE7\x8CĂ\xEA\x82邱\x82Ƃ\xF0\x91z\x92肵MaxStrLen\x83T\x83C\x83Y\x82Ƃ\xB7\x82\xE9
+ char Temp2[MaxStrLen];
char TempDir[MAXPATHLEN];
WORD ParamPort = 0;
WORD ParamCom = 0;