Commit: de950dc09aa1c962cdd0812d2892b80bb6959a83 - ttxreconnect (git)

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

Commit MetaInfo

• Revision: de950dc09aa1c962cdd0812d2892b80bb6959a83 (tree)
• Time: 2020-12-12 06:32:56
• Author: tomo3136 <tomo3136@loca...>
• Commiter: tomo3136

Log Message

TTSet構造体補正マクロを別ファイルに分離

Change Summary

• modified: TTXReconnect.vcxproj
• modified: TTXReconnect.vcxproj.filters
• modified: ttxreconnect.c
• add: ttxversion.c
• add: ttxversion.h

Incremental Difference

--- a/TTXReconnect.vcxproj
+++ b/TTXReconnect.vcxproj
@@ -83,6 +83,10 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="ttxreconnect.c" />
+    <ClCompile Include="ttxversion.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="ttxversion.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

--- a/TTXReconnect.vcxproj.filters
+++ b/TTXReconnect.vcxproj.filters
@@ -18,5 +18,13 @@
     <ClCompile Include="ttxreconnect.c">
       <Filter>ソース ファイル</Filter>
     </ClCompile>
+    <ClCompile Include="ttxversion.c">
+      <Filter>ソース ファイル</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="ttxversion.h">
+      <Filter>ヘッダー ファイル</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file

--- a/ttxreconnect.c
+++ b/ttxreconnect.c
@@ -13,36 +13,15 @@
 
 #include "compat_w95.h"
 
-//#define V40105
+//#define _TTX_VERSION_SUPPORT
 
-#ifdef V40105
-#if ((TT_VERSION_MAJOR * 10000 + TT_VERSION_MINOR) < 40105)
-#error "not support build version"
+#ifdef _TTX_VERSION_SUPPORT
+#include "ttxversion.h"
+#else
+#define TTXInitVersion()
+#define TS(a, b) (a->b)
 #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)
-#endif /* V40105 */
-
 #define ORDER 6030
 
 #define INISECTION "TTXReconnect"
@@ -82,6 +61,7 @@ static void PASCAL TTXInit(PTTSet ts, PComVar cv)
 	pvar->ConnectMsg = FALSE;
 	pvar->Reconnect = FALSE;
 	pvar->ReconnectWait = 0;
+	TTXInitVersion();
 }
 
 // static void PASCAL TTXGetUIHooks(TTXUIHooks *hooks)
@@ -173,11 +153,7 @@ static void PASCAL TTXOpenFile(TTXFileHooks *hooks)
 			Sleep(pvar->ReconnectWait);
 		}
 	}
-#ifdef V40105
 	else if (TS(pvar->ts, AutoComPortReconnect))
-#else
-	else if (pvar->ts->AutoComPortReconnect)
-#endif
 	{
 		Sleep(pvar->ReconnectWait);
 	}
@@ -254,49 +230,6 @@ static int PASCAL TTXProcessCommand(HWND hWin, WORD cmd)
 
 ///////////////////////////////////////////////////////////////
 
-#ifdef V40105
-//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;
-}
-#endif /* V40105 */
-
 static TTXExports Exports = {
 	/* This must contain the size of the structure. See below for its usage. */
 	sizeof(TTXExports),
@@ -351,9 +284,6 @@ BOOL WINAPI DllMain(HANDLE hInstance,
 		DoCover_IsDebuggerPresent();
 		hInst = hInstance;
 		pvar = &InstVar;
-#ifdef V40105
-		tt_version = TTRunningVersion();
-#endif /* V40105 */
 		break;
 	case DLL_PROCESS_DETACH:
 		/* do process cleanup */

--- /dev/null
+++ b/ttxversion.c
@@ -0,0 +1,60 @@
+/*
+ * TTX version support
+ * (C) 2020 tomo3136
+ */
+
+#include <windows.h>
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "ttxversion.h"
+
+WORD tt_version = 0;
+
+//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;
+}
+
+void TTXInitVersion()
+{
+	tt_version = TTRunningVersion();
+}

--- /dev/null
+++ b/ttxversion.h
@@ -0,0 +1,38 @@
+/*
+ * TTX version support
+ * (C) 2020 tomo3136
+ */
+
+#include "tt-version.h"
+
+#if ((TT_VERSION_MAJOR * 10000 + TT_VERSION_MINOR) < 40105)
+#error "not support build version"
+#endif
+
+/* old version PTTSet structure support */
+/* build test: 4.105 */
+/* running test: 4.105, 4.104, 4.98, 4.96, 4.80 */
+
+#define TT_ADJ(pts, nm, ver, rev, ref, v)          \
+	(((tt_version < (ver * 10000 + rev)) &&        \
+	  ((void *)&(pts->ref) <= (void *)&(pts->nm))) \
+		 ? (-v)                                    \
+		 : 0)
+
+#define TS(pts, nm)                                             \
+	(((PTTSet)((char *)(pts) +                                  \
+			   TT_ADJ((pts), nm, 4, 105, UseNormalBGColor, 4))) \
+		 ->nm)
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+	extern WORD tt_version;
+
+	void TTXInitVersion();
+
+#ifdef __cplusplus
+}
+#endif