Tera Term

[Ttssh2-commit] [9087] tttypes.h の各プロトコルの定数を各々のヘッダへ移動

• 前の記事 (スレッド) [Ttssh2-commit] [9086] QuickVAN の QVStart() API を使用しないようにした
• 次の記事 (スレッド) [Ttssh2-commit] [9088] TFileVarProto から DirLen を削除
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 9087
          https://osdn.net/projects/ttssh2/scm/svn/commits/9087
Author:   zmatsuo
Date:     2020-12-20 21:12:53 +0900 (Sun, 20 Dec 2020)
Log Message:
-----------
tttypes.h の各プロトコルの定数を各々のヘッダへ移動

- 無効部分の削除など

Modified Paths:
--------------
    trunk/teraterm/common/tttypes.h
    trunk/teraterm/teraterm/filesys_proto.cpp
    trunk/teraterm/teraterm/filesys_proto.h
    trunk/teraterm/ttpfile/bplus.h
    trunk/teraterm/ttpfile/filesys_win32.cpp
    trunk/teraterm/ttpfile/kermit.h
    trunk/teraterm/ttpfile/quickvan.h
    trunk/teraterm/ttpfile/xmodem.h
    trunk/teraterm/ttpfile/ymodem.h
    trunk/teraterm/ttpfile/zmodem.h

-------------- next part --------------
Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h	2020-12-20 12:12:42 UTC (rev 9086)
+++ trunk/teraterm/common/tttypes.h	2020-12-20 12:12:53 UTC (rev 9087)
@@ -97,35 +97,6 @@
 #define CS_UNSPEC          0xffffffff
 #define CS_ALL             CS_UNSPEC
 
-  /* Kermit function id */
-#define IdKmtReceive 1
-#define IdKmtGet     2
-#define IdKmtSend    3
-#define IdKmtFinish  4
-
-  /* XMODEM function id */
-#define IdXReceive 1
-#define IdXSend    2
-
-  /* YMODEM function id */
-#define IdYReceive 1
-#define IdYSend    2
-
-  /* ZMODEM function id */
-#define IdZReceive 1
-#define IdZSend    2
-#define IdZAutoR   3
-#define IdZAutoS   4
-
-  /* B-Plus function id */
-#define IdBPReceive 1
-#define IdBPSend    2
-#define IdBPAuto    3
-
-  /* Quick-VAN function id */
-#define IdQVReceive 1
-#define IdQVSend    2
-
 #define HostNameMaxLength 1024
 //#define HostNameMaxLength 80
 #define ProtocolFamilyMaxLength 80

Modified: trunk/teraterm/teraterm/filesys_proto.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys_proto.cpp	2020-12-20 12:12:42 UTC (rev 9086)
+++ trunk/teraterm/teraterm/filesys_proto.cpp	2020-12-20 12:12:53 UTC (rev 9087)
@@ -1012,7 +1012,6 @@
 	else {
 		FileVar->DirLen = 0;
 		strncpy_s(FileVar->FullName, sizeof(FileVar->FullName),filename, _TRUNCATE);
-		FileVar->NumFname = 1;
 		FileVar->NoMsg = TRUE;
 		_SetFileVar(FileVar);
 	}
@@ -1530,10 +1529,6 @@
 		fv->FileNames = filenames;
 	}
 	else {
-		FileVar->DirLen = 0;
-		strncpy_s(FileVar->FullName, sizeof(FileVar->FullName), filename, _TRUNCATE);
-		FileVar->NumFname = 1;
-		FileVar->NoMsg = TRUE;
 		fv->FileNames = MakeStrArrayFromStr(filename);
 		fv->NoMsg = TRUE;
 	}
@@ -1663,7 +1658,6 @@
 	else {
 		FileVar->DirLen = 0;
 		strncpy_s(FileVar->FullName, sizeof(FileVar->FullName),filename, _TRUNCATE);
-		FileVar->NumFname = 1;
 		FileVar->NoMsg = TRUE;
 	}
 

Modified: trunk/teraterm/teraterm/filesys_proto.h
===================================================================
--- trunk/teraterm/teraterm/filesys_proto.h	2020-12-20 12:12:42 UTC (rev 9086)
+++ trunk/teraterm/teraterm/filesys_proto.h	2020-12-20 12:12:53 UTC (rev 9087)
@@ -38,16 +38,11 @@
 	char FullName[MAX_PATH];	// read/write\x82\xB7\x82\xE9\x83t\x83@\x83C\x83\x8B\x96\xBC(\x8Ae\x83v\x83\x8D\x83g\x83R\x83\x8B\x93\xE0\x82ŏ\x91\x82\xAB\x8A\xB7\x82\xA6\x82\xB7\x82邱\x82Ƃ\xA0\x82\xE8)
 	int DirLen;
 
-	// \x95\xA1\x90\x94\x83t\x83@\x83C\x83\x8B\x91I\x91\xF0\x82ł\xAB\x82\xE9\x83v\x83\x8D\x83g\x83R\x83\x8B\x82Ŏg\x97p
+	// \x91\x97\x90M\x83t\x83@\x83C\x83\x8B\x96\xBC\x94z\x97\xF1
 	//	\x83t\x83\x8B\x83p\x83X\x82̃t\x83@\x83C\x83\x8B\x96\xBC\x94z\x97\xF1(\x88\xEA\x94ԍŌ\xE3\x82\xCDNULL)
 	char **FileNames;
 	int FNCount;		// \x91\x97\x90M\x92\x86\x83t\x83@\x83C\x83\x8B\x96\xBC\x94z\x97\xF1index(0...)
-	int NumFname;		// \x83t\x83@\x83C\x83\x8B\x90\x94(\x8Eg\x97p\x82\xB5\x82Ă\xA2\x82Ȃ\xA2?)
 
-//	HANDLE FnStrMemHandle;
-//	PCHAR FnStrMem;
-//	int FnPtr;
-
 	// \x8E\xF3\x90M
 	char *RecievePath;		// \x8E\xF3\x90M\x83t\x83H\x83\x8B\x83_(\x8FI\x92[\x82Ƀp\x83X\x83Z\x83p\x83\x8C\x81[\x83^'\\'\x82\xAA\x95t\x89\xC1\x82\xB3\x82\xEA\x82Ă\xA2\x82\xE9)
 
@@ -58,7 +53,6 @@
 	BOOL Success;
 	BOOL NoMsg;
 
-//	char LogDefaultPath[MAX_PATH];
 	BOOL HideDialog;
 
 	int ProgStat;

Modified: trunk/teraterm/ttpfile/bplus.h
===================================================================
--- trunk/teraterm/ttpfile/bplus.h	2020-12-20 12:12:42 UTC (rev 9086)
+++ trunk/teraterm/ttpfile/bplus.h	2020-12-20 12:12:53 UTC (rev 9087)
@@ -33,6 +33,11 @@
 extern "C" {
 #endif
 
+  /* B-Plus function id */
+#define IdBPReceive 1
+#define IdBPSend    2
+#define IdBPAuto    3
+
 enum {
 	BPLUS_MODE,
 };

Modified: trunk/teraterm/ttpfile/filesys_win32.cpp
===================================================================
--- trunk/teraterm/ttpfile/filesys_win32.cpp	2020-12-20 12:12:42 UTC (rev 9086)
+++ trunk/teraterm/ttpfile/filesys_win32.cpp	2020-12-20 12:12:53 UTC (rev 9087)
@@ -108,7 +108,7 @@
 {
 	LONG lo = (LONG)((offset >> 0) & 0xffffffff);
 	LONG hi = (LONG)((offset >> 32) & 0xffffffff);
-	DWORD pos = SetFilePointer(fv->FileHandle, lo, &hi, 0);
+	SetFilePointer(fv->FileHandle, lo, &hi, 0);
 	if (GetLastError() != 0) {
 		return -1;
 	}
@@ -122,6 +122,7 @@
 
 void FilesysCreate(TFileVarProto *fv)
 {
+	fv->FileHandle = INVALID_HANDLE_VALUE;
 	fv->OpenRead = _OpenRead;
 	fv->OpenWrite = _OpenWrite;
 	fv->ReadFile = _ReadFile;

Modified: trunk/teraterm/ttpfile/kermit.h
===================================================================
--- trunk/teraterm/ttpfile/kermit.h	2020-12-20 12:12:42 UTC (rev 9086)
+++ trunk/teraterm/ttpfile/kermit.h	2020-12-20 12:12:53 UTC (rev 9087)
@@ -35,6 +35,12 @@
 extern "C" {
 #endif
 
+  /* Kermit function id */
+#define IdKmtReceive 1
+#define IdKmtGet     2
+#define IdKmtSend    3
+#define IdKmtFinish  4
+
 enum {
 	KMT_MODE
 };

Modified: trunk/teraterm/ttpfile/quickvan.h
===================================================================
--- trunk/teraterm/ttpfile/quickvan.h	2020-12-20 12:12:42 UTC (rev 9086)
+++ trunk/teraterm/ttpfile/quickvan.h	2020-12-20 12:12:53 UTC (rev 9087)
@@ -33,6 +33,10 @@
 extern "C" {
 #endif
 
+  /* Quick-VAN function id */
+#define IdQVReceive 1
+#define IdQVSend    2
+
 enum {
 	QUICKVAN_MODE,
 };

Modified: trunk/teraterm/ttpfile/xmodem.h
===================================================================
--- trunk/teraterm/ttpfile/xmodem.h	2020-12-20 12:12:42 UTC (rev 9086)
+++ trunk/teraterm/ttpfile/xmodem.h	2020-12-20 12:12:53 UTC (rev 9087)
@@ -35,6 +35,10 @@
 extern "C" {
 #endif
 
+  /* XMODEM function id */
+#define IdXReceive 1
+#define IdXSend    2
+
 enum {
 	XMODEM_MODE,
 	XMODEM_OPT,

Modified: trunk/teraterm/ttpfile/ymodem.h
===================================================================
--- trunk/teraterm/ttpfile/ymodem.h	2020-12-20 12:12:42 UTC (rev 9086)
+++ trunk/teraterm/ttpfile/ymodem.h	2020-12-20 12:12:53 UTC (rev 9087)
@@ -34,6 +34,10 @@
 extern "C" {
 #endif
 
+  /* YMODEM function id */
+#define IdYReceive 1
+#define IdYSend    2
+
 enum {
 	YMODEM_MODE,
 	YMODEM_OPT,

Modified: trunk/teraterm/ttpfile/zmodem.h
===================================================================
--- trunk/teraterm/ttpfile/zmodem.h	2020-12-20 12:12:42 UTC (rev 9086)
+++ trunk/teraterm/ttpfile/zmodem.h	2020-12-20 12:12:53 UTC (rev 9087)
@@ -33,6 +33,12 @@
 extern "C" {
 #endif
 
+  /* ZMODEM function id */
+#define IdZReceive 1
+#define IdZSend    2
+#define IdZAutoR   3
+#define IdZAutoS   4
+
 enum {
 	ZMODEM_MODE,
 	ZMODEM_BINFLAG,

• 前の記事 (スレッド) [Ttssh2-commit] [9086] QuickVAN の QVStart() API を使用しないようにした
• 次の記事 (スレッド) [Ttssh2-commit] [9088] TFileVarProto から DirLen を削除
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]