Tera TermRevision: 9001
https://osdn.net/projects/ttssh2/scm/svn/commits/9001
Author: zmatsuo
Date: 2020-11-02 00:36:36 +0900 (Mon, 02 Nov 2020)
Log Message:
-----------
QuickVAN の QVStart() API を使用しないようにした
- QVStartReceive(), QVStartSend() を使用
Modified Paths:
--------------
branches/proto_unicode/teraterm/teraterm/filesys.h
branches/proto_unicode/teraterm/teraterm/filesys_proto.cpp
branches/proto_unicode/teraterm/teraterm/ttdde.c
branches/proto_unicode/teraterm/teraterm/vtwin.cpp
branches/proto_unicode/teraterm/ttpfile/quickvan.c
-------------- next part --------------
Modified: branches/proto_unicode/teraterm/teraterm/filesys.h
===================================================================
--- branches/proto_unicode/teraterm/teraterm/filesys.h 2020-11-01 15:36:22 UTC (rev 9000)
+++ branches/proto_unicode/teraterm/teraterm/filesys.h 2020-11-01 15:36:36 UTC (rev 9001)
@@ -58,8 +58,7 @@
BOOL ZMODEMStartSend(const char *fiename, WORD ParamBinaryFlag, BOOL autostart);
BOOL BPStartSend(const char *filename);
BOOL BPStartReceive(BOOL macro, BOOL autostart);
-void QVStart(int mode);
-BOOL QVStartReceive(void);
+BOOL QVStartReceive(BOOL macro);
BOOL QVStartSend(const char *filename);
#ifdef __cplusplus
Modified: branches/proto_unicode/teraterm/teraterm/filesys_proto.cpp
===================================================================
--- branches/proto_unicode/teraterm/teraterm/filesys_proto.cpp 2020-11-01 15:36:22 UTC (rev 9000)
+++ branches/proto_unicode/teraterm/teraterm/filesys_proto.cpp 2020-11-01 15:36:36 UTC (rev 9001)
@@ -1286,8 +1286,10 @@
/* disable transmit delay (serial port) */
cv.DelayFlag = FALSE;
- if (! OpenProtoDlg(FileVar,PROTO_YM,IdYReceive,Opt,0))
+ if (! OpenProtoDlg(FileVar,PROTO_YM,IdYReceive,Opt,0)) {
ProtoEnd();
+ return FALSE;
+ }
return TRUE;
}
@@ -1340,8 +1342,10 @@
/* disable transmit delay (serial port) */
cv.DelayFlag = FALSE;
- if (! OpenProtoDlg(FileVar,PROTO_YM, IdYSend,Opt,0))
+ if (! OpenProtoDlg(FileVar,PROTO_YM, IdYSend,Opt,0)) {
ProtoEnd();
+ return FALSE;
+ }
return TRUE;
}
@@ -1386,8 +1390,10 @@
cv.DelayFlag = FALSE;
WORD Opt = 0;
- if (! OpenProtoDlg(FileVar,PROTO_ZM,mode,Opt,0))
+ if (! OpenProtoDlg(FileVar,PROTO_ZM,mode,Opt,0)) {
ProtoEnd();
+ return FALSE;
+ }
return TRUE;
}
@@ -1446,8 +1452,10 @@
/* disable transmit delay (serial port) */
cv.DelayFlag = FALSE;
- if (! OpenProtoDlg(FileVar,PROTO_ZM,mode,Opt,0))
+ if (! OpenProtoDlg(FileVar,PROTO_ZM,mode,Opt,0)) {
ProtoEnd();
+ return FALSE;
+ }
return TRUE;
}
@@ -1537,6 +1545,7 @@
if (! OpenProtoDlg(FileVar,PROTO_BP, IdBPSend,0,0)) {
ProtoEnd();
+ return FALSE;
}
return TRUE;
@@ -1573,60 +1582,55 @@
/* disable transmit delay (serial port) */
cv.DelayFlag = FALSE;
- if (! OpenProtoDlg(FileVar,PROTO_BP,mode,0,0))
+ if (! OpenProtoDlg(FileVar,PROTO_BP,mode,0,0)) {
ProtoEnd();
+ return FALSE;
+ }
return TRUE;
}
-void QVStart(int mode)
+BOOL QVStartReceive(BOOL macro)
{
- WORD W;
- char uimsg[MAX_UIMSG];
- const char *UILanguageFile = ts.UILanguageFile;
+ if (FileVar != NULL) {
+ return FALSE;
+ }
+ if (!NewFileVar_(&FileVar)) {
+ return FALSE;
+ }
+ if (macro) {
+ FileVar->NoMsg = TRUE;
+ }
+ int mode = IdQVReceive;
+
if (! ProtoStart())
- return;
+ return FALSE;
TFileVarProto *fv = FileVar;
- if (mode==IdQVSend)
- {
- strncpy_s(fv->DlgCaption, sizeof(fv->DlgCaption),"Tera Term: ", _TRUNCATE);
- get_lang_msg("FILEDLG_TRANS_TITLE_QVSEND", uimsg, sizeof(uimsg), TitQVSend, UILanguageFile);
- strncat_s(fv->DlgCaption, sizeof(fv->DlgCaption), uimsg, _TRUNCATE);
+ FileVar->OpId = OpQVRcv;
- FileVar->OpId = OpQVSend;
- if (strlen(&(FileVar->FullName[FileVar->DirLen]))==0)
- {
- if (! _GetMultiFname(fv->HMainWin, GMF_QV, fv->DlgCaption, &W) ||
- (FileVar->NumFname==0))
- {
- ProtoEnd();
- return;
- }
- }
- else
- _SetFileVar(FileVar);
- }
- else {
- FileVar->OpId = OpQVRcv;
+ char uimsg[MAX_UIMSG];
+ const char *UILanguageFile = ts.UILanguageFile;
+ strncpy_s(fv->DlgCaption, sizeof(fv->DlgCaption),"Tera Term: ", _TRUNCATE);
+ get_lang_msg("FILEDLG_TRANS_TITLE_QVRCV", uimsg, sizeof(uimsg), TitQVRcv, UILanguageFile);
+ strncat_s(fv->DlgCaption, sizeof(fv->DlgCaption), uimsg, _TRUNCATE);
- strncpy_s(fv->DlgCaption, sizeof(fv->DlgCaption),"Tera Term: ", _TRUNCATE);
- get_lang_msg("FILEDLG_TRANS_TITLE_QVRCV", uimsg, sizeof(uimsg), TitQVRcv, UILanguageFile);
- strncat_s(fv->DlgCaption, sizeof(fv->DlgCaption), uimsg, _TRUNCATE);
- }
-
TalkStatus = IdTalkQuiet;
/* disable transmit delay (serial port) */
cv.DelayFlag = FALSE;
- if (! OpenProtoDlg(FileVar,PROTO_QV,mode,0,0))
+ if (! OpenProtoDlg(FileVar,PROTO_QV,mode,0,0)) {
ProtoEnd();
+ return FALSE;
+ }
+
+ return TRUE;
}
-BOOL QVStartReceive(void)
+BOOL QVStartSend(const char *filename)
{
if (FileVar != NULL) {
return FALSE;
@@ -1635,27 +1639,44 @@
return FALSE;
}
- FileVar->NoMsg = TRUE;
- QVStart(IdQVReceive);
+ TFileVarProto *fv = FileVar;
- return TRUE;
-}
+ if (! ProtoStart())
+ return FALSE;
-BOOL QVStartSend(const char *filename)
-{
- if (FileVar != NULL) {
- return FALSE;
+ FileVar->OpId = OpQVSend;
+
+ char uimsg[MAX_UIMSG];
+ const char *UILanguageFile = ts.UILanguageFile;
+ strncpy_s(fv->DlgCaption, sizeof(fv->DlgCaption),"Tera Term: ", _TRUNCATE);
+ get_lang_msg("FILEDLG_TRANS_TITLE_QVSEND", uimsg, sizeof(uimsg), TitQVSend, UILanguageFile);
+ strncat_s(fv->DlgCaption, sizeof(fv->DlgCaption), uimsg, _TRUNCATE);
+
+ if (filename == NULL) {
+ WORD Opt;
+ char **filenames = _GetMultiFname(fv->HMainWin, GMF_QV, fv->DlgCaption, &Opt);
+ if (filenames == NULL) {
+ ProtoEnd();
+ return FALSE;
+ }
}
- if (!NewFileVar_(&FileVar)) {
+ else {
+ FileVar->DirLen = 0;
+ strncpy_s(FileVar->FullName, sizeof(FileVar->FullName),filename, _TRUNCATE);
+ FileVar->NumFname = 1;
+ FileVar->NoMsg = TRUE;
+ }
+
+ TalkStatus = IdTalkQuiet;
+
+ /* disable transmit delay (serial port) */
+ cv.DelayFlag = FALSE;
+
+ if (! OpenProtoDlg(FileVar,PROTO_QV,IdQVSend,0,0)) {
+ ProtoEnd();
return FALSE;
}
- FileVar->DirLen = 0;
- strncpy_s(FileVar->FullName, sizeof(FileVar->FullName),filename, _TRUNCATE);
- FileVar->NumFname = 1;
- FileVar->NoMsg = TRUE;
- QVStart(IdQVSend);
-
return TRUE;
}
Modified: branches/proto_unicode/teraterm/teraterm/ttdde.c
===================================================================
--- branches/proto_unicode/teraterm/teraterm/ttdde.c 2020-11-01 15:36:22 UTC (rev 9000)
+++ branches/proto_unicode/teraterm/teraterm/ttdde.c 2020-11-01 15:36:36 UTC (rev 9001)
@@ -591,7 +591,7 @@
break;
}
case CmdQVRecv:
- if (QVStartReceive()) {
+ if (QVStartReceive(TRUE)) {
DdeCmnd = TRUE;
}
else
Modified: branches/proto_unicode/teraterm/teraterm/vtwin.cpp
===================================================================
--- branches/proto_unicode/teraterm/teraterm/vtwin.cpp 2020-11-01 15:36:22 UTC (rev 9000)
+++ branches/proto_unicode/teraterm/teraterm/vtwin.cpp 2020-11-01 15:36:36 UTC (rev 9001)
@@ -4379,13 +4379,13 @@
void CVTWindow::OnFileQVRcv()
{
- QVStart(IdQVReceive);
+ QVStartReceive(FALSE);
}
void CVTWindow::OnFileQVSend()
{
HelpId = HlpFileQVSend;
- QVStart(IdQVSend);
+ QVStartSend(NULL);
}
void CVTWindow::OnFileChangeDir()
Modified: branches/proto_unicode/teraterm/ttpfile/quickvan.c
===================================================================
--- branches/proto_unicode/teraterm/ttpfile/quickvan.c 2020-11-01 15:36:22 UTC (rev 9000)
+++ branches/proto_unicode/teraterm/ttpfile/quickvan.c 2020-11-01 15:36:36 UTC (rev 9001)
@@ -102,9 +102,7 @@
#define NAK 0x15
#define CAN 0x18
-static const char *UILanguageFile;
-
-int QVRead1Byte(PFileVarProto fv, PQVVar qv, PComVar cv, LPBYTE b)
+static int QVRead1Byte(PFileVarProto fv, PQVVar qv, PComVar cv, LPBYTE b)
{
if (CommRead1Byte(cv,b) == 0)
return 0;
@@ -121,7 +119,7 @@
return 1;
}
-int QVWrite(PFileVarProto fv, PQVVar qv, PComVar cv, PCHAR B, int C)
+static int QVWrite(PFileVarProto fv, PQVVar qv, PComVar cv, PCHAR B, int C)
{
int i, j;
@@ -139,7 +137,7 @@
return i;
}
-void QVSendNAK(PFileVarProto fv, PQVVar qv, PComVar cv)
+static void QVSendNAK(PFileVarProto fv, PQVVar qv, PComVar cv)
{
BYTE b;
@@ -148,7 +146,7 @@
FTSetTimeOut(fv,TimeOutRecv);
}
-void QVSendACK(PFileVarProto fv, PQVVar qv, PComVar cv)
+static void QVSendACK(PFileVarProto fv, PQVVar qv, PComVar cv)
{
BYTE b;
@@ -158,11 +156,10 @@
qv->QVState = QV_Close;
}
-BOOL QVInit(PFileVarProto fv, PComVar cv, PTTSet ts)
+static BOOL QVInit(PFileVarProto fv, PComVar cv, PTTSet ts)
{
char uimsg[MAX_UIMSG];
PQVVar qv = fv->data;
- UILanguageFile = ts->UILanguageFile;
qv->WinSize = ts->QVWinSize;
@@ -176,13 +173,6 @@
fv->FileOpen = FALSE;
fv->ByteCount = 0;
- if (qv->QVMode==IdQVReceive)
- {
- strncat_s(fv->DlgCaption, sizeof(fv->DlgCaption), "Tera Term: ", _TRUNCATE);
- get_lang_msg("FILEDLG_TRANS_TITLE_QVRCV", uimsg, sizeof(uimsg), TitQVRcv, UILanguageFile);
- strncat_s(fv->DlgCaption, sizeof(fv->DlgCaption), uimsg, _TRUNCATE);
- }
- SetWindowText(fv->HWin, fv->DlgCaption);
SetDlgItemText(fv->HWin, IDC_PROTOPROT, "Quick-VAN");
InitDlgProgress(fv->HWin, IDC_PROTOPROGRESS, &fv->ProgStat);
@@ -213,7 +203,7 @@
return TRUE;
}
-void QVCancel(PFileVarProto fv, PComVar cv)
+static void QVCancel(PFileVarProto fv, PComVar cv)
{
BYTE b;
PQVVar qv = fv->data;
@@ -241,7 +231,7 @@
qv->QVState = QV_Cancel;
}
-BOOL QVCountRetry(PFileVarProto fv, PQVVar qv, PComVar cv)
+static BOOL QVCountRetry(PFileVarProto fv, PQVVar qv, PComVar cv)
{
qv->RetryCount--;
if (qv->RetryCount<=0)
@@ -253,7 +243,7 @@
return FALSE;
}
-void QVResendPacket(PFileVarProto fv, PQVVar qv)
+static void QVResendPacket(PFileVarProto fv, PQVVar qv)
{
qv->PktOutCount = qv->PktOutLen;
@@ -264,7 +254,7 @@
FTSetTimeOut(fv,TimeOutSend);
}
-void QVSetResPacket(PQVVar qv, BYTE Typ, BYTE Num, int DataLen)
+static void QVSetResPacket(PQVVar qv, BYTE Typ, BYTE Num, int DataLen)
{
int i;
BYTE Sum;
@@ -282,7 +272,7 @@
qv->PktOutPtr = 0;
}
-void QVSendVACK(PFileVarProto fv, PQVVar qv, BYTE Seq)
+static void QVSendVACK(PFileVarProto fv, PQVVar qv, BYTE Seq)
{
FTSetTimeOut(fv,TimeOutRecv);
qv->RetryCount = 10;
@@ -291,7 +281,7 @@
QVSetResPacket(qv,'A',Seq,0);
}
-void QVSendVNAK(PFileVarProto fv, PQVVar qv)
+static void QVSendVNAK(PFileVarProto fv, PQVVar qv)
{
FTSetTimeOut(fv,TimeOutRecv);
QVSetResPacket(qv,'N',LOBYTE(qv->SeqNum+1),0);
@@ -302,7 +292,7 @@
}
}
-void QVSendVSTAT(PFileVarProto fv, PQVVar qv)
+static void QVSendVSTAT(PFileVarProto fv, PQVVar qv)
{
FTSetTimeOut(fv,TimeOutRecv);
qv->PktOut[3] = 0x30;
@@ -311,7 +301,7 @@
qv->QVState = QV_RecvNext;
}
-void QVTimeOutProc(PFileVarProto fv, PComVar cv)
+static void QVTimeOutProc(PFileVarProto fv, PComVar cv)
{
PQVVar qv = fv->data;
if ((qv->QVState==QV_Cancel) ||
@@ -358,7 +348,7 @@
}
}
-BOOL QVParseSINIT(PFileVarProto fv, PQVVar qv)
+static BOOL QVParseSINIT(PFileVarProto fv, PQVVar qv)
{
int i;
BYTE b, n;
@@ -406,8 +396,8 @@
return TRUE;
}
- BOOL QVGetNum2(PQVVar qv, int *i, LPWORD w)
- {
+static BOOL QVGetNum2(PQVVar qv, int *i, LPWORD w)
+{
BOOL Ok;
int j;
BYTE b;
@@ -425,9 +415,9 @@
}
*i = *i + 2;
return Ok;
- }
+}
-BOOL QVParseVFILE(PFileVarProto fv, PQVVar qv)
+static BOOL QVParseVFILE(PFileVarProto fv, PQVVar qv)
{
int i, j;
WORD w;
@@ -489,7 +479,7 @@
return TRUE;
}
-BOOL QVParseVENQ(PFileVarProto fv, PQVVar qv)
+static BOOL QVParseVENQ(PFileVarProto fv, PQVVar qv)
{
struct tm time;
struct utimbuf timebuf;
@@ -541,7 +531,7 @@
return TRUE;
}
-void QVWriteToFile(PFileVarProto fv, PQVVar qv)
+static void QVWriteToFile(PFileVarProto fv, PQVVar qv)
{
int C;
@@ -560,7 +550,7 @@
SetDlgTime(fv->HWin, IDC_PROTOELAPSEDTIME, fv->StartTime, fv->ByteCount);
}
-BOOL QVCheckWindow8(PQVVar qv, WORD w0, WORD w1, BYTE b, LPWORD w)
+static BOOL QVCheckWindow8(PQVVar qv, WORD w0, WORD w1, BYTE b, LPWORD w)
{
WORD i;
@@ -573,7 +563,7 @@
return FALSE;
}
-BOOL QVReadPacket(PFileVarProto fv, PQVVar qv, PComVar cv)
+static BOOL QVReadPacket(PFileVarProto fv, PQVVar qv, PComVar cv)
{
BYTE b;
WORD w0, w1, w;
@@ -766,7 +756,7 @@
return TRUE;
}
-void QVSetPacket(PQVVar qv, BYTE Num, BYTE Typ)
+static void QVSetPacket(PQVVar qv, BYTE Num, BYTE Typ)
{
int i;
@@ -785,7 +775,7 @@
qv->PktOutPtr = 0;
}
-void QVSendSINIT(PFileVarProto fv, PQVVar qv)
+static void QVSendSINIT(PFileVarProto fv, PQVVar qv)
{
int i;
@@ -804,7 +794,7 @@
FTSetTimeOut(fv,TimeOutSend);
}
-void QVSendEOT(PFileVarProto fv, PQVVar qv, PComVar cv)
+static void QVSendEOT(PFileVarProto fv, PQVVar qv, PComVar cv)
{
BYTE b;
@@ -823,15 +813,15 @@
FTSetTimeOut(fv,TimeOutSend);
}
- void QVPutNum2(PQVVar qv, WORD Num, int *i)
- {
+static void QVPutNum2(PQVVar qv, WORD Num, int *i)
+{
qv->PktOut[*i] = Num / 10 + 0x30;
(*i)++;
qv->PktOut[*i] = Num % 10 + 0x30;
(*i)++;
- }
+}
-void QVSendVFILE(PFileVarProto fv, PQVVar qv, PComVar cv)
+static void QVSendVFILE(PFileVarProto fv, PQVVar qv, PComVar cv)
{
int i, j;
struct stat stbuf;
@@ -911,7 +901,7 @@
FTSetTimeOut(fv,TimeOutSend);
}
-void QVSendVDATA(PFileVarProto fv, PQVVar qv)
+static void QVSendVDATA(PFileVarProto fv, PQVVar qv)
{
int i, C;
LONG Pos;
@@ -961,7 +951,7 @@
}
-void QVParseRINIT(PFileVarProto fv, PQVVar qv, PComVar cv)
+static void QVParseRINIT(PFileVarProto fv, PQVVar qv, PComVar cv)
{
int i;
BYTE b, n;
@@ -1002,7 +992,7 @@
QVSendVFILE(fv,qv,cv);
}
-void QVParseVRPOS(PFileVarProto fv, PQVVar qv, PComVar cv)
+static void QVParseVRPOS(PFileVarProto fv, PQVVar qv, PComVar cv)
{
int i;
BYTE b;
@@ -1035,7 +1025,7 @@
FTSetTimeOut(fv,0);
}
-BOOL QVCheckWindow7(PQVVar qv, WORD w0, WORD w1, BYTE b, LPWORD w)
+static BOOL QVCheckWindow7(PQVVar qv, WORD w0, WORD w1, BYTE b, LPWORD w)
{
WORD i;
@@ -1048,7 +1038,7 @@
return FALSE;
}
-void QVParseVACK(PFileVarProto fv, PQVVar qv)
+static void QVParseVACK(PFileVarProto fv, PQVVar qv)
{
WORD w;
@@ -1067,7 +1057,7 @@
}
}
-void QVParseVNAK(PFileVarProto fv, PQVVar qv, PComVar cv)
+static void QVParseVNAK(PFileVarProto fv, PQVVar qv, PComVar cv)
{
WORD w;
@@ -1098,7 +1088,7 @@
}
}
-void QVParseVSTAT(PFileVarProto fv, PQVVar qv, PComVar cv)
+static void QVParseVSTAT(PFileVarProto fv, PQVVar qv, PComVar cv)
{
if (qv->EnqFlag && (qv->PktIn[3]==0x30))
@@ -1114,7 +1104,7 @@
QVCancel(fv,cv);
}
-BOOL QVSendPacket(PFileVarProto fv, PQVVar qv, PComVar cv)
+static BOOL QVSendPacket(PFileVarProto fv, PQVVar qv, PComVar cv)
{
BYTE b;
int c, i;
@@ -1294,7 +1284,7 @@
return TRUE;
}
-BOOL QVParse(PFileVarProto fv, PComVar cv)
+static BOOL QVParse(PFileVarProto fv, PComVar cv)
{
PQVVar qv = fv->data;
switch (qv->QVMode) {