Tera TermRevision: 7938
https://osdn.net/projects/ttssh2/scm/svn/commits/7938
Author: zmatsuo
Date: 2019-08-11 20:29:29 +0900 (Sun, 11 Aug 2019)
Log Message:
-----------
設定の構造体をtttypes.hにまとめた
- cygterm_tをteraterm.hからtttypes.hに移動した
- Get(Set)DlgItemTextのdefineを削除した
Modified Paths:
--------------
trunk/teraterm/common/teraterm.h
trunk/teraterm/common/tttypes.h
trunk/teraterm/teraterm/addsetting.cpp
-------------- next part --------------
Modified: trunk/teraterm/common/teraterm.h
===================================================================
--- trunk/teraterm/common/teraterm.h 2019-08-10 07:32:54 UTC (rev 7937)
+++ trunk/teraterm/common/teraterm.h 2019-08-11 11:29:29 UTC (rev 7938)
@@ -1,6 +1,6 @@
/*
* Copyright (C) 1994-1998 T. Teranishi
- * (C) 2005-2017 TeraTerm Project
+ * (C) 2005-2019 TeraTerm Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -85,16 +85,3 @@
} \
}
-typedef struct cygterm {
- BOOL update_flag;
- char term[128];
- char term_type[80];
- char port_start[80];
- char port_range[80];
- char shell[80];
- char env1[128];
- char env2[128];
- BOOL login_shell;
- BOOL home_chdir;
- BOOL agent_proxy;
-} cygterm_t;
Modified: trunk/teraterm/common/tttypes.h
===================================================================
--- trunk/teraterm/common/tttypes.h 2019-08-10 07:32:54 UTC (rev 7937)
+++ trunk/teraterm/common/tttypes.h 2019-08-11 11:29:29 UTC (rev 7938)
@@ -404,6 +404,20 @@
char BGThemeFile[MAX_PATH];
} eterm_lookfeel_t;
+typedef struct cygterm {
+ BOOL update_flag;
+ char term[128];
+ char term_type[80];
+ char port_start[80];
+ char port_range[80];
+ char shell[80];
+ char env1[128];
+ char env2[128];
+ BOOL login_shell;
+ BOOL home_chdir;
+ BOOL agent_proxy;
+} cygterm_t;
+
/* TTTSet */
struct tttset {
/*------ VTSet --------*/
Modified: trunk/teraterm/teraterm/addsetting.cpp
===================================================================
--- trunk/teraterm/teraterm/addsetting.cpp 2019-08-10 07:32:54 UTC (rev 7937)
+++ trunk/teraterm/teraterm/addsetting.cpp 2019-08-11 11:29:29 UTC (rev 7938)
@@ -37,8 +37,8 @@
#include <commctrl.h>
#include <time.h>
#include <tchar.h>
+#include <crtdbg.h>
-#include "addsetting.h"
#include "teraterm.h"
#include "tttypes.h"
#include "ttwinman.h" // for ts
@@ -46,11 +46,19 @@
#include "ttftypes.h"
#include "dlglib.h"
#include "compat_win.h"
+#include "addsetting.h"
-#undef GetDlgItemText
-#define GetDlgItemText GetDlgItemTextA
-#undef SetDlgItemText
-#define SetDlgItemText SetDlgItemTextA
+#ifdef _DEBUG
+#define free(p) _free_dbg((p), _NORMAL_BLOCK)
+#define _strdup(s) _strdup_dbg((s), _NORMAL_BLOCK, __FILE__, __LINE__)
+#define _wcsdup(s) _wcsdup_dbg((s), _NORMAL_BLOCK, __FILE__, __LINE__)
+#undef _tcsdup
+#ifdef _UNICODE
+#define _tcsdup(s) _wcsdup_dbg((s), _NORMAL_BLOCK, __FILE__, __LINE__)
+#else
+#define _tcsdup(s) _strdup_dbg((s), _NORMAL_BLOCK, __FILE__, __LINE__)
+#endif
+#endif
const mouse_cursor_t MouseCursor[] = {
{"ARROW", IDC_ARROW},
@@ -1182,8 +1190,6 @@
BOOL CLogPropPageDlg::OnCommand(WPARAM wParam, LPARAM lParam)
{
char uimsg[MAX_UIMSG];
- char buf[MAX_PATH];
- char buf2[MAX_PATH];
switch (wParam) {
case IDC_VIEWLOG_PATH | (BN_CLICKED << 16):
@@ -1212,9 +1218,13 @@
// \x83\x8D\x83O\x83f\x83B\x83\x8C\x83N\x83g\x83\x8A\x82̑I\x91\xF0\x83_\x83C\x83A\x83\x8D\x83O
get_lang_msg("FILEDLG_SELECT_LOGDIR_TITLE", ts.UIMsg, sizeof(ts.UIMsg),
"Select log folder", ts.UILanguageFile);
- GetDlgItemText(IDC_DEFAULTPATH_EDITOR, buf, sizeof(buf));
- if (doSelectFolder(GetSafeHwnd(), buf2, sizeof(buf2), buf, ts.UIMsg)) {
- SetDlgItemText(IDC_DEFAULTPATH_EDITOR, buf2);
+ {
+ char buf[MAX_PATH];
+ char buf2[MAX_PATH];
+ GetDlgItemTextA(IDC_DEFAULTPATH_EDITOR, buf, sizeof(buf));
+ if (doSelectFolder(GetSafeHwnd(), buf2, sizeof(buf2), buf, ts.UIMsg)) {
+ SetDlgItemTextA(IDC_DEFAULTPATH_EDITOR, buf2);
+ }
}
return TRUE;
@@ -1278,7 +1288,7 @@
TCHAR uimsg2[MAX_UIMSG];
// Viewlog Editor path (2005.1.29 yutaka)
- GetDlgItemText(IDC_VIEWLOG_EDITOR, ts.ViewlogEditor, _countof(ts.ViewlogEditor));
+ GetDlgItemTextA(IDC_VIEWLOG_EDITOR, ts.ViewlogEditor, _countof(ts.ViewlogEditor));
// Log Default File Name (2006.8.28 maya)
GetDlgItemTextA(IDC_DEFAULTNAME_EDITOR, buf, sizeof(buf));
@@ -1311,7 +1321,7 @@
strncpy_s(ts.LogDefaultName, sizeof(ts.LogDefaultName), buf, _TRUNCATE);
// Log Default File Path (2007.5.30 maya)
- GetDlgItemText(IDC_DEFAULTPATH_EDITOR, ts.LogDefaultPath, _countof(ts.LogDefaultPath));
+ GetDlgItemTextA(IDC_DEFAULTPATH_EDITOR, ts.LogDefaultPath, _countof(ts.LogDefaultPath));
/* Auto start logging (2007.5.31 maya) */
ts.LogAutoStart = GetCheck(IDC_AUTOSTART);
@@ -1319,7 +1329,7 @@
/* Log Rotate */
if (GetCheck(IDC_LOG_ROTATE)) { /* on */
ts.LogRotate = ROTATE_SIZE;
- GetDlgItemText(IDC_ROTATE_SIZE_TYPE, buf, _countof(buf));
+ GetDlgItemTextA(IDC_ROTATE_SIZE_TYPE, buf, _countof(buf));
ts.LogRotateSizeType = 0;
for (int i = 0 ; i < LOG_ROTATE_SIZETYPE_NUM ; i++) {
if (strcmp(buf, LogRotateSizeType[i]) == 0) {