Tera TermRevision: 9095
https://osdn.net/projects/ttssh2/scm/svn/commits/9095
Author: zmatsuo
Date: 2020-12-20 21:14:25 +0900 (Sun, 20 Dec 2020)
Log Message:
-----------
FTSetTimeOut() を TFileVarProto に追加
Modified Paths:
--------------
trunk/teraterm/teraterm/filesys_proto.cpp
trunk/teraterm/teraterm/filesys_proto.h
trunk/teraterm/ttpfile/bplus.c
trunk/teraterm/ttpfile/filesys_win32.cpp
trunk/teraterm/ttpfile/ftlib.c
trunk/teraterm/ttpfile/ftlib.h
trunk/teraterm/ttpfile/kermit.c
trunk/teraterm/ttpfile/quickvan.c
trunk/teraterm/ttpfile/xmodem.c
trunk/teraterm/ttpfile/ymodem.c
trunk/teraterm/ttpfile/zmodem.c
-------------- next part --------------
Modified: trunk/teraterm/teraterm/filesys_proto.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys_proto.cpp 2020-12-20 12:14:11 UTC (rev 9094)
+++ trunk/teraterm/teraterm/filesys_proto.cpp 2020-12-20 12:14:25 UTC (rev 9095)
@@ -132,6 +132,13 @@
InitDlgProgress(fv->HWin, IDC_PROTOPROGRESS, CurProgStat);
}
+static void FTSetTimeOut(PFileVarProto fv, int T)
+{
+ KillTimer(fv->HMainWin, IdProtoTimer);
+ if (T==0) return;
+ SetTimer(fv->HMainWin, IdProtoTimer, T*1000, NULL);
+}
+
static BOOL NewFileVar_(PFileVarProto *pfv)
{
if (*pfv != NULL) {
@@ -157,6 +164,8 @@
fv->file = FilesysCreateWin32();
+ fv->FTSetTimeOut = FTSetTimeOut;
+
fv->InitDlgProgress = _InitDlgProgress;
fv->SetDlgTime = _SetDlgTime;
fv->SetDlgPaketNum = _SetDlgPaketNum;
Modified: trunk/teraterm/teraterm/filesys_proto.h
===================================================================
--- trunk/teraterm/teraterm/filesys_proto.h 2020-12-20 12:14:11 UTC (rev 9094)
+++ trunk/teraterm/teraterm/filesys_proto.h 2020-12-20 12:14:25 UTC (rev 9095)
@@ -64,6 +64,9 @@
DWORD FileMtime;
+ // services
+ void (*FTSetTimeOut)(struct FileVarProto *fv, int T);
+
// protocol entrys, data
BOOL (*Init)(struct FileVarProto *fv, PComVar cv, PTTSet ts);
BOOL (*Parse)(struct FileVarProto *fv, PComVar cv);
Modified: trunk/teraterm/ttpfile/bplus.c
===================================================================
--- trunk/teraterm/ttpfile/bplus.c 2020-12-20 12:14:11 UTC (rev 9094)
+++ trunk/teraterm/ttpfile/bplus.c 2020-12-20 12:14:25 UTC (rev 9095)
@@ -253,7 +253,7 @@
{
PBPVar bv = fv->data;
BPWrite(fv,bv,cv,"\005\005",2); /* two ENQ */
- FTSetTimeOut(fv,bv->TimeOut);
+ fv->FTSetTimeOut(fv,bv->TimeOut);
bv->EnqSent = TRUE;
}
@@ -771,7 +771,7 @@
b = (b - 0x30) % 10;
if (bv->EnqSent)
{
- FTSetTimeOut(fv,0);
+ fv->FTSetTimeOut(fv,0);
bv->EnqSent = FALSE;
if ((bv->PktOutLen>0) && (b==bv->PktNum)) /* Resend packet */
{
@@ -788,7 +788,7 @@
else
return;
- FTSetTimeOut(fv,0);
+ fv->FTSetTimeOut(fv,0);
bv->PktNum = b;
if (b==0)
bv->PktNumOffset = bv->PktNumOffset + 10;
@@ -855,7 +855,7 @@
if (cv->OutBuffCount==0)
{
bv->BPPktState = BP_PktGetDLE;
- FTSetTimeOut(fv,bv->TimeOut);
+ fv->FTSetTimeOut(fv,bv->TimeOut);
}
else
return TRUE;
@@ -883,7 +883,7 @@
break;
case 0x15: /* NAK */
BPWrite(fv,bv,cv,"\005\005",2); /* two ENQs */
- FTSetTimeOut(fv,bv->TimeOut);
+ fv->FTSetTimeOut(fv,bv->TimeOut);
bv->EnqSent = TRUE;
break;
}
Modified: trunk/teraterm/ttpfile/filesys_win32.cpp
===================================================================
--- trunk/teraterm/ttpfile/filesys_win32.cpp 2020-12-20 12:14:11 UTC (rev 9094)
+++ trunk/teraterm/ttpfile/filesys_win32.cpp 2020-12-20 12:14:25 UTC (rev 9095)
@@ -307,8 +307,8 @@
* FALSE\x82̂Ƃ\xAB\x81AANSI
* @param[in] path \x8E\xF3\x90M\x83t\x83H\x83\x8B\x83_ \x83t\x83@\x83C\x83\x8B\x96\xBC\x82̑O\x82ɕt\x89\xC1\x82\xB3\x82\xEA\x82\xE9 UTF-8
* NULL\x82̂Ƃ\xAB\x95t\x89\xC1\x82\xB3\x82\xEA\x82Ȃ\xA2
- * @param[in] unique TRUE\x82̂Ƃ\xAB
- * \x83t\x83@\x83C\x83\x8B\x82\xAA\x91\xB6\x8D݂\xB5\x82\xBD\x82Ƃ\xAB\x83t\x83@\x83C\x83\x8B\x96\xBC\x82̌\xE3\x82\xEB\x82ɐ\x94\x8E\x9A\x82\xF0\x92lj\xC1\x82\xB7\x82\xE9
+ * @param[in] unique TRUE\x82̂Ƃ\xAB\x81A\x82\xB7\x82łɃt\x83@\x83C\x83\x8B\x82\xAA\x91\xB6\x8D݂\xB5\x82Ă\xA2\x82邩\x83`\x83F\x83b\x83N\x82\xB7\x82\xE9
+ * \x83t\x83@\x83C\x83\x8B\x82\xAA\x91\xB6\x8D݂\xB5\x82\xBD\x82Ƃ\xAB\x81A\x83t\x83@\x83C\x83\x8B\x96\xBC\x82̌\xE3\x82\xEB\x82ɐ\x94\x8E\x9A\x82\xF0\x92lj\xC1\x82\xB7\x82\xE9
* @retval \x83t\x83@\x83C\x83\x8B\x96\xBC UTF-8
* \x95s\x97v\x82ɂȂ\xC1\x82\xBD\x82\xE7 free() \x82\xB7\x82\xE9
*/
Modified: trunk/teraterm/ttpfile/ftlib.c
===================================================================
--- trunk/teraterm/ttpfile/ftlib.c 2020-12-20 12:14:11 UTC (rev 9094)
+++ trunk/teraterm/ttpfile/ftlib.c 2020-12-20 12:14:25 UTC (rev 9095)
@@ -77,13 +77,6 @@
return CRC;
}
-void FTSetTimeOut(PFileVarProto fv, int T)
-{
- KillTimer(fv->HMainWin, IdProtoTimer);
- if (T==0) return;
- SetTimer(fv->HMainWin, IdProtoTimer, T*1000, NULL);
-}
-
//
// \x83v\x83\x8D\x83g\x83R\x83\x8B\x97p\x83\x8D\x83O
//
Modified: trunk/teraterm/ttpfile/ftlib.h
===================================================================
--- trunk/teraterm/ttpfile/ftlib.h 2020-12-20 12:14:11 UTC (rev 9094)
+++ trunk/teraterm/ttpfile/ftlib.h 2020-12-20 12:14:25 UTC (rev 9095)
@@ -39,7 +39,6 @@
BOOL GetNextFname(PFileVarProto fv);
WORD UpdateCRC(BYTE b, WORD CRC);
LONG UpdateCRC32(BYTE b, LONG CRC);
-void FTSetTimeOut(PFileVarProto fv, int T);
typedef struct ProtoLog {
// public
Modified: trunk/teraterm/ttpfile/kermit.c
===================================================================
--- trunk/teraterm/ttpfile/kermit.c 2020-12-20 12:14:11 UTC (rev 9094)
+++ trunk/teraterm/ttpfile/kermit.c 2020-12-20 12:14:25 UTC (rev 9095)
@@ -346,7 +346,7 @@
if (kv->KmtYour.EOL > 0)
CommBinaryOut(cv,&(kv->KmtYour.EOL), 1);
- FTSetTimeOut(fv,kv->KmtYour.TIME);
+ fv->FTSetTimeOut(fv,kv->KmtYour.TIME);
}
static void KmtMakePacket(PFileVarProto fv, PKmtVar kv, BYTE SeqNum, BYTE PktType, int DataLen)
@@ -1262,7 +1262,7 @@
break;
case IdKmtReceive:
kv->KmtState = ReceiveInit;
- FTSetTimeOut(fv,kv->KmtYour.TIME);
+ fv->FTSetTimeOut(fv,kv->KmtYour.TIME);
break;
case IdKmtGet:
KmtSendInitPkt(fv,kv,cv,'I');
Modified: trunk/teraterm/ttpfile/quickvan.c
===================================================================
--- trunk/teraterm/ttpfile/quickvan.c 2020-12-20 12:14:11 UTC (rev 9094)
+++ trunk/teraterm/ttpfile/quickvan.c 2020-12-20 12:14:25 UTC (rev 9095)
@@ -143,7 +143,7 @@
b = NAK;
QVWrite(fv,qv,cv,&b, 1);
- FTSetTimeOut(fv,TimeOutRecv);
+ fv->FTSetTimeOut(fv,TimeOutRecv);
}
static void QVSendACK(PFileVarProto fv, PQVVar qv, PComVar cv)
@@ -150,7 +150,7 @@
{
BYTE b;
- FTSetTimeOut(fv,0);
+ fv->FTSetTimeOut(fv,0);
b = ACK;
QVWrite(fv,qv,cv,&b, 1);
qv->QVState = QV_Close;
@@ -189,7 +189,7 @@
case IdQVSend:
qv->QVState = QV_SendInit1;
qv->PktState = QVpktSTX;
- FTSetTimeOut(fv,TimeOutSend);
+ fv->FTSetTimeOut(fv,TimeOutSend);
break;
case IdQVReceive:
qv->QVState = QV_RecvInit1;
@@ -222,11 +222,11 @@
((qv->QVState==QV_RecvData) ||
(qv->QVState==QV_RecvDataRetry)))
{
- FTSetTimeOut(fv,TimeOutEOT);
+ fv->FTSetTimeOut(fv,TimeOutEOT);
qv->QVState = QV_RecvEOT;
return;
}
- FTSetTimeOut(fv,TimeOutCANSend);
+ fv->FTSetTimeOut(fv,TimeOutCANSend);
qv->QVState = QV_Cancel;
}
@@ -248,9 +248,9 @@
qv->PktOutCount = qv->PktOutLen;
qv->PktOutPtr = 0;
if (qv->QVMode==IdQVReceive)
- FTSetTimeOut(fv,TimeOutRecv);
+ fv->FTSetTimeOut(fv,TimeOutRecv);
else
- FTSetTimeOut(fv,TimeOutSend);
+ fv->FTSetTimeOut(fv,TimeOutSend);
}
static void QVSetResPacket(PQVVar qv, BYTE Typ, BYTE Num, int DataLen)
@@ -273,7 +273,7 @@
static void QVSendVACK(PFileVarProto fv, PQVVar qv, BYTE Seq)
{
- FTSetTimeOut(fv,TimeOutRecv);
+ fv->FTSetTimeOut(fv,TimeOutRecv);
qv->RetryCount = 10;
qv->QVState = QV_RecvData;
if (((int)qv->SeqNum % (int)qv->AValue) == 0)
@@ -282,7 +282,7 @@
static void QVSendVNAK(PFileVarProto fv, PQVVar qv)
{
- FTSetTimeOut(fv,TimeOutRecv);
+ fv->FTSetTimeOut(fv,TimeOutRecv);
QVSetResPacket(qv,'N',LOBYTE(qv->SeqNum+1),0);
if (qv->QVState==QV_RecvData)
{
@@ -293,7 +293,7 @@
static void QVSendVSTAT(PFileVarProto fv, PQVVar qv)
{
- FTSetTimeOut(fv,TimeOutRecv);
+ fv->FTSetTimeOut(fv,TimeOutRecv);
qv->PktOut[3] = 0x30;
QVSetResPacket(qv,'T',LOBYTE(qv->SeqNum),1);
qv->RetryCount = 10;
@@ -390,7 +390,7 @@
QVSetResPacket(qv,'R',0,6);
qv->QVState = QV_RecvInit2;
qv->RetryCount = 10;
- FTSetTimeOut(fv,TimeOutRecv);
+ fv->FTSetTimeOut(fv,TimeOutRecv);
return TRUE;
}
@@ -500,7 +500,7 @@
qv->QVState = QV_RecvData;
qv->SeqNum = 0;
qv->RetryCount = 10;
- FTSetTimeOut(fv,TimeOutRecv);
+ fv->FTSetTimeOut(fv,TimeOutRecv);
return TRUE;
}
@@ -613,7 +613,7 @@
if ((c>0) && qv->CanFlag)
{
qv->CanFlag = FALSE;
- FTSetTimeOut(fv,TimeOutRecv);
+ fv->FTSetTimeOut(fv,TimeOutRecv);
}
EOTFlag = FALSE;
@@ -679,7 +679,7 @@
}
else {
qv->PktState =QVpktSOH;
- FTSetTimeOut(fv,TimeOutRecv);
+ fv->FTSetTimeOut(fv,TimeOutRecv);
}
}
else
@@ -705,7 +705,7 @@
if (! GetPkt)
{
if (qv->CanFlag)
- FTSetTimeOut(fv,TimeOutCAN);
+ fv->FTSetTimeOut(fv,TimeOutCAN);
if (EOTFlag)
switch (qv->QVState) {
@@ -819,7 +819,7 @@
QVSetPacket(qv,0,0x30);
qv->QVState = QV_SendInit2;
qv->PktState = QVpktSTX;
- FTSetTimeOut(fv,TimeOutSend);
+ fv->FTSetTimeOut(fv,TimeOutSend);
}
static void QVSendEOT(PFileVarProto fv, PQVVar qv, PComVar cv)
@@ -838,7 +838,7 @@
b = EOT;
QVWrite(fv,qv,cv,&b, 1);
- FTSetTimeOut(fv,TimeOutSend);
+ fv->FTSetTimeOut(fv,TimeOutSend);
}
static void QVPutNum2(PQVVar qv, WORD Num, int *i)
@@ -926,7 +926,7 @@
else
qv->QVState = QV_SendNext;
qv->PktState = QVpktSTX;
- FTSetTimeOut(fv,TimeOutSend);
+ fv->FTSetTimeOut(fv,TimeOutSend);
}
static void QVSendVDATA(PFileVarProto fv, PQVVar qv)
@@ -963,7 +963,7 @@
/* send VDAT */
QVSetPacket(qv,LOBYTE(qv->SeqSent),LOBYTE(~ qv->SeqSent));
if (qv->SeqSent==qv->WinEnd) /* window close */
- FTSetTimeOut(fv,TimeOutSend);
+ fv->FTSetTimeOut(fv,TimeOutSend);
}
else if ((qv->SeqSent==qv->FileEnd) &&
! qv->EnqFlag)
@@ -974,7 +974,7 @@
qv->PktOut[3+i] = 0;
/* send VENQ */
QVSetPacket(qv,0,0x32);
- FTSetTimeOut(fv,TimeOutSend);
+ fv->FTSetTimeOut(fv,TimeOutSend);
qv->EnqFlag = TRUE;
}
@@ -1051,7 +1051,7 @@
qv->WinEnd = qv->FileEnd;
qv->EnqFlag = FALSE;
qv->QVState = QV_SendData;
- FTSetTimeOut(fv,0);
+ fv->FTSetTimeOut(fv,0);
}
static BOOL QVCheckWindow7(PQVVar qv, WORD w0, WORD w1, BYTE b, LPWORD w)
@@ -1073,7 +1073,7 @@
if (QVCheckWindow7(qv,(WORD)(qv->SeqNum+1),qv->SeqSent,qv->PktIn[2],&w))
{
- FTSetTimeOut(fv,0);
+ fv->FTSetTimeOut(fv,0);
qv->SeqNum = w;
qv->WinEnd = qv->SeqNum + qv->WinSize;
if (qv->WinEnd > qv->FileEnd)
@@ -1093,7 +1093,7 @@
if ((qv->QVState==QV_SendDataRetry) &&
(qv->PktIn[1]==LOBYTE(qv->SeqNum+1)))
{
- FTSetTimeOut(fv,0);
+ fv->FTSetTimeOut(fv,0);
if (QVCountRetry(fv,qv,cv)) return;
qv->SeqSent = qv->SeqNum;
qv->WinEnd = qv->SeqNum + qv->WinSize;
@@ -1105,7 +1105,7 @@
if (QVCheckWindow7(qv,(WORD)(qv->SeqNum+1),(WORD)(qv->SeqSent+1),qv->PktIn[2],&w))
{
- FTSetTimeOut(fv,0);
+ fv->FTSetTimeOut(fv,0);
qv->SeqNum = w-1;
qv->SeqSent = qv->SeqNum;
qv->WinEnd = qv->SeqNum + qv->WinSize;
@@ -1246,7 +1246,7 @@
case 'P': /* VRPOS */
if (qv->SeqNum==0)
{
- FTSetTimeOut(fv,0);
+ fv->FTSetTimeOut(fv,0);
qv->SeqSent = 0;
qv->WinEnd = qv->WinSize;
if (qv->WinEnd > qv->FileEnd)
@@ -1272,7 +1272,7 @@
case 'P': /* VRPOS */
if (qv->SeqNum==0)
{
- FTSetTimeOut(fv,0);
+ fv->FTSetTimeOut(fv,0);
if (QVCountRetry(fv,qv,cv))
return TRUE;
qv->SeqSent = 0;
Modified: trunk/teraterm/ttpfile/xmodem.c
===================================================================
--- trunk/teraterm/ttpfile/xmodem.c 2020-12-20 12:14:11 UTC (rev 9094)
+++ trunk/teraterm/ttpfile/xmodem.c 2020-12-20 12:14:25 UTC (rev 9095)
@@ -181,7 +181,7 @@
}
XWrite(fv, xv, cv, &b, 1);
xv->PktReadMode = XpktSOH;
- FTSetTimeOut(fv, t);
+ fv->FTSetTimeOut(fv, t);
}
static WORD XCalcCheck(PXVar xv, PCHAR PktBuf)
@@ -291,7 +291,7 @@
free(filename);
}
- FTSetTimeOut(fv, xv->TOutVLong);
+ fv->FTSetTimeOut(fv, xv->TOutVLong);
break;
case IdXReceive:
XSendNAK(fv, xv, cv);
@@ -343,7 +343,7 @@
XSetOpt(fv, xv, XoptCRC);
else if (xv->XOpt == Xopt1kCksum)
XSetOpt(fv, xv, XoptCheck);
- FTSetTimeOut(fv, xv->TOutShort);
+ fv->FTSetTimeOut(fv, xv->TOutShort);
break;
case STX:
xv->PktIn[0] = b;
@@ -352,7 +352,7 @@
XSetOpt(fv, xv, Xopt1kCRC);
else if (xv->XOpt == XoptCheck)
XSetOpt(fv, xv, Xopt1kCksum);
- FTSetTimeOut(fv, xv->TOutShort);
+ fv->FTSetTimeOut(fv, xv->TOutShort);
break;
case EOT:
b = ACK;
@@ -381,7 +381,7 @@
case XpktBLK:
xv->PktIn[1] = b;
xv->PktReadMode = XpktBLK2;
- FTSetTimeOut(fv, xv->TOutShort);
+ fv->FTSetTimeOut(fv, xv->TOutShort);
break;
case XpktBLK2:
xv->PktIn[2] = b;
@@ -389,7 +389,7 @@
xv->PktBufPtr = 3;
xv->PktBufCount = xv->DataLen + xv->CheckLen;
xv->PktReadMode = XpktDATA;
- FTSetTimeOut(fv, xv->TOutShort);
+ fv->FTSetTimeOut(fv, xv->TOutShort);
} else
XSendNAK(fv, xv, cv);
break;
@@ -399,10 +399,10 @@
xv->PktBufCount--;
GetPkt = xv->PktBufCount == 0;
if (GetPkt) {
- FTSetTimeOut(fv, xv->TOutLong);
+ fv->FTSetTimeOut(fv, xv->TOutLong);
xv->PktReadMode = XpktSOH;
} else
- FTSetTimeOut(fv, xv->TOutShort);
+ fv->FTSetTimeOut(fv, xv->TOutShort);
break;
}
}
@@ -467,7 +467,7 @@
fv->SetDlgByteCount(fv, fv->ByteCount);
fv->SetDlgTime(fv, fv->StartTime, fv->ByteCount);
- FTSetTimeOut(fv, xv->TOutLong);
+ fv->FTSetTimeOut(fv, xv->TOutLong);
return TRUE;
}
@@ -534,7 +534,7 @@
xv->CANCount = 0;
}
// reset timeout timer
- FTSetTimeOut(fv, xv->TOutVLong);
+ fv->FTSetTimeOut(fv, xv->TOutVLong);
do {
i = XRead1Byte(fv, xv, cv, &b);
Modified: trunk/teraterm/ttpfile/ymodem.c
===================================================================
--- trunk/teraterm/ttpfile/ymodem.c 2020-12-20 12:14:11 UTC (rev 9094)
+++ trunk/teraterm/ttpfile/ymodem.c 2020-12-20 12:14:25 UTC (rev 9095)
@@ -209,7 +209,7 @@
}
YWrite(fv,yv,cv,&b,1);
yv->PktReadMode = XpktSOH;
- FTSetTimeOut(fv,t);
+ fv->FTSetTimeOut(fv,t);
}
static void YSendNAKTimeout(PFileVarProto fv, PYVar yv, PComVar cv)
@@ -251,7 +251,7 @@
}
YWrite(fv,yv,cv,&b,1);
yv->PktReadMode = XpktSOH;
- FTSetTimeOut(fv,t);
+ fv->FTSetTimeOut(fv,t);
}
static WORD YCalcCheck(PYVar yv, const PCHAR PktBuf, const WORD len)
@@ -401,7 +401,7 @@
YWrite(fv,yv,cv, inistr , strlen(inistr));
}
- FTSetTimeOut(fv, yv->TOutVLong);
+ fv->FTSetTimeOut(fv, yv->TOutVLong);
break;
case IdYReceive:
@@ -500,7 +500,7 @@
yv->PktIn[0] = b;
yv->PktReadMode = XpktBLK;
yv->__DataLen = SOH_DATALEN;
- FTSetTimeOut(fv,yv->TOutShort);
+ fv->FTSetTimeOut(fv,yv->TOutShort);
}
else if (b==STX)
{
@@ -507,7 +507,7 @@
yv->PktIn[0] = b;
yv->PktReadMode = XpktBLK;
yv->__DataLen = STX_DATALEN;
- FTSetTimeOut(fv,yv->TOutShort);
+ fv->FTSetTimeOut(fv,yv->TOutShort);
}
else if (b==EOT)
{
@@ -547,7 +547,7 @@
case XpktBLK:
yv->PktIn[1] = b;
yv->PktReadMode = XpktBLK2;
- FTSetTimeOut(fv,yv->TOutShort);
+ fv->FTSetTimeOut(fv,yv->TOutShort);
break;
case XpktBLK2:
nak = 1;
@@ -565,7 +565,7 @@
yv->PktBufPtr = 3;
yv->PktBufCount = yv->__DataLen + yv->CheckLen;
yv->PktReadMode = XpktDATA;
- FTSetTimeOut(fv,yv->TOutShort);
+ fv->FTSetTimeOut(fv,yv->TOutShort);
}
else
YSendNAK(fv,yv,cv);
@@ -577,11 +577,11 @@
GetPkt = yv->PktBufCount==0;
if (GetPkt)
{
- FTSetTimeOut(fv,yv->TOutLong);
+ fv->FTSetTimeOut(fv,yv->TOutLong);
yv->PktReadMode = XpktSOH;
}
else
- FTSetTimeOut(fv,yv->TOutShort);
+ fv->FTSetTimeOut(fv,yv->TOutShort);
break;
}
@@ -712,7 +712,7 @@
SetDlgNum(fv->HWin, IDC_PROTOBYTECOUNT, fv->ByteCount);
SetDlgTime(fv->HWin, IDC_PROTOELAPSEDTIME, fv->StartTime, fv->ByteCount);
- FTSetTimeOut(fv,yv->TOutLong);
+ fv->FTSetTimeOut(fv,yv->TOutLong);
return TRUE;
}
@@ -837,7 +837,7 @@
}
// reset timeout timer
- FTSetTimeOut(fv, yv->TOutVLong);
+ fv->FTSetTimeOut(fv, yv->TOutVLong);
#if 0
// \x8C㑱\x82̃T\x81[\x83o\x82\xA9\x82\xE7\x82̃f\x81[\x83^\x82\xF0\x93ǂݎ̂Ă\xE9\x81B
do
Modified: trunk/teraterm/ttpfile/zmodem.c
===================================================================
--- trunk/teraterm/ttpfile/zmodem.c 2020-12-20 12:14:11 UTC (rev 9094)
+++ trunk/teraterm/ttpfile/zmodem.c 2020-12-20 12:14:25 UTC (rev 9095)
@@ -456,7 +456,7 @@
if (zv->CtlEsc)
zv->TxHdr[ZF0] = zv->TxHdr[ZF0] | ESCCTL;
ZShHdr(zv, ZRINIT);
- FTSetTimeOut(fv, zv->TOutInit);
+ fv->FTSetTimeOut(fv, zv->TOutInit);
}
static void ZSendRQInit(PFileVarProto fv, PZVar zv, PComVar cv)
@@ -469,7 +469,7 @@
{
ZStoHdr(zv, zv->Pos);
ZShHdr(zv, ZRPOS);
- FTSetTimeOut(fv, zv->TimeOut);
+ fv->FTSetTimeOut(fv, zv->TimeOut);
}
static void ZSendACK(PFileVarProto fv, PZVar zv)
@@ -476,7 +476,7 @@
{
ZStoHdr(zv, 0);
ZShHdr(zv, ZACK);
- FTSetTimeOut(fv, zv->TimeOut);
+ fv->FTSetTimeOut(fv, zv->TimeOut);
}
static void ZSendNAK(PZVar zv)
@@ -917,7 +917,7 @@
case ZSINIT:
zv->ZPktState = Z_PktGetData;
if (zv->ZState == Z_RecvInit)
- FTSetTimeOut(fv, zv->TOutInit);
+ fv->FTSetTimeOut(fv, zv->TOutInit);
break;
case ZACK:
switch (zv->ZState) {
@@ -939,7 +939,7 @@
zv->ZPktState = Z_PktGetData;
if ((zv->ZState == Z_RecvInit) || (zv->ZState == Z_RecvInit2)) {
zv->BinFlag = zv->RxHdr[ZF0] != ZCNL;
- FTSetTimeOut(fv, zv->TOutInit);
+ fv->FTSetTimeOut(fv, zv->TOutInit);
}
break;
case ZSKIP:
@@ -980,7 +980,7 @@
zv->ZState = Z_RecvFIN;
ZSendFIN(zv);
zv->CanCount = 2;
- FTSetTimeOut(fv, zv->TOutFin);
+ fv->FTSetTimeOut(fv, zv->TOutFin);
} else {
zv->ZState = Z_End;
ZWrite(fv, zv, cv, "OO", 2);
@@ -1005,7 +1005,7 @@
ZSendRPOS(fv, zv);
return;
} else {
- FTSetTimeOut(fv, zv->TimeOut);
+ fv->FTSetTimeOut(fv, zv->TimeOut);
zv->ZPktState = Z_PktGetData;
}
break;
@@ -1076,7 +1076,7 @@
if ((zv->ZState != Z_RecvInit) && (zv->ZState != Z_RecvInit2))
return FALSE;
/* kill timer */
- FTSetTimeOut(fv, 0);
+ fv->FTSetTimeOut(fv, 0);
zv->CRRecv = FALSE;
/* file name */
@@ -1119,7 +1119,7 @@
SetDlgTime(fv->HWin, IDC_PROTOELAPSEDTIME, GetTickCount(), fv->ByteCount);
/* set timeout for data */
- FTSetTimeOut(fv, zv->TimeOut);
+ fv->FTSetTimeOut(fv, zv->TimeOut);
return TRUE;
}
@@ -1132,7 +1132,7 @@
if (zv->ZState != Z_RecvData)
return FALSE;
/* kill timer */
- FTSetTimeOut(fv, 0);
+ fv->FTSetTimeOut(fv, 0);
if (zv->BinFlag)
file->WriteFile(file, zv->PktIn, zv->PktInPtr);
@@ -1157,7 +1157,7 @@
SetDlgTime(fv->HWin, IDC_PROTOELAPSEDTIME, fv->StartTime, fv->ByteCount);
/* set timeout for data */
- FTSetTimeOut(fv, zv->TimeOut);
+ fv->FTSetTimeOut(fv, zv->TimeOut);
return TRUE;
}