Tera TermRevision: 9057
https://osdn.net/projects/ttssh2/scm/svn/commits/9057
Author: zmatsuo
Date: 2020-12-20 21:07:15 +0900 (Sun, 20 Dec 2020)
Log Message:
-----------
FileVar 構造体を ttftypes.h から移動
- teraterm/filesys_send.h を追加
Modified Paths:
--------------
trunk/teraterm/common/ttftypes.h
trunk/teraterm/teraterm/CMakeLists.txt
trunk/teraterm/teraterm/filesys.cpp
trunk/teraterm/teraterm/filesys.h
trunk/teraterm/teraterm/sendmem.cpp
trunk/teraterm/ttpfile/ftlib.c
trunk/teraterm/ttpfile/ftlib.h
Added Paths:
-----------
trunk/teraterm/teraterm/filesys_send.h
-------------- next part --------------
Modified: trunk/teraterm/common/ttftypes.h
===================================================================
--- trunk/teraterm/common/ttftypes.h 2020-12-20 12:07:03 UTC (rev 9056)
+++ trunk/teraterm/common/ttftypes.h 2020-12-20 12:07:15 UTC (rev 9057)
@@ -89,6 +89,7 @@
#define TitQVRcv "Quick-VAN Receive"
#define TitQVSend "Quick-VAN Send"
+#if 0
typedef struct {
HWND HMainWin;
HWND HWin;
@@ -137,6 +138,7 @@
HANDLE reserve_6;
} TFileVar;
typedef TFileVar far *PFileVar;
+#endif
typedef struct {
int MAXL;
Modified: trunk/teraterm/teraterm/CMakeLists.txt
===================================================================
--- trunk/teraterm/teraterm/CMakeLists.txt 2020-12-20 12:07:03 UTC (rev 9056)
+++ trunk/teraterm/teraterm/CMakeLists.txt 2020-12-20 12:07:15 UTC (rev 9057)
@@ -33,6 +33,7 @@
filesys_log.rc
filesys_log_res.h
filesys_proto.cpp
+ filesys_send.h
font_pp.cpp
font_pp.h
font_pp.rc
Modified: trunk/teraterm/teraterm/filesys.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys.cpp 2020-12-20 12:07:03 UTC (rev 9056)
+++ trunk/teraterm/teraterm/filesys.cpp 2020-12-20 12:07:15 UTC (rev 9057)
@@ -58,12 +58,13 @@
#include "filesys_log_res.h"
#include "filesys.h"
+#include "filesys_send.h"
#define FS_BRACKET_NONE 0
#define FS_BRACKET_START 1
#define FS_BRACKET_END 2
-PFileVar SendVar = NULL;
+static PFileVar SendVar = NULL;
//PFileVar FileVar = NULL;
//static PCHAR ProtoVar = NULL;
//static int ProtoId;
Modified: trunk/teraterm/teraterm/filesys.h
===================================================================
--- trunk/teraterm/teraterm/filesys.h 2020-12-20 12:07:03 UTC (rev 9056)
+++ trunk/teraterm/teraterm/filesys.h 2020-12-20 12:07:15 UTC (rev 9057)
@@ -121,7 +121,9 @@
BOOL QVStartReceive(void);
BOOL QVStartSend(const char *filename);
+#if 0
extern PFileVar SendVar, FileVar;
+#endif
#ifdef __cplusplus
}
Copied: trunk/teraterm/teraterm/filesys_send.h (from rev 9056, trunk/teraterm/ttpfile/ftlib.h)
===================================================================
--- trunk/teraterm/teraterm/filesys_send.h (rev 0)
+++ trunk/teraterm/teraterm/filesys_send.h 2020-12-20 12:07:15 UTC (rev 9057)
@@ -0,0 +1,78 @@
+/*
+ * (C) 2020 TeraTerm Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+typedef struct {
+ HWND HMainWin;
+ HWND HWin;
+ WORD OpId;
+ char DlgCaption[40];
+
+ char FullName[MAX_PATH];
+ int DirLen;
+
+ int NumFname, FNCount;
+ HANDLE FnStrMemHandle;
+ PCHAR FnStrMem;
+ int FnPtr;
+
+ BOOL FileOpen;
+ HANDLE FileHandle;
+ LONG FileSize, ByteCount;
+ BOOL OverWrite;
+
+ BOOL LogFlag;
+ HANDLE LogFile;
+ WORD LogState;
+ WORD LogCount;
+
+ BOOL Success;
+ BOOL NoMsg;
+
+ char LogDefaultPath[MAX_PATH];
+ BOOL HideDialog;
+
+ BYTE LogLineBuf[16];
+ int FlushLogLineBuf;
+
+ int ProgStat;
+
+ DWORD StartTime;
+
+ int reserve_1;
+ LONG reserve_2;
+ int reserve_3;
+
+ HANDLE reserve_4;
+ DWORD reserve_5;
+
+ DWORD FileMtime;
+ HANDLE reserve_6;
+} TFileVar;
+typedef TFileVar *PFileVar;
Modified: trunk/teraterm/teraterm/sendmem.cpp
===================================================================
--- trunk/teraterm/teraterm/sendmem.cpp 2020-12-20 12:07:03 UTC (rev 9056)
+++ trunk/teraterm/teraterm/sendmem.cpp 2020-12-20 12:07:15 UTC (rev 9057)
@@ -41,7 +41,7 @@
#include "ttwinman.h" // for ts
#include "codeconv.h"
-#define SENDMEM_USE_OLD_API 0
+#define SENDMEM_USE_OLD_API 1
#if SENDMEM_USE_OLD_API
#include "ttftypes.h" // for TFileVar
Modified: trunk/teraterm/ttpfile/ftlib.c
===================================================================
--- trunk/teraterm/ttpfile/ftlib.c 2020-12-20 12:07:03 UTC (rev 9056)
+++ trunk/teraterm/ttpfile/ftlib.c 2020-12-20 12:07:15 UTC (rev 9057)
@@ -37,6 +37,7 @@
#include <string.h>
#include "win16api.h"
+#include "ftlib.h"
#include "tt_res.h"
void FTConvFName(PCHAR FName)
Modified: trunk/teraterm/ttpfile/ftlib.h
===================================================================
--- trunk/teraterm/ttpfile/ftlib.h 2020-12-20 12:07:03 UTC (rev 9056)
+++ trunk/teraterm/ttpfile/ftlib.h 2020-12-20 12:07:15 UTC (rev 9057)
@@ -29,6 +29,12 @@
/* TTFILE.DLL, routines for file transfer protocol */
+#include "filesys_send.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
//extern char UILanguageFile[MAX_PATH];
void GetLongFName(PCHAR FullName, PCHAR LongName, int destlen);
@@ -39,3 +45,7 @@
void FTLog1Byte(PFileVar fv, BYTE b);
void FTSetTimeOut(PFileVar fv, int T);
BOOL FTCreateFile(PFileVar fv);
+
+#ifdef __cplusplus
+}
+#endif