コミット: 81ae4026692859a5d761272b58b258d560e428fe - ttxreconnect (git)

COM ポート遅延再接続プラグイン　for Tera Term

コミットメタ情報

• リビジョン: 81ae4026692859a5d761272b58b258d560e428fe (tree)
• 日時: 2020-11-23 16:37:52
• 作者: tomo3136 <tomo3136@loca...>
• コミッター: tomo3136

ログメッセージ

ttset構造体で無理やり対応

変更サマリ

• modified: ttxreconnect.c

差分

--- a/ttxreconnect.c
+++ b/ttxreconnect.c
@@ -13,6 +13,32 @@
 
 #include "compat_w95.h"
 
+#if ((TT_VERSION_MAJOR * 10000 + TT_VERSION_MINOR) < 40105)
+#error "not support build version"
+#endif
+
+static WORD tt_version = 0;
+
+/* common */
+#define TT_VER(ver, rev) (ver * 10000 + rev)
+#define TT_POS_P(pts, ref, nm) ((void *)&(pts->ref) <= (void *)&(pts->nm))
+
+#define TT_OLD_P(ver, rev) (tt_version < TT_VER(ver, rev))
+#define TT_OFFSET(ver, rev, ref, v, pts, nm) \
+	((TT_OLD_P(ver, rev) && TT_POS_P(pts, ref, nm)) ? (v) : 0)
+
+/* ttset addjust */
+#define TS_ADJ(pts, nm) ( \
+	TT_OFFSET(4, 105, UseNormalBGColor, 4, pts, nm))
+
+/* comvar addjust */
+#define CV_ADJ(pts, pcv, nm) ( \
+	TT_OFFSET(4, 105, xxx, 0, pcv, nm))
+
+/* wrapper */
+#define TS(pts, nm) (((PTTSet)((char *)pts - (TS_ADJ(pts, nm))))->nm)
+#define CV(pcv, nm) (((PComVar)((char *)pcv - (CV_ADJ(pcv, nm))))->nm)
+
 #define ORDER 6030
 
 #define INISECTION "TTXReconnect"
@@ -34,7 +60,6 @@ typedef struct
 	BOOL ConnectMsg;
 	BOOL Reconnect;
 	UINT ReconnectWait;
-	WORD AutoComPortReconnect;
 
 } TInstVar;
 
@@ -66,8 +91,6 @@ static void PASCAL TTXReadIniFile(PCHAR fn, PTTSet ts)
 	(pvar->origReadIniFile)(fn, ts);
 	GetPrivateProfileString(INISECTION, "ReconnectWait", "", buf, sizeof(buf), fn);
 	pvar->ReconnectWait = atoi(buf);
-	GetPrivateProfileString("Tera Term", "AutoComPortReconnect", "", buf, sizeof(buf), fn);
-	pvar->AutoComPortReconnect = (_strcmpi(buf, "on") == 0) ? TRUE : FALSE;
 }
 
 static void PASCAL TTXGetSetupHooks(TTXSetupHooks *hooks)
@@ -146,7 +169,7 @@ static void PASCAL TTXOpenFile(TTXFileHooks *hooks)
 			Sleep(pvar->ReconnectWait);
 		}
 	}
-	else if (pvar->AutoComPortReconnect)
+	else if (TS(pvar->ts, AutoComPortReconnect))
 	{
 		Sleep(pvar->ReconnectWait);
 	}
@@ -223,6 +246,47 @@ static int PASCAL TTXProcessCommand(HWND hWin, WORD cmd)
 
 ///////////////////////////////////////////////////////////////
 
+//same function with ttset::RunningVersion
+static WORD TTRunningVersion()
+{
+#pragma comment(lib, "version.lib")
+	char szPath[MAX_PATH];
+	DWORD dwSize;
+	DWORD dwHandle;
+	LPVOID lpBuf;
+	UINT uLen;
+	VS_FIXEDFILEINFO *pFileInfo;
+	int major, minor;
+
+	GetModuleFileName(NULL, szPath, sizeof(szPath) - 1);
+
+	dwSize = GetFileVersionInfoSize(szPath, &dwHandle);
+	if (dwSize == 0)
+	{
+		return 0;
+	}
+
+	lpBuf = malloc(dwSize);
+	if (!GetFileVersionInfo(szPath, dwHandle, dwSize, lpBuf))
+	{
+		free(lpBuf);
+		return 0;
+	}
+
+	if (!VerQueryValue(lpBuf, "\\", (LPVOID *)&pFileInfo, &uLen))
+	{
+		free(lpBuf);
+		return 0;
+	}
+
+	major = HIWORD(pFileInfo->dwFileVersionMS);
+	minor = LOWORD(pFileInfo->dwFileVersionMS);
+
+	free(lpBuf);
+
+	return major * 10000 + minor;
+}
+
 static TTXExports Exports = {
 	/* This must contain the size of the structure. See below for its usage. */
 	sizeof(TTXExports),
@@ -277,6 +341,7 @@ BOOL WINAPI DllMain(HANDLE hInstance,
 		DoCover_IsDebuggerPresent();
 		hInst = hInstance;
 		pvar = &InstVar;
+		tt_version = TTRunningVersion();
 		break;
 	case DLL_PROCESS_DETACH:
 		/* do process cleanup */