svnno****@sourc*****
svnno****@sourc*****
2016年 7月 7日 (木) 20:45:51 JST
Tera TermRevision: 6430
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6430
Author: doda
Date: 2016-07-07 20:45:50 +0900 (Thu, 07 Jul 2016)
Log Message:
-----------
MaxStrLen の定義が散らばっていたので、ttmdef.h に集約する。
Modified Paths:
--------------
trunk/teraterm/ttpmacro/inpdlg.cpp
trunk/teraterm/ttpmacro/ttmdlg.cpp
trunk/teraterm/ttpmacro/ttmdlg.h
trunk/teraterm/ttpmacro/ttmparse.h
Added Paths:
-----------
trunk/teraterm/ttpmacro/ttmdef.h
-------------- next part --------------
Modified: trunk/teraterm/ttpmacro/inpdlg.cpp
===================================================================
--- trunk/teraterm/ttpmacro/inpdlg.cpp 2016-07-02 06:21:03 UTC (rev 6429)
+++ trunk/teraterm/ttpmacro/inpdlg.cpp 2016-07-07 11:45:50 UTC (rev 6430)
@@ -7,13 +7,12 @@
#include "stdafx.h"
#include "teraterm.h"
#include "ttlib.h"
+#include "ttmdef.h"
#include "ttm_res.h"
#include "ttmlib.h"
#include "inpdlg.h"
-#define MaxStrLen 512
-
#ifdef _DEBUG
#define new DEBUG_NEW
#undef THIS_FILE
Added: trunk/teraterm/ttpmacro/ttmdef.h
===================================================================
--- trunk/teraterm/ttpmacro/ttmdef.h (rev 0)
+++ trunk/teraterm/ttpmacro/ttmdef.h 2016-07-07 11:45:50 UTC (rev 6430)
@@ -0,0 +1,15 @@
+/* Tera Term
+ Copyright(C) 2016 TeraTerm Project
+ All rights reserved. */
+
+/* TTMACRO.EXE, common definitions */
+
+#pragma once
+
+#define MaxNameLen (LONG)32
+#define MaxStrLen (LONG)512
+#define MaxLineLen (LONG)1024
+
+#define TimeOutTimerVal 50
+
+#define INT_BIT (CHAR_BIT * sizeof(int))
Modified: trunk/teraterm/ttpmacro/ttmdlg.cpp
===================================================================
--- trunk/teraterm/ttpmacro/ttmdlg.cpp 2016-07-02 06:21:03 UTC (rev 6429)
+++ trunk/teraterm/ttpmacro/ttmdlg.cpp 2016-07-07 11:45:50 UTC (rev 6430)
@@ -11,6 +11,7 @@
#include "tttypes.h"
#include "ttlib.h"
#include <commdlg.h>
+#include "ttmdef.h"
#include "errdlg.h"
#include "inpdlg.h"
#include "msgdlg.h"
@@ -18,8 +19,6 @@
#include "ListDlg.h"
#include "ttmlib.h"
-#define MaxStrLen 512
-
extern "C" {
char HomeDir[MAXPATHLEN];
char FileName[MAX_PATH];
Modified: trunk/teraterm/ttpmacro/ttmdlg.h
===================================================================
--- trunk/teraterm/ttpmacro/ttmdlg.h 2016-07-02 06:21:03 UTC (rev 6429)
+++ trunk/teraterm/ttpmacro/ttmdlg.h 2016-07-07 11:45:50 UTC (rev 6430)
@@ -4,14 +4,14 @@
/* TTMACRO.EXE, dialog boxes */
+#pragma once
+
+#include "ttmdef.h"
+
#ifdef __cplusplus
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);
Modified: trunk/teraterm/ttpmacro/ttmparse.h
===================================================================
--- trunk/teraterm/ttpmacro/ttmparse.h 2016-07-02 06:21:03 UTC (rev 6429)
+++ trunk/teraterm/ttpmacro/ttmparse.h 2016-07-07 11:45:50 UTC (rev 6430)
@@ -4,6 +4,10 @@
/* TTMACRO.EXE, TTL parser */
+#pragma once
+
+#include "ttmdef.h"
+
#define IdTTLRun 1
#define IdTTLWait 2
#define IdTTLWaitLn 3
@@ -273,14 +277,6 @@
// integer type for buffer pointer
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))
-
typedef char TName[MaxNameLen];
typedef TName far *PName;
typedef char TStrVal [MaxStrLen];