Tera TermRevision: 8984
https://osdn.net/projects/ttssh2/scm/svn/commits/8984
Author: zmatsuo
Date: 2020-11-02 00:32:22 +0900 (Mon, 02 Nov 2020)
Log Message:
-----------
ファイル送信ポーズフラグを filesys.cpp へ移動
- TComVar 構造体から FilePause を削除
- TFileVar#filesys.cpp へ FilePause を追加
- FileTransPause()#filesys.cpp -> FileSendPause()
Modified Paths:
--------------
branches/proto_unicode/teraterm/common/tttypes.h
branches/proto_unicode/teraterm/teraterm/commlib.c
branches/proto_unicode/teraterm/teraterm/filesys.cpp
branches/proto_unicode/teraterm/teraterm/filesys.h
branches/proto_unicode/teraterm/teraterm/ftdlg.cpp
-------------- next part --------------
Modified: branches/proto_unicode/teraterm/common/tttypes.h
===================================================================
--- branches/proto_unicode/teraterm/common/tttypes.h 2020-11-01 15:32:01 UTC (rev 8983)
+++ branches/proto_unicode/teraterm/common/tttypes.h 2020-11-01 15:32:22 UTC (rev 8984)
@@ -1072,7 +1072,7 @@
int reserve_7[3]; // BinPtr, BStart, BCount;
int reserve_1[2]; // DStart, DCount;
int reserve_8; // BinSkip;
- WORD FilePause;
+ WORD reserve_9; // FilePause;
BOOL ProtoFlag;
/* message flag */
WORD NoMsg;
Modified: branches/proto_unicode/teraterm/teraterm/commlib.c
===================================================================
--- branches/proto_unicode/teraterm/teraterm/commlib.c 2020-11-01 15:32:01 UTC (rev 8983)
+++ branches/proto_unicode/teraterm/teraterm/commlib.c 2020-11-01 15:32:22 UTC (rev 8984)
@@ -134,7 +134,6 @@
cv->Ready = FALSE;
// log-buffer variables
- cv->FilePause = 0;
cv->ProtoFlag = FALSE;
/* message flag */
cv->NoMsg = 0;
Modified: branches/proto_unicode/teraterm/teraterm/filesys.cpp
===================================================================
--- branches/proto_unicode/teraterm/teraterm/filesys.cpp 2020-11-01 15:32:01 UTC (rev 8983)
+++ branches/proto_unicode/teraterm/teraterm/filesys.cpp 2020-11-01 15:32:22 UTC (rev 8984)
@@ -67,6 +67,7 @@
int ProgStat;
DWORD StartTime;
+ BOOL FilePause;
} TFileVar;
typedef TFileVar *PFileVar;
@@ -105,7 +106,7 @@
fv->StartTime = 0;
fv->ProgStat = 0;
- cv.FilePause &= ~(OpSendFile);
+ fv->FilePause = FALSE;
if (FTDlg!=NULL)
{
@@ -415,13 +416,14 @@
EndDdeCmnd(0);
}
-void FileTransPause(WORD OpId, BOOL Pause)
+void FileSendPause(BOOL Pause)
{
+ PFileVar fv = SendVar;
if (Pause) {
- cv.FilePause |= OpId;
+ fv->FilePause = TRUE;
}
else {
- cv.FilePause &= ~OpId;
+ fv->FilePause = FALSE;
}
}
@@ -453,9 +455,9 @@
WORD c, fc;
LONG BCOld;
DWORD read_bytes;
+ PFileVar fv = SendVar;
- if ((SendDlg == NULL) ||
- ((cv.FilePause & OpSendFile) != 0))
+ if ((SendDlg == NULL) || (fv->FilePause == TRUE))
return;
BCOld = SendVar->ByteCount;
@@ -510,6 +512,7 @@
WORD c, fc;
LONG BCOld;
DWORD read_bytes;
+ PFileVar fv = SendVar;
if (cv.PortType == IdSerial && ts.FileSendHighSpeedMode &&
BinaryMode && !FileBracketMode && !cv.TelFlag &&
@@ -517,8 +520,7 @@
return FileSendBinayBoost();
}
- if ((SendDlg==NULL) ||
- ((cv.FilePause & OpSendFile) !=0))
+ if ((SendDlg == NULL) || (fv->FilePause == TRUE))
return;
BCOld = SendVar->ByteCount;
Modified: branches/proto_unicode/teraterm/teraterm/filesys.h
===================================================================
--- branches/proto_unicode/teraterm/teraterm/filesys.h 2020-11-01 15:32:01 UTC (rev 8983)
+++ branches/proto_unicode/teraterm/teraterm/filesys.h 2020-11-01 15:32:22 UTC (rev 8984)
@@ -41,7 +41,7 @@
BOOL FileSendStart2(const char *filename, int binary);
void FileSend(void);
void FileSendEnd(void);
-void FileTransPause(WORD OpId, BOOL Pause);
+void FileSendPause(BOOL Pause);
void ProtoEnd(void);
int ProtoDlgParse(void);
Modified: branches/proto_unicode/teraterm/teraterm/ftdlg.cpp
===================================================================
--- branches/proto_unicode/teraterm/teraterm/ftdlg.cpp 2020-11-01 15:32:01 UTC (rev 8983)
+++ branches/proto_unicode/teraterm/teraterm/ftdlg.cpp 2020-11-01 15:32:22 UTC (rev 8984)
@@ -303,7 +303,7 @@
FLogPause(Pause);
}
else {
- FileTransPause(OpId, Pause);
+ FileSendPause(Pause);
}
return TRUE;
case IDC_TRANSHELP: