Tera TermRevision: 10445
https://osdn.net/projects/ttssh2/scm/svn/commits/10445
Author: zmatsuo
Date: 2023-01-01 00:31:34 +0900 (Sun, 01 Jan 2023)
Log Message:
-----------
デフォルトログファイル名をUnicode化した
Modified Paths:
--------------
trunk/teraterm/common/tttypes.h
trunk/teraterm/teraterm/addsetting.cpp
trunk/teraterm/teraterm/filesys_log.cpp
trunk/teraterm/ttpcmn/ttcmn_dup.cpp
trunk/teraterm/ttpset/ttset.c
-------------- next part --------------
Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h 2022-12-30 15:46:12 UTC (rev 10444)
+++ trunk/teraterm/common/tttypes.h 2022-12-31 15:31:34 UTC (rev 10445)
@@ -467,7 +467,7 @@
char ViewlogEditor[MAX_PATH];
WORD LogTypePlainText;
WORD LogTimestamp;
- char LogDefaultName[80];
+ char reserve_LogDefaultName[80]; // \x94p\x8E~,LogDefaultNameW \x82ֈڍs
char reserve_LogDefaultPath[MAX_PATH]; // \x94p\x8E~,LogDefaultPathW \x82ֈڍs
WORD LogAutoStart;
unsigned int PasteFlag;
@@ -614,6 +614,7 @@
WORD WindowCornerDontround;
wchar_t DialogFontNameW[LF_FACESIZE];
BOOL NotifySound;
+ wchar_t *LogDefaultNameW;
// Experimental
BYTE ExperimentalTreeProprtySheetEnable;
Modified: trunk/teraterm/teraterm/addsetting.cpp
===================================================================
--- trunk/teraterm/teraterm/addsetting.cpp 2022-12-30 15:46:12 UTC (rev 10444)
+++ trunk/teraterm/teraterm/addsetting.cpp 2022-12-31 15:31:34 UTC (rev 10445)
@@ -1440,7 +1440,7 @@
SetDlgItemTextA(IDC_VIEWLOG_EDITOR, ts.ViewlogEditor);
// Log Default File Name
- SetDlgItemTextA(IDC_DEFAULTNAME_EDITOR, ts.LogDefaultName);
+ SetDlgItemTextW(IDC_DEFAULTNAME_EDITOR, ts.LogDefaultNameW);
static const wchar_t *logfile_patterns[] = {
L"%H%M%S.log",
L"%y%m%d%H%M%S.log",
@@ -1748,8 +1748,7 @@
return;
}
- WideCharToACP_t(def_name, ts.LogDefaultName, sizeof(ts.LogDefaultName));
- free(def_name);
+ ts.LogDefaultNameW = def_name;
free(buf3);
}
Modified: trunk/teraterm/teraterm/filesys_log.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys_log.cpp 2022-12-30 15:46:12 UTC (rev 10444)
+++ trunk/teraterm/teraterm/filesys_log.cpp 2022-12-31 15:31:34 UTC (rev 10445)
@@ -1440,8 +1440,7 @@
wchar_t *fname;
if (log_filename == NULL) {
dir = wcsdup(ts.LogDefaultPathW);
- fname = ToWcharA(ts.LogDefaultName);
- //fname = wcsdup(ts.LogDefaultNameW);
+ fname = wcsdup(ts.LogDefaultNameW);
} else if (!IsRelativePathW(log_filename)) {
// \x90\xE2\x91p\x83X\x82\xAA\x93\xFC\x97͂\xB3\x82ꂽ
dir = ExtractDirNameW(log_filename);
Modified: trunk/teraterm/ttpcmn/ttcmn_dup.cpp
===================================================================
--- trunk/teraterm/ttpcmn/ttcmn_dup.cpp 2022-12-30 15:46:12 UTC (rev 10444)
+++ trunk/teraterm/ttpcmn/ttcmn_dup.cpp 2022-12-31 15:31:34 UTC (rev 10445)
@@ -253,6 +253,7 @@
{ MALLOCED_WSTRING_INFO(TTTSet, FileDirW) },
{ MALLOCED_WSTRING_INFO(TTTSet, EtermLookfeel.BGThemeFileW) },
{ MALLOCED_WSTRING_INFO(TTTSet, EtermLookfeel.BGSPIPathW) },
+ { MALLOCED_WSTRING_INFO(TTTSet, LogDefaultNameW) },
{ 0, 0, TSerializeInfo::COPY },
};
Modified: trunk/teraterm/ttpset/ttset.c
===================================================================
--- trunk/teraterm/ttpset/ttset.c 2022-12-30 15:46:12 UTC (rev 10444)
+++ trunk/teraterm/ttpset/ttset.c 2022-12-31 15:31:34 UTC (rev 10445)
@@ -1071,10 +1071,9 @@
/* File Transfer dialog visibility */
ts->FTHideDialog = GetOnOff(Section, "FTHideDialog", FName, FALSE);
- /* Default Log file name (2006.8.28 maya) */
- GetPrivateProfileString(Section, "LogDefaultName", "teraterm.log",
- ts->LogDefaultName, sizeof(ts->LogDefaultName),
- FName);
+ /* Default Log file name */
+ hGetPrivateProfileStringW(SectionW, L"LogDefaultName", L"teraterm.log", FName,
+ &ts->LogDefaultNameW);
/* Default Log file path */
hGetPrivateProfileStringW(SectionW, L"LogDefaultPath", ts->LogDirW, FName, &ts->LogDefaultPathW);
@@ -2527,9 +2526,9 @@
break;
}
- /* Default Log file name (2006.8.28 maya) */
- WritePrivateProfileString(Section, "LogDefaultName",
- ts->LogDefaultName, FName);
+ /* Default Log file name */
+ WritePrivateProfileStringW(SectionW, L"LogDefaultName",
+ ts->LogDefaultNameW, FName);
/* Default Log file path */
if (wcscmp(ts->LogDefaultPathW, ts->LogDirW) != 0) {