Tera TermRevision: 8896
https://osdn.net/projects/ttssh2/scm/svn/commits/8896
Author: zmatsuo
Date: 2020-08-19 00:27:45 +0900 (Wed, 19 Aug 2020)
Log Message:
-----------
ログ出力内で、グローバルに定義されている構造体を使用しないよう修正
- TFileVar#ttftypes.h を使用しないよう修正
- ローカル構造体に切り替え
- define で名前の付替えを行っている
- TFileVar#ttftypes.h の未使用メンバを削除
Modified Paths:
--------------
trunk/teraterm/common/ttftypes.h
trunk/teraterm/teraterm/filesys_log.cpp
-------------- next part --------------
Modified: trunk/teraterm/common/ttftypes.h
===================================================================
--- trunk/teraterm/common/ttftypes.h 2020-08-18 15:27:38 UTC (rev 8895)
+++ trunk/teraterm/common/ttftypes.h 2020-08-18 15:27:45 UTC (rev 8896)
@@ -132,16 +132,15 @@
DWORD StartTime;
- // log rotate
- int RotateMode; // enum rotate_mode RotateMode;
- LONG RotateSize;
- int RotateStep;
+ int reserve_1;
+ LONG reserve_2;
+ int reserve_3;
- HANDLE LogThread;
- DWORD LogThreadId;
+ HANDLE reserve_4;
+ DWORD reserve_5;
DWORD FileMtime;
- HANDLE LogThreadEvent;
+ HANDLE reserve_6;
} TFileVar;
typedef TFileVar far *PFileVar;
Modified: trunk/teraterm/teraterm/filesys_log.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys_log.cpp 2020-08-18 15:27:38 UTC (rev 8895)
+++ trunk/teraterm/teraterm/filesys_log.cpp 2020-08-18 15:27:45 UTC (rev 8896)
@@ -54,7 +54,6 @@
#include "filesys_log_res.h"
#include "filesys.h"
-#if 0
typedef struct {
HWND HMainWin;
HWND HWin;
@@ -107,7 +106,6 @@
#define PFileVar PFileVar_
#define TFileVar TFileVar_
-#endif
static PFileVar LogVar = NULL;
@@ -152,8 +150,16 @@
if (FTDlg!=NULL)
{
- FTDlg->Create(hInst, HVTWin, fv, &cv, &ts);
- FTDlg->RefreshNum(fv);
+ CFileTransDlgInfo info;
+ info.UILanguageFile = ts.UILanguageFile;
+ info.OpId = fv->OpId;
+ info.DlgCaption = fv->DlgCaption;
+ info.FileName = &fv->FullName[fv->DirLen];
+ info.FullName = fv->FullName;
+ info.HideDialog = fv->HideDialog;
+ info.HMainWin = fv->HMainWin;
+ FTDlg->Create(hInst, &info);
+ FTDlg->RefreshNum(fv->StartTime, fv->FileSize, fv->ByteCount);
}
// if (fv->OpId==OpLog)
@@ -743,7 +749,19 @@
if (! LoadTTFILE()) return FALSE;
LogVar->OpId = OpLog;
- (*SetFileVar)(LogVar);
+ //(*SetFileVar)(LogVar);
+ {
+ int i;
+ char c;
+ PFileVar fv = LogVar;
+ GetFileNamePos(fv->FullName,&(fv->DirLen),&i);
+ c = fv->FullName[fv->DirLen];
+ if (c=='\\'||c=='/') fv->DirLen++;
+ strncpy_s(fv->DlgCaption, sizeof(fv->DlgCaption),"Tera Term: ", _TRUNCATE);
+ char uimsg[MAX_UIMSG];
+ get_lang_msg("FILEDLG_TRANS_TITLE_LOG", uimsg, sizeof(uimsg), TitLog, ts.UILanguageFile);
+ strncat_s(fv->DlgCaption, sizeof(fv->DlgCaption), uimsg, _TRUNCATE);
+ }
FixLogOption();
if (ts.LogBinary > 0)
@@ -1192,8 +1210,10 @@
}
if (FLogIsPause() || cv.ProtoFlag) return;
if (FLogDlg!=NULL)
- FLogDlg->RefreshNum(LogVar);
+ //FLogDlg->RefreshNum(LogVar);
+ FLogDlg->RefreshNum(LogVar->StartTime, LogVar->FileSize, LogVar->ByteCount);
+
// \x83\x8D\x83O\x81E\x83\x8D\x81[\x83e\x81[\x83g
LogRotate();
@@ -1428,7 +1448,8 @@
LogVar->ByteCount =
LogVar->ByteCount + len;
if (FLogDlg!=NULL)
- FLogDlg->RefreshNum(LogVar);
+ //FLogDlg->RefreshNum(LogVar);
+ FLogDlg->RefreshNum(LogVar->StartTime, LogVar->FileSize, LogVar->ByteCount);
}
}