Tera TermRevision: 7352
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/7352
Author: zmatsuo
Date: 2018-12-23 02:31:47 +0900 (Sun, 23 Dec 2018)
Log Message:
-----------
多言語化できていなかったところを修正
Modified Paths:
--------------
branches/cmake/teraterm/teraterm/addsetting.cpp
branches/cmake/teraterm/teraterm/ttermpro.rc
branches/cmake/teraterm/ttpcmn/ttcmn.c
branches/cmake/teraterm/ttpdlg/ttpdlg.rc
-------------- next part --------------
Modified: branches/cmake/teraterm/teraterm/addsetting.cpp
===================================================================
--- branches/cmake/teraterm/teraterm/addsetting.cpp 2018-12-22 17:31:35 UTC (rev 7351)
+++ branches/cmake/teraterm/teraterm/addsetting.cpp 2018-12-22 17:31:47 UTC (rev 7352)
@@ -52,8 +52,6 @@
#define SetDlgItemText SetDlgItemTextA
#undef MessageBox
#define MessageBox MessageBoxA
-#undef SendDlgItemMessage
-#define SendDlgItemMessage SendDlgItemMessageA
const mouse_cursor_t MouseCursor[] = {
{"ARROW", IDC_ARROW},
@@ -240,30 +238,31 @@
};
SetDlgTexts(m_hWnd, TextInfos, _countof(TextInfos), ts.UILanguageFile);
- get_lang_msg("DLG_TAB_SEQUENCE_ACCEPT_TITLE_CHANGING_OFF", ts.UIMsg, sizeof(ts.UIMsg), "off", ts.UILanguageFile);
- SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
- get_lang_msg("DLG_TAB_SEQUENCE_ACCEPT_TITLE_CHANGING_OVERWRITE", ts.UIMsg, sizeof(ts.UIMsg), "overwrite", ts.UILanguageFile);
- SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
- get_lang_msg("DLG_TAB_SEQUENCE_ACCEPT_TITLE_CHANGING_AHEAD", ts.UIMsg, sizeof(ts.UIMsg), "ahead", ts.UILanguageFile);
- SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
- get_lang_msg("DLG_TAB_SEQUENCE_ACCEPT_TITLE_CHANGING_LAST", ts.UIMsg, sizeof(ts.UIMsg), "last", ts.UILanguageFile);
- SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
+ TCHAR uimsg[MAX_UIMSG];
+ get_lang_msgT("DLG_TAB_SEQUENCE_ACCEPT_TITLE_CHANGING_OFF", uimsg, _countof(uimsg), _T("off"), ts.UILanguageFile);
+ SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)uimsg);
+ get_lang_msgT("DLG_TAB_SEQUENCE_ACCEPT_TITLE_CHANGING_OVERWRITE", uimsg, _countof(uimsg), _T("overwrite"), ts.UILanguageFile);
+ SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)uimsg);
+ get_lang_msgT("DLG_TAB_SEQUENCE_ACCEPT_TITLE_CHANGING_AHEAD", uimsg, _countof(uimsg), _T("ahead"), ts.UILanguageFile);
+ SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)uimsg);
+ get_lang_msgT("DLG_TAB_SEQUENCE_ACCEPT_TITLE_CHANGING_LAST", uimsg, _countof(uimsg), _T("last"), ts.UILanguageFile);
+ SendDlgItemMessage(IDC_ACCEPT_TITLE_CHANGING, CB_ADDSTRING, 0, (LPARAM)uimsg);
- get_lang_msg("DLG_TAB_SEQUENCE_TITLE_REPORT_IGNORE", ts.UIMsg, sizeof(ts.UIMsg), "ignore", ts.UILanguageFile);
- SendDlgItemMessage(IDC_TITLE_REPORT, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
- get_lang_msg("DLG_TAB_SEQUENCE_TITLE_REPORT_ACCEPT", ts.UIMsg, sizeof(ts.UIMsg), "accept", ts.UILanguageFile);
- SendDlgItemMessage(IDC_TITLE_REPORT, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
- get_lang_msg("DLG_TAB_SEQUENCE_TITLE_REPORT_EMPTY", ts.UIMsg, sizeof(ts.UIMsg), "empty", ts.UILanguageFile);
- SendDlgItemMessage(IDC_TITLE_REPORT, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
+ get_lang_msgT("DLG_TAB_SEQUENCE_TITLE_REPORT_IGNORE", uimsg, _countof(uimsg), _T("ignore"), ts.UILanguageFile);
+ SendDlgItemMessage(IDC_TITLE_REPORT, CB_ADDSTRING, 0, (LPARAM)uimsg);
+ get_lang_msgT("DLG_TAB_SEQUENCE_TITLE_REPORT_ACCEPT", uimsg, _countof(uimsg), _T("accept"), ts.UILanguageFile);
+ SendDlgItemMessage(IDC_TITLE_REPORT, CB_ADDSTRING, 0, (LPARAM)uimsg);
+ get_lang_msgT("DLG_TAB_SEQUENCE_TITLE_REPORT_EMPTY", uimsg, _countof(uimsg), _T("empty"), ts.UILanguageFile);
+ SendDlgItemMessage(IDC_TITLE_REPORT, CB_ADDSTRING, 0, (LPARAM)uimsg);
- get_lang_msg("DLG_TAB_SEQUENCE_CLIPBOARD_ACCESS_OFF", ts.UIMsg, sizeof(ts.UIMsg), "off", ts.UILanguageFile);
- SendDlgItemMessage(IDC_CLIPBOARD_ACCESS, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
- get_lang_msg("DLG_TAB_SEQUENCE_CLIPBOARD_ACCESS_WRITE", ts.UIMsg, sizeof(ts.UIMsg), "write only", ts.UILanguageFile);
- SendDlgItemMessage(IDC_CLIPBOARD_ACCESS, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
- get_lang_msg("DLG_TAB_SEQUENCE_CLIPBOARD_ACCESS_READ", ts.UIMsg, sizeof(ts.UIMsg), "read only", ts.UILanguageFile);
- SendDlgItemMessage(IDC_CLIPBOARD_ACCESS, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
- get_lang_msg("DLG_TAB_SEQUENCE_CLIPBOARD_ACCESS_ON", ts.UIMsg, sizeof(ts.UIMsg), "read/write", ts.UILanguageFile);
- SendDlgItemMessage(IDC_CLIPBOARD_ACCESS, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
+ get_lang_msgT("DLG_TAB_SEQUENCE_CLIPBOARD_ACCESS_OFF", uimsg, _countof(uimsg), _T("off"), ts.UILanguageFile);
+ SendDlgItemMessage(IDC_CLIPBOARD_ACCESS, CB_ADDSTRING, 0, (LPARAM)uimsg);
+ get_lang_msgT("DLG_TAB_SEQUENCE_CLIPBOARD_ACCESS_WRITE", uimsg, _countof(uimsg), _T("write only"), ts.UILanguageFile);
+ SendDlgItemMessage(IDC_CLIPBOARD_ACCESS, CB_ADDSTRING, 0, (LPARAM)uimsg);
+ get_lang_msgT("DLG_TAB_SEQUENCE_CLIPBOARD_ACCESS_READ", uimsg, _countof(uimsg), _T("read only"), ts.UILanguageFile);
+ SendDlgItemMessage(IDC_CLIPBOARD_ACCESS, CB_ADDSTRING, 0, (LPARAM)uimsg);
+ get_lang_msgT("DLG_TAB_SEQUENCE_CLIPBOARD_ACCESS_ON", uimsg, _countof(uimsg), _T("read/write"), ts.UILanguageFile);
+ SendDlgItemMessage(IDC_CLIPBOARD_ACCESS, CB_ADDSTRING, 0, (LPARAM)uimsg);
// (1)IDC_ACCEPT_MOUSE_EVENT_TRACKING
SetCheck(IDC_ACCEPT_MOUSE_EVENT_TRACKING, ts.MouseEventTracking);
@@ -643,14 +642,19 @@
};
SetDlgTexts(m_hWnd, TextInfos, _countof(TextInfos), ts.UILanguageFile);
- get_lang_msg("DLG_TAB_VISUAL_FONT_QUALITY_DEFAULT", ts.UIMsg, sizeof(ts.UIMsg), "Default", ts.UILanguageFile);
- SendDlgItemMessage(IDC_FONT_QUALITY, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
- get_lang_msg("DLG_TAB_VISUAL_FONT_QUALITY_NONANTIALIASED", ts.UIMsg, sizeof(ts.UIMsg), "Non-Antialiased", ts.UILanguageFile);
- SendDlgItemMessage(IDC_FONT_QUALITY, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
- get_lang_msg("DLG_TAB_VISUAL_FONT_QUALITY_ANTIALIASED", ts.UIMsg, sizeof(ts.UIMsg), "Antialiased", ts.UILanguageFile);
- SendDlgItemMessage(IDC_FONT_QUALITY, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
- get_lang_msg("DLG_TAB_VISUAL_FONT_QUALITY_CLEARTYPE", ts.UIMsg, sizeof(ts.UIMsg), "ClearType", ts.UILanguageFile);
- SendDlgItemMessage(IDC_FONT_QUALITY, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
+ TCHAR uimsg[MAX_UIMSG];
+ get_lang_msgT("DLG_TAB_VISUAL_FONT_QUALITY_DEFAULT",
+ uimsg, _countof(uimsg), _T("Default"), ts.UILanguageFile);
+ SendDlgItemMessage(IDC_FONT_QUALITY, CB_ADDSTRING, 0, (LPARAM)uimsg);
+ get_lang_msgT("DLG_TAB_VISUAL_FONT_QUALITY_NONANTIALIASED",
+ uimsg, _countof(uimsg), _T("Non-Antialiased"), ts.UILanguageFile);
+ SendDlgItemMessage(IDC_FONT_QUALITY, CB_ADDSTRING, 0, (LPARAM)uimsg);
+ get_lang_msgT("DLG_TAB_VISUAL_FONT_QUALITY_ANTIALIASED",
+ uimsg, _countof(uimsg), _T("Antialiased"), ts.UILanguageFile);
+ SendDlgItemMessage(IDC_FONT_QUALITY, CB_ADDSTRING, 0, (LPARAM)uimsg);
+ get_lang_msgT("DLG_TAB_VISUAL_FONT_QUALITY_CLEARTYPE",
+ uimsg, _countof(uimsg), _T("ClearType"), ts.UILanguageFile);
+ SendDlgItemMessage(IDC_FONT_QUALITY, CB_ADDSTRING, 0, (LPARAM)uimsg);
// (1)AlphaBlend
_snprintf_s(buf, sizeof(buf), _TRUNCATE, "%d", ts.AlphaBlendActive);
@@ -1084,14 +1088,15 @@
};
SetDlgTexts(m_hWnd, TextInfos, _countof(TextInfos), ts.UILanguageFile);
- get_lang_msg("DLG_FOPT_TIMESTAMP_LOCAL", ts.UIMsg, sizeof(ts.UIMsg), "Local Time", ts.UILanguageFile);
- SendDlgItemMessage(IDC_OPT_TIMESTAMP_TYPE, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
- get_lang_msg("DLG_FOPT_TIMESTAMP_UTC", ts.UIMsg, sizeof(ts.UIMsg), "UTC", ts.UILanguageFile);
- SendDlgItemMessage(IDC_OPT_TIMESTAMP_TYPE, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
- get_lang_msg("DLG_FOPT_TIMESTAMP_ELAPSED_LOGGING", ts.UIMsg, sizeof(ts.UIMsg), "Elapsed Time (Logging)", ts.UILanguageFile);
- SendDlgItemMessage(IDC_OPT_TIMESTAMP_TYPE, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
- get_lang_msg("DLG_FOPT_TIMESTAMP_ELAPSED_CONNECTION", ts.UIMsg, sizeof(ts.UIMsg), "Elapsed Time (Connection)", ts.UILanguageFile);
- SendDlgItemMessage(IDC_OPT_TIMESTAMP_TYPE, CB_ADDSTRING, 0, (LPARAM)ts.UIMsg);
+ TCHAR UIMsg[MAX_UIMSG];
+ get_lang_msgT("DLG_FOPT_TIMESTAMP_LOCAL", UIMsg, _countof(UIMsg), _T("Local Time"), ts.UILanguageFile);
+ SendDlgItemMessage(IDC_OPT_TIMESTAMP_TYPE, CB_ADDSTRING, 0, (LPARAM)UIMsg);
+ get_lang_msgT("DLG_FOPT_TIMESTAMP_UTC", UIMsg, _countof(UIMsg), _T("UTC"), ts.UILanguageFile);
+ SendDlgItemMessage(IDC_OPT_TIMESTAMP_TYPE, CB_ADDSTRING, 0, (LPARAM)UIMsg);
+ get_lang_msgT("DLG_FOPT_TIMESTAMP_ELAPSED_LOGGING", UIMsg, _countof(UIMsg), _T("Elapsed Time (Logging)"), ts.UILanguageFile);
+ SendDlgItemMessage(IDC_OPT_TIMESTAMP_TYPE, CB_ADDSTRING, 0, (LPARAM)UIMsg);
+ get_lang_msgT("DLG_FOPT_TIMESTAMP_ELAPSED_CONNECTION", UIMsg, _countof(UIMsg), _T("Elapsed Time (Connection)"), ts.UILanguageFile);
+ SendDlgItemMessage(IDC_OPT_TIMESTAMP_TYPE, CB_ADDSTRING, 0, (LPARAM)UIMsg);
// Viewlog Editor path (2005.1.29 yutaka)
@@ -1110,7 +1115,7 @@
SetCheck(IDC_LOG_ROTATE, ts.LogRotate != ROTATE_NONE);
for (int i = 0 ; i < LOG_ROTATE_SIZETYPE_NUM ; i++) {
- SendDlgItemMessage(IDC_ROTATE_SIZE_TYPE, CB_ADDSTRING, 0, (LPARAM)LogRotateSizeType[i]);
+ SendDlgItemMessageA(IDC_ROTATE_SIZE_TYPE, CB_ADDSTRING, 0, (LPARAM)LogRotateSizeType[i]);
}
int TmpLogRotateSize = ts.LogRotateSize;
for (int i = 0 ; i < ts.LogRotateSizeType ; i++)
Modified: branches/cmake/teraterm/teraterm/ttermpro.rc
===================================================================
--- branches/cmake/teraterm/teraterm/ttermpro.rc 2018-12-22 17:31:35 UTC (rev 7351)
+++ branches/cmake/teraterm/teraterm/ttermpro.rc 2018-12-22 17:31:47 UTC (rev 7352)
@@ -209,7 +209,7 @@
CONTROL "Log Rotate",IDC_LOG_ROTATE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,124,127,10
LTEXT "Size",IDC_ROTATE_SIZE_TEXT,12,142,28,8
EDITTEXT IDC_ROTATE_SIZE,48,139,46,12,ES_AUTOHSCROLL
- COMBOBOX IDC_ROTATE_SIZE_TYPE,99,139,31,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX IDC_ROTATE_SIZE_TYPE,99,139,31,60,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
LTEXT "Rotate",IDC_ROTATE_STEP_TEXT,12,159,27,8
EDITTEXT IDC_ROTATE_STEP,48,156,30,12,ES_AUTOHSCROLL
END
@@ -681,6 +681,7 @@
/////////////////////////////////////////////////////////////////////////////
+
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
Modified: branches/cmake/teraterm/ttpcmn/ttcmn.c
===================================================================
--- branches/cmake/teraterm/ttpcmn/ttcmn.c 2018-12-22 17:31:35 UTC (rev 7351)
+++ branches/cmake/teraterm/ttpcmn/ttcmn.c 2018-12-22 17:31:47 UTC (rev 7352)
@@ -31,9 +31,6 @@
#define _WIN32_IE 0x501
#endif
-#undef UNICODE
-#undef _UNICODE
-
/* TTCMN.DLL, main */
#include <direct.h>
#include <string.h>
@@ -70,8 +67,8 @@
static PMap pm;
static HANDLE HMap = NULL;
-#define VTCLASSNAME "VTWin32"
-#define TEKCLASSNAME "TEKWin32"
+#define VTCLASSNAME _T("VTWin32")
+#define TEKCLASSNAME _T("TEKWin32")
enum window_style {
@@ -115,7 +112,7 @@
// if (FirstInstance) { \x82̕\x94\x95\xAA\x82\xA9\x82\xE7\x88ړ\xAE (2008.3.13 maya)
// \x8BN\x93\xAE\x8E\x9E\x82ɂ́A\x8B\xA4\x97L\x83\x81\x83\x82\x83\x8A\x82\xCC HomeDir \x82\xC6 SetupFName \x82͋\xF3\x82ɂȂ\xE9
/* Get home directory */
- if (GetModuleFileName(hInst,Temp,sizeof(Temp)) == 0) {
+ if (GetModuleFileNameA(hInst,Temp,sizeof(Temp)) == 0) {
return TRUE;
}
ExtractDirName(Temp, ts->HomeDir);
@@ -139,17 +136,17 @@
// (2012.4.30 yutaka)
void WINAPI RestartTeraTerm(HWND hwnd, PTTSet ts)
{
- char path[1024];
+ TCHAR path[1024];
STARTUPINFO si;
PROCESS_INFORMATION pi;
- char uimsg[MAX_UIMSG];
+ TCHAR uimsg[MAX_UIMSG];
int ret;
- get_lang_msg("MSG_TT_TAKE_EFFECT", uimsg, sizeof(uimsg),
- "This option takes effect the next time a session is started.\n"
- "Are you sure that you want to relaunch Tera Term?"
- , ts->UILanguageFile);
- ret = MessageBox(hwnd, uimsg, "Tera Term: Configuration Warning", MB_YESNO | MB_ICONEXCLAMATION | MB_DEFBUTTON2);
+ get_lang_msgT("MSG_TT_TAKE_EFFECT", uimsg, _countof(uimsg),
+ _T("This option takes effect the next time a session is started.\n")
+ _T( "Are you sure that you want to relaunch Tera Term?"),
+ ts->UILanguageFile);
+ ret = MessageBox(hwnd, uimsg, _T("Tera Term: Configuration Warning"), MB_YESNO | MB_ICONEXCLAMATION | MB_DEFBUTTON2);
if (ret != IDYES)
return;
@@ -943,8 +940,9 @@
void WINAPI SetWinMenu(HMENU menu, PCHAR buf, int buflen, PCHAR langFile, int VTFlag)
{
int i;
- char Temp[MAXPATHLEN];
+ TCHAR Temp[MAXPATHLEN];
HWND Hw;
+ TCHAR uimsg[MAX_UIMSG];
// delete all items in Window menu
i = GetMenuItemCount(menu);
@@ -957,15 +955,15 @@
i = 0;
while (i<pm->NWin) {
Hw = pm->WinList[i]; // get window handle
- if ((GetClassName(Hw,Temp,sizeof(Temp))>0) &&
- ((strcmp(Temp,VTCLASSNAME)==0) ||
- (strcmp(Temp,TEKCLASSNAME)==0))) {
+ if ((GetClassName(Hw,Temp,_countof(Temp))>0) &&
+ ((_tcscmp(Temp,VTCLASSNAME)==0) ||
+ (_tcscmp(Temp,TEKCLASSNAME)==0))) {
Temp[0] = '&';
Temp[1] = (char)(0x31 + i);
Temp[2] = ' ';
Temp[3] = GetWindowTypeChar(Hw, NULL);
Temp[4] = ' ';
- GetWindowText(Hw,&Temp[5],sizeof(Temp)-6);
+ GetWindowText(Hw,&Temp[5],_countof(Temp)-6);
AppendMenu(menu,MF_ENABLED | MF_STRING,ID_WINDOW_1+i,Temp);
i++;
if (i>8) {
@@ -976,39 +974,39 @@
UnregWin(Hw);
}
}
- get_lang_msg("MENU_WINDOW_WINDOW", buf, buflen, "&Window", langFile);
+ get_lang_msgT("MENU_WINDOW_WINDOW", uimsg, _countof(uimsg), _T("&Window"), langFile);
if (VTFlag == 1) {
AppendMenu(menu, MF_SEPARATOR, 0, NULL);
- AppendMenu(menu,MF_ENABLED | MF_STRING,ID_WINDOW_WINDOW, buf);
+ AppendMenu(menu,MF_ENABLED | MF_STRING,ID_WINDOW_WINDOW, uimsg);
- get_lang_msg("MENU_WINDOW_MINIMIZEALL", buf, buflen, "&Minimize All", langFile);
- AppendMenu(menu, MF_ENABLED | MF_STRING, ID_WINDOW_MINIMIZEALL, buf);
+ get_lang_msgT("MENU_WINDOW_MINIMIZEALL", uimsg, _countof(uimsg), _T("&Minimize All"), langFile);
+ AppendMenu(menu, MF_ENABLED | MF_STRING, ID_WINDOW_MINIMIZEALL, uimsg);
- get_lang_msg("MENU_WINDOW_RESTOREALL", buf, buflen, "&Restore All", langFile);
- AppendMenu(menu, MF_ENABLED | MF_STRING, ID_WINDOW_RESTOREALL, buf);
+ get_lang_msgT("MENU_WINDOW_RESTOREALL", uimsg, _countof(uimsg), _T("&Restore All"), langFile);
+ AppendMenu(menu, MF_ENABLED | MF_STRING, ID_WINDOW_RESTOREALL, uimsg);
- get_lang_msg("MENU_WINDOW_CASCADE", buf, buflen, "&Cascade", langFile);
- AppendMenu(menu, MF_ENABLED | MF_STRING, ID_WINDOW_CASCADEALL, buf);
+ get_lang_msgT("MENU_WINDOW_CASCADE", uimsg, _countof(uimsg), _T("&Cascade"), langFile);
+ AppendMenu(menu, MF_ENABLED | MF_STRING, ID_WINDOW_CASCADEALL, uimsg);
- get_lang_msg("MENU_WINDOW_STACKED", buf, buflen, "&Stacked", langFile);
- AppendMenu(menu, MF_ENABLED | MF_STRING, ID_WINDOW_STACKED, buf);
+ get_lang_msgT("MENU_WINDOW_STACKED", uimsg, _countof(uimsg), _T("&Stacked"), langFile);
+ AppendMenu(menu, MF_ENABLED | MF_STRING, ID_WINDOW_STACKED, uimsg);
- get_lang_msg("MENU_WINDOW_SIDEBYSIDE", buf, buflen, "Side &by Side", langFile);
- AppendMenu(menu, MF_ENABLED | MF_STRING, ID_WINDOW_SIDEBYSIDE, buf);
+ get_lang_msgT("MENU_WINDOW_SIDEBYSIDE", uimsg, _countof(uimsg), _T("Side &by Side"), langFile);
+ AppendMenu(menu, MF_ENABLED | MF_STRING, ID_WINDOW_SIDEBYSIDE, uimsg);
if (pm->WinUndoFlag) {
if (pm->WinUndoStyle == WIN_CASCADE)
- get_lang_msg("MENU_WINDOW_CASCADE_UNDO", buf, buflen, "&Undo - Cascade", langFile);
+ get_lang_msgT("MENU_WINDOW_CASCADE_UNDO", uimsg, _countof(uimsg), _T("&Undo - Cascade"), langFile);
else if (pm->WinUndoStyle == WIN_STACKED)
- get_lang_msg("MENU_WINDOW_STACKED_UNDO", buf, buflen, "&Undo - Stacked", langFile);
+ get_lang_msgT("MENU_WINDOW_STACKED_UNDO", uimsg, _countof(uimsg), _T("&Undo - Stacked"), langFile);
else
- get_lang_msg("MENU_WINDOW_SIDEBYSIDE_UNDO", buf, buflen, "&Undo - Side by Side", langFile);
- AppendMenu(menu, MF_ENABLED | MF_STRING, ID_WINDOW_UNDO, buf);
+ get_lang_msgT("MENU_WINDOW_SIDEBYSIDE_UNDO", uimsg, _countof(uimsg), _T("&Undo - Side by Side"), langFile);
+ AppendMenu(menu, MF_ENABLED | MF_STRING, ID_WINDOW_UNDO, uimsg);
}
}
else {
- AppendMenu(menu,MF_ENABLED | MF_STRING,ID_TEKWINDOW_WINDOW, buf);
+ AppendMenu(menu,MF_ENABLED | MF_STRING,ID_TEKWINDOW_WINDOW, uimsg);
}
}
@@ -1015,14 +1013,14 @@
void WINAPI SetWinList(HWND HWin, HWND HDlg, int IList)
{
int i;
- char Temp[MAXPATHLEN];
+ TCHAR Temp[MAXPATHLEN];
HWND Hw;
for (i=0; i<pm->NWin; i++) {
Hw = pm->WinList[i]; // get window handle
if ((GetClassName(Hw,Temp,sizeof(Temp))>0) &&
- ((strcmp(Temp,VTCLASSNAME)==0) ||
- (strcmp(Temp,TEKCLASSNAME)==0))) {
+ ((_tcscmp(Temp,VTCLASSNAME)==0) ||
+ (_tcscmp(Temp,TEKCLASSNAME)==0))) {
Temp[0] = GetWindowTypeChar(Hw, HWin);
Temp[1] = ' ';
GetWindowText(Hw,&Temp[2],sizeof(Temp)-3);
@@ -1166,28 +1164,31 @@
char HomeDir[MAX_PATH];
char Temp[MAX_PATH];
HWND HWin;
- char HelpFN[MAX_PATH];
-// char UILanguageFile[MAX_PATH];
- char uimsg[MAX_UIMSG];
+ TCHAR HelpFN[MAX_PATH];
+ TCHAR uimsg[MAX_UIMSG];
+ const TCHAR *HomeDirT;
/* Get home directory */
- if (GetModuleFileName(NULL,Temp,sizeof(Temp)) == 0) {
+ if (GetModuleFileNameA(NULL,Temp,sizeof(Temp)) == 0) {
return;
}
ExtractDirName(Temp, HomeDir);
+ HomeDirT = ToTcharA(HomeDir);
-// GetUILanguageFile(UILanguageFile, sizeof(UILanguageFile));
- get_lang_msg("HELPFILE", uimsg, sizeof(uimsg), "teraterm.chm", UILanguageFile);
+ get_lang_msgT("HELPFILE", uimsg, _countof(uimsg),
+ _T("teraterm.chm"), UILanguageFile);
// \x83w\x83\x8B\x83v\x82̃I\x81[\x83i\x81[\x82͏\xED\x82Ƀf\x83X\x83N\x83g\x83b\x83v\x82ɂȂ\xE9 (2007.5.12 maya)
HWin = GetDesktopWindow();
- _snprintf_s(HelpFN, sizeof(HelpFN), _TRUNCATE, "%s\\%s", HomeDir, uimsg);
+ _sntprintf_s(HelpFN, _countof(HelpFN), _TRUNCATE, _T("%s\\%s"), (TCHAR *)HomeDirT, uimsg);
if (HtmlHelp(HWin, HelpFN, Command, Data) == NULL && Command != HH_CLOSE_ALL) {
- char buf[MAX_PATH];
- get_lang_msg("MSG_OPENHELP_ERROR", uimsg, sizeof(uimsg), "Can't open HTML help file(%s).", UILanguageFile);
- _snprintf_s(buf, sizeof(buf), _TRUNCATE, uimsg, HelpFN);
- MessageBox(HWin, buf, "Tera Term: HTML help", MB_OK | MB_ICONERROR);
+ TCHAR buf[MAX_PATH];
+ get_lang_msgT("MSG_OPENHELP_ERROR", uimsg, _countof(uimsg),
+ _T("Can't open HTML help file(%s)."), UILanguageFile);
+ _sntprintf_s(buf, _countof(buf), _TRUNCATE, uimsg, HelpFN);
+ MessageBox(HWin, buf, _T("Tera Term: HTML help"), MB_OK | MB_ICONERROR);
}
+ free((void *)HomeDirT);
}
HWND WINAPI GetNthWin(int n)
@@ -2276,13 +2277,13 @@
printf("%s\n", szMessage);
#endif
- if (_strnicmp(szPortName, "COM", 3) == 0) { // COM\x83|\x81[\x83g\x83h\x83\x89\x83C\x83o\x82\xA9
- int port = atoi(&szPortName[3]);
+ if (_tcsnicmp(szPortName, _T("COM"), 3) == 0) { // COM\x83|\x81[\x83g\x83h\x83\x89\x83C\x83o\x82\xA9
+ int port = _ttoi(&szPortName[3]);
int i;
for (i = 0 ; i < comports ; i++) {
if (ComPortTable[i] == port) { // \x90ڑ\xB1\x82\xF0\x8Am\x94F
- ComPortDesc[i] = _strdup(szFriendlyName);
+ ComPortDesc[i] = (char *)ToCharT(szFriendlyName);
break;
}
}
@@ -2306,17 +2307,17 @@
int i, j, min;
WORD s;
- if (((h = GetModuleHandle("kernel32.dll")) != NULL) &&
+ if (((h = GetModuleHandleA("kernel32.dll")) != NULL) &&
(GetProcAddress(h, "QueryDosDeviceA") != NULL) &&
(QueryDosDevice(NULL, devicesBuff, 65535) != 0)) {
p = devicesBuff;
while (*p != '\0') {
- if (strncmp(p, "COM", 3) == 0 && p[3] != '\0') {
- ComPortTable[comports++] = atoi(p+3);
+ if (_tcsncmp(p, _T("COM"), 3) == 0 && p[3] != '\0') {
+ ComPortTable[comports++] = _ttoi(p+3);
if (comports >= ComPortMax)
break;
}
- p += (strlen(p)+1);
+ p += (_tcslen(p)+1);
}
for (i=0; i<comports-1; i++) {
@@ -2358,7 +2359,7 @@
{
HMODULE h;
TCHAR devicesBuff[65535];
- char com_str[64];
+ TCHAR com_str[64];
BOOL bRet;
GUID ClassGuid[1];
DWORD dwRequiredSize;
@@ -2366,9 +2367,9 @@
SP_DEVINFO_DATA DeviceInfoData;
int found = 0;
- _snprintf_s(com_str, sizeof(com_str), _TRUNCATE, "COM%d", ComPort);
+ _sntprintf_s(com_str, _countof(com_str), _TRUNCATE, _T("COM%d"), ComPort);
- if (((h = GetModuleHandle("kernel32.dll")) == NULL) | (GetProcAddress(h, "QueryDosDeviceA") == NULL) ) {
+ if (((h = GetModuleHandleA("kernel32.dll")) == NULL) | (GetProcAddress(h, "QueryDosDeviceA") == NULL) ) {
/* ERROR */
return -1;
}
@@ -2409,7 +2410,7 @@
dwReqSize = sizeof(szPortName);
lRet = RegQueryValueEx(hKey, _T("PortName"), 0, &dwType, (LPBYTE)& szPortName, &dwReqSize);
RegCloseKey(hKey);
- if (_stricmp(szPortName, com_str) == 0) {
+ if (_tcsicmp(szPortName, com_str) == 0) {
found = TRUE;
break;
}
@@ -2438,7 +2439,7 @@
BOOL first_instance;
TMap *map;
_snprintf_s(tmp, sizeof(tmp), _TRUNCATE, i == 0 ? "%s" : "%s_%d", TT_FILEMAPNAME, i);
- hMap = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE,
+ hMap = CreateFileMappingA(INVALID_HANDLE_VALUE, NULL, PAGE_READWRITE,
0, sizeof(TMap), tmp);
if (hMap == NULL) {
return FALSE;
Modified: branches/cmake/teraterm/ttpdlg/ttpdlg.rc
===================================================================
--- branches/cmake/teraterm/ttpdlg/ttpdlg.rc 2018-12-22 17:31:35 UTC (rev 7351)
+++ branches/cmake/teraterm/ttpdlg/ttpdlg.rc 2018-12-22 17:31:47 UTC (rev 7352)
@@ -241,8 +241,6 @@
LTEXT "Version",IDC_TT_VERSION,39,12,127,8
RTEXT "Author:",IDC_AUTHOR_LABEL,5,106,28,8
LTEXT "https://ttssh2.osdn.jp/",IDC_AUTHOR_URL,36,106,128,8,SS_NOTIFY | WS_TABSTOP
-// RTEXT "Forum:",IDC_FORUM_LABEL,8,115,25,8
-// LTEXT "http://logmett.com/support-forums",IDC_FORUM_URL,36,115,136,8,SS_NOTIFY | WS_TABSTOP
LTEXT "Oniguruma: ",IDC_ONIGURUMA_LABEL,39,35,114,8
LTEXT "Built using Microsoft Visual C++",IDC_BUILDTOOL,5,87,205,10
LTEXT "Build time: ",IDC_BUILDTIME,5,97,205,8
@@ -256,7 +254,7 @@
CONTROL "Default &port:",IDC_GENPORT_LABEL,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,14,10,57,11
COMBOBOX IDC_GENPORT,96,9,52,58,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
LTEXT "&Language:",IDC_GENLANGLABEL,14,26,39,11,NOT WS_VISIBLE
- COMBOBOX IDC_GENLANG,78,25,70,45,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX IDC_GENLANG,78,25,70,93,CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
LTEXT "Language&UI:",IDC_GENLANGUI_LABEL,14,42,44,8
COMBOBOX IDC_GENLANG_UI,58,41,90,72,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
DEFPUSHBUTTON "OK",IDOK,13,61,32,14,WS_GROUP
@@ -447,13 +445,3 @@
/////////////////////////////////////////////////////////////////////////////
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-/////////////////////////////////////////////////////////////////////////////
-#endif // not APSTUDIO_INVOKED
-