Tera Term

[Ttssh2-commit] [9292] TCHAR を wchar_t(Unicode)へ変更

• 前の記事 (スレッド) [Ttssh2-commit] [9291] codeconvから TCHAR を削除
• 次の記事 (スレッド) [Ttssh2-commit] [9293] ライブラリのライセンスファイルなどを libs/doc_help/ にコピー
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 9292
          https://osdn.net/projects/ttssh2/scm/svn/commits/9292
Author:   zmatsuo
Date:     2021-05-28 00:42:20 +0900 (Fri, 28 May 2021)
Log Message:
-----------
TCHAR を wchar_t(Unicode)へ変更

- 特に設定していないので、TCHAR = char
  - ANSI(非Unicode)としてコンパイルされていた

Modified Paths:
--------------
    trunk/TTXSamples/TTXCheckUpdate/parse.cpp
    trunk/teraterm/common/dlglib.c
    trunk/teraterm/teraterm/tekwin.cpp
    trunk/teraterm/teraterm/vtwin.cpp
    trunk/teraterm/ttpcmn/ttcmn.c
    trunk/teraterm/ttpdlg/ttdlg.c
    trunk/teraterm/ttpmacro/errdlg.cpp
    trunk/teraterm/ttpmacro/errdlg.h

-------------- next part --------------
Modified: trunk/TTXSamples/TTXCheckUpdate/parse.cpp
===================================================================
--- trunk/TTXSamples/TTXCheckUpdate/parse.cpp	2021-05-27 15:42:08 UTC (rev 9291)
+++ trunk/TTXSamples/TTXCheckUpdate/parse.cpp	2021-05-27 15:42:20 UTC (rev 9292)
@@ -2,6 +2,7 @@
 #define _CRTDBG_MAP_ALLOC
 #include <stdlib.h>
 #include <crtdbg.h>
+#include <string.h>
 
 #include "cJSON.h"
 

Modified: trunk/teraterm/common/dlglib.c
===================================================================
--- trunk/teraterm/common/dlglib.c	2021-05-27 15:42:08 UTC (rev 9291)
+++ trunk/teraterm/common/dlglib.c	2021-05-27 15:42:20 UTC (rev 9292)
@@ -110,11 +110,11 @@
 
 void SetDlgNum(HWND HDlg, int id_Item, LONG Num)
 {
-	TCHAR Temp[16];
+	wchar_t Temp[16];
 
 	/* In Win16, SetDlgItemInt can not be used to display long integer. */
-	_sntprintf_s(Temp, _countof(Temp), _TRUNCATE, _T("%d"), Num);
-	SetDlgItemText(HDlg,id_Item,Temp);
+	_snwprintf_s(Temp, _countof(Temp), _TRUNCATE, L"%d", Num);
+	SetDlgItemTextW(HDlg,id_Item,Temp);
 }
 
 void InitDlgProgress(HWND HDlg, int id_Progress, int *CurProgStat) {
@@ -137,7 +137,7 @@
 	// \x97\x8E\x82\xBF\x82\xE9\x96\xE2\x91\xE8\x82ւ̑Ώ\x88\x81B(2005.3.18 yutaka)
 	// cf. http://sourceforge.jp/tracker/index.php?func=detail&aid=5713&group_id=1412&atid=5333
 	double Num;
-	TCHAR NumStr[10];
+	wchar_t NumStr[10];
 
 	if (b==0) {
 		Num = 100.0;
@@ -145,8 +145,8 @@
 	else {
 		Num = 100.0 * (double)a / (double)b;
 	}
-	_sntprintf_s(NumStr, _countof(NumStr),_TRUNCATE,_T("%3.1f%%"),Num);
-	SetDlgItemText(HDlg, id_Item, NumStr);
+	_snwprintf_s(NumStr, _countof(NumStr),_TRUNCATE,L"%3.1f%%",Num);
+	SetDlgItemTextW(HDlg, id_Item, NumStr);
 
 	if (id_Progress != 0 && p != NULL && *p >= 0 && (double)*p < Num) {
 		*p = (int)Num;
@@ -158,13 +158,13 @@
 {
 	static int prev_elapsed;
 	int elapsed, rate;
-	TCHAR buff[64];
+	wchar_t buff[64];
 
 	elapsed = (GetTickCount() - stime) / 1000;
 
 	if (elapsed == 0) {
 		prev_elapsed = 0;
-		SetDlgItemText(HDlg, id_Item, _T("0:00"));
+		SetDlgItemTextW(HDlg, id_Item, L"0:00");
 		return;
 	}
 
@@ -175,16 +175,16 @@
 
 	rate = bytes / elapsed;
 	if (rate < 1200) {
-		_sntprintf_s(buff, _countof(buff), _TRUNCATE, _T("%d:%02d (%dBytes/s)"), elapsed / 60, elapsed % 60, rate);
+		_snwprintf_s(buff, _countof(buff), _TRUNCATE, L"%d:%02d (%dBytes/s)", elapsed / 60, elapsed % 60, rate);
 	}
 	else if (rate < 1200000) {
-		_sntprintf_s(buff, _countof(buff), _TRUNCATE, _T("%d:%02d (%d.%02dKB/s)"), elapsed / 60, elapsed % 60, rate / 1000, rate / 10 % 100);
+		_snwprintf_s(buff, _countof(buff), _TRUNCATE, L"%d:%02d (%d.%02dKB/s)", elapsed / 60, elapsed % 60, rate / 1000, rate / 10 % 100);
 	}
 	else {
-		_sntprintf_s(buff, _countof(buff), _TRUNCATE, _T("%d:%02d (%d.%02dMB/s)"), elapsed / 60, elapsed % 60, rate / (1000 * 1000), rate / 10000 % 100);
+		_snwprintf_s(buff, _countof(buff), _TRUNCATE, L"%d:%02d (%d.%02dMB/s)", elapsed / 60, elapsed % 60, rate / (1000 * 1000), rate / 10000 % 100);
 	}
 
-	SetDlgItemText(HDlg, id_Item, buff);
+	SetDlgItemTextW(HDlg, id_Item, buff);
 }
 
 void SetDropDownList(HWND HDlg, int Id_Item, const char *List[], int nsel)

Modified: trunk/teraterm/teraterm/tekwin.cpp
===================================================================
--- trunk/teraterm/teraterm/tekwin.cpp	2021-05-27 15:42:08 UTC (rev 9291)
+++ trunk/teraterm/teraterm/tekwin.cpp	2021-05-27 15:42:20 UTC (rev 9292)
@@ -192,11 +192,11 @@
 	SetDlgMenuTexts(HelpMenu, HelpMenuTextInfo, _countof(HelpMenuTextInfo), ts.UILanguageFile);
 
 	if ((ts.MenuFlag & MF_SHOWWINMENU) !=0) {
-		TCHAR uimsg[MAX_UIMSG];
+		wchar_t uimsg[MAX_UIMSG];
 		WinMenu = CreatePopupMenu();
-		get_lang_msgT("TEKMENU_WINDOW", uimsg, _countof(uimsg), _T("&Window"), ts.UILanguageFile);
-		::InsertMenu(*Menu,4,MF_STRING | MF_ENABLED | MF_POPUP | MF_BYPOSITION,
-		             (UINT_PTR)WinMenu, uimsg);
+		get_lang_msgW("TEKMENU_WINDOW", uimsg, _countof(uimsg), L"&Window", ts.UILanguageFile);
+		::InsertMenuW(*Menu,4,MF_STRING | MF_ENABLED | MF_POPUP | MF_BYPOSITION,
+					  (UINT_PTR)WinMenu, uimsg);
 	}
 }
 
@@ -592,12 +592,12 @@
 	if ((MainMenu!=NULL) &&
 	    (B1 != B2)) {
 		if (WinMenu==NULL) {
-			TCHAR uimsg[MAX_UIMSG];
+			wchar_t uimsg[MAX_UIMSG];
 			WinMenu = CreatePopupMenu();
-			get_lang_msgT("TEKMENU_WINDOW", uimsg, _countof(uimsg), _T("&Window"), ts.UILanguageFile);
-			::InsertMenu(MainMenu,4,
-			             MF_STRING | MF_ENABLED | MF_POPUP | MF_BYPOSITION,
-			             (UINT_PTR)WinMenu, uimsg);
+			get_lang_msgW("TEKMENU_WINDOW", uimsg, _countof(uimsg), L"&Window", ts.UILanguageFile);
+			::InsertMenuW(MainMenu,4,
+						  MF_STRING | MF_ENABLED | MF_POPUP | MF_BYPOSITION,
+						  (UINT_PTR)WinMenu, uimsg);
 		}
 		else {
 			RemoveMenu(MainMenu,4,MF_BYPOSITION);
@@ -609,11 +609,11 @@
 
 	::GetSystemMenu(tk.HWin,TRUE);
 	if ((! Show) && ((ts.MenuFlag & MF_NOSHOWMENU)==0)) {
-		TCHAR uimsg[MAX_UIMSG];
+		wchar_t uimsg[MAX_UIMSG];
 		SysMenu = ::GetSystemMenu(tk.HWin,FALSE);
-		AppendMenu(SysMenu, MF_SEPARATOR, 0, NULL);
-		get_lang_msgT("TEKMENU_SHOW_MENUBAR", uimsg, _countof(uimsg), _T("Show menu &bar"), ts.UILanguageFile);
-		AppendMenu(SysMenu, MF_STRING, ID_SHOWMENUBAR, uimsg);
+		AppendMenuW(SysMenu, MF_SEPARATOR, 0, NULL);
+		get_lang_msgW("TEKMENU_SHOW_MENUBAR", uimsg, _countof(uimsg), L"Show menu &bar", ts.UILanguageFile);
+		AppendMenuW(SysMenu, MF_STRING, ID_SHOWMENUBAR, uimsg);
 	}
 	return 0;
 }
@@ -644,11 +644,11 @@
 
 	if ((ts.HideTitle==0) && (MainMenu==NULL) &&
 	    ((ts.MenuFlag & MF_NOSHOWMENU) == 0)) {
-		TCHAR uimsg[MAX_UIMSG];
+		wchar_t uimsg[MAX_UIMSG];
 		SysMenu = ::GetSystemMenu(HTEKWin,FALSE);
-		AppendMenu(SysMenu, MF_SEPARATOR, 0, NULL);
-		get_lang_msgT("TEKMENU_SHOW_MENUBAR", uimsg, _countof(uimsg), _T("Show menu &bar"), ts.UILanguageFile);
-		AppendMenu(SysMenu, MF_STRING, ID_SHOWMENUBAR, uimsg);
+		AppendMenuW(SysMenu, MF_SEPARATOR, 0, NULL);
+		get_lang_msgW("TEKMENU_SHOW_MENUBAR", uimsg, _countof(uimsg), L"Show menu &bar", ts.UILanguageFile);
+		AppendMenuW(SysMenu, MF_STRING, ID_SHOWMENUBAR, uimsg);
 	}
 	return 0;
 }

Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp	2021-05-27 15:42:08 UTC (rev 9291)
+++ trunk/teraterm/teraterm/vtwin.cpp	2021-05-27 15:42:20 UTC (rev 9292)
@@ -4895,7 +4895,7 @@
 				::ZeroMemory(&si, sizeof(si));
 				si.cbSize = sizeof(si);
 				si.fMask = SEE_MASK_IDLIST;
-				si.lpVerb = _T("open");
+				si.lpVerb = "open";
 				si.lpIDList = pIDL;
 				si.nShow = SW_SHOWNORMAL;
 				::ShellExecuteEx(&si);

Modified: trunk/teraterm/ttpcmn/ttcmn.c
===================================================================
--- trunk/teraterm/ttpcmn/ttcmn.c	2021-05-27 15:42:08 UTC (rev 9291)
+++ trunk/teraterm/ttpcmn/ttcmn.c	2021-05-27 15:42:20 UTC (rev 9292)
@@ -88,8 +88,8 @@
 static PMap pm;
 
 static HANDLE HMap = NULL;
-#define VTCLASSNAME _T("VTWin32")
-#define TEKCLASSNAME _T("TEKWin32")
+#define VTCLASSNAME "VTWin32"
+#define TEKCLASSNAME "TEKWin32"
 
 enum window_style {
 	WIN_CASCADE,

Modified: trunk/teraterm/ttpdlg/ttdlg.c
===================================================================
--- trunk/teraterm/ttpdlg/ttdlg.c	2021-05-27 15:42:08 UTC (rev 9291)
+++ trunk/teraterm/ttpdlg/ttdlg.c	2021-05-27 15:42:20 UTC (rev 9292)
@@ -1211,25 +1211,25 @@
 		{ IDOK, "DLG_SERIAL_OK_RESET" },
 	};
 	int ret = 0;
-	TCHAR uimsg[MAX_UIMSG];
+	const char *ok_text;
 
 	if ( cv.Ready && (cv.PortType != IdSerial) ) {
 		ret = SetDlgTexts(dlg, TextInfoNewConnection, _countof(TextInfoNewConnection), UILanguageFile);
-		strncpy_s(uimsg, sizeof(uimsg), "Connect with &New window", _TRUNCATE);
+		ok_text = "Connect with &New window";
 
 	} else {
 		if (cv.Open) {
 			if (portno != cv.ComPort) {
 				ret = SetDlgTexts(dlg, TextInfoCloseNewOpen, _countof(TextInfoCloseNewOpen), UILanguageFile);
-				strncpy_s(uimsg, sizeof(uimsg), "Close and &New open", _TRUNCATE);
+				ok_text = "Close and &New open";
 			} else {
 				ret = SetDlgTexts(dlg, TextInfoResetSetting, _countof(TextInfoResetSetting), UILanguageFile);
-				strncpy_s(uimsg, sizeof(uimsg), "&New setting", _TRUNCATE);
+				ok_text = "&New setting";
 			}
 
 		} else {
 			ret = SetDlgTexts(dlg, TextInfoNewOpen, _countof(TextInfoNewOpen), UILanguageFile);
-			strncpy_s(uimsg, sizeof(uimsg), "&New open", _TRUNCATE);
+			ok_text = "&New open";
 		}
 	}
 
@@ -1237,7 +1237,7 @@
 	 * \x83f\x83t\x83H\x83\x8B\x83g\x83e\x83L\x83X\x83g\x82\xF0\x83Z\x83b\x83g\x82\xB7\x82\xE9\x81B
 	 */
 	if (ret <= 0) {
-		SetDlgItemText(dlg, IDOK, uimsg);
+		SetDlgItemTextA(dlg, IDOK, ok_text);
 	}
 }
 
@@ -1248,8 +1248,7 @@
 static void serial_dlg_set_comport_info(HWND dlg, int portno, char *desc)
 {
 	int i;
-	ComPortInfo_t *p;
-	char *strA;
+	const ComPortInfo_t *p;
 
 	for (i = 0 ; i < ComPortInfoCount ; i++) {
 		p = &ComPortInfoPtr[i];
@@ -1259,9 +1258,7 @@
 	if (i >= ComPortInfoCount)  // \x8AY\x93\x96\x82\xB7\x82\xE9COM\x83|\x81[\x83g\x82\xAA\x8C\xA9\x82‚\xA9\x82\xE7\x82Ȃ\xA9\x82\xC1\x82\xBD
 		return;
 
-	strA = ToCharW(p->property);
-	SetDlgItemTextA(dlg, IDC_SERIALTEXT, strA);
-	free(strA);
+	SetDlgItemTextW(dlg, IDC_SERIALTEXT, p->property);
 }
 
 /*
@@ -1316,14 +1313,13 @@
 	int w, h;
 	int cx, cy;
 	RECT wr;
-	TCHAR str[128], uimsg[MAX_UIMSG];
+	wchar_t uimsg[MAX_UIMSG];
 	PTTSet ts;
 
 	switch (msg) {
 		case WM_MOUSEMOVE:
 			ts = (PTTSet)GetWindowLongPtr(GetParent(hWnd) ,DWLP_USER);
-			get_lang_msg("DLG_SERIAL_SPEED_TOOLTIP", uimsg, sizeof(uimsg), "You can directly specify a number", ts->UILanguageFile);
-			_stprintf_s(str, _countof(str), _T(uimsg));
+			get_lang_msgW("DLG_SERIAL_SPEED_TOOLTIP", uimsg, _countof(uimsg), L"You can directly specify a number", ts->UILanguageFile);
 
 			// Combo-box\x82̍\xB6\x8F\xE3\x8D\xC0\x95W\x82\xF0\x8B\x81\x82߂\xE9
 			GetWindowRect(hWnd, &wr);
@@ -1331,7 +1327,7 @@
 			pt.y = wr.top;
 
 			// \x95\xB6\x8E\x9A\x97\xF1\x82̏c\x89\xA1\x83T\x83C\x83Y\x82\xF0\x8E擾\x82\xB7\x82\xE9
-			TipWinGetTextWidthHeight(hWnd, str, &w, &h);
+			TipWinGetTextWidthHeightW(hWnd, uimsg, &w, &h);
 
 			cx = pt.x;
 			cy = pt.y - (h + TIP_WIN_FRAME_WIDTH * 6);
@@ -1344,7 +1340,7 @@
 			if (!TipWinIsVisible(g_SerialDlgSpeedTip))
 				TipWinSetVisible(g_SerialDlgSpeedTip, TRUE);
 
-			TipWinSetTextA(g_SerialDlgSpeedTip, str);
+			TipWinSetTextW(g_SerialDlgSpeedTip, uimsg);
 			TipWinSetPos(g_SerialDlgSpeedTip, cx, cy);
 			TipWinSetHideTimer(g_SerialDlgSpeedTip, tooltip_timeout);
 

Modified: trunk/teraterm/ttpmacro/errdlg.cpp
===================================================================
--- trunk/teraterm/ttpmacro/errdlg.cpp	2021-05-27 15:42:08 UTC (rev 9291)
+++ trunk/teraterm/ttpmacro/errdlg.cpp	2021-05-27 15:42:20 UTC (rev 9292)
@@ -51,14 +51,14 @@
 
 CErrDlg::CErrDlg(const char *Msg, const char *Line, int x, int y, int lineno, int start, int end, const char *FileName)
 {
-	MsgStr = _tcsdup((tc)Msg);
-	LineStr = _tcsdup((tc)Line);
+	MsgStr = _wcsdup((wc)Msg);
+	LineStr = _wcsdup((wc)Line);
 	PosX = x;
 	PosY = y;
 	LineNo = lineno;
 	StartPos = start;
 	EndPos = end;
-	MacroFileName = _tcsdup((tc)FileName);
+	MacroFileName = _wcsdup((wc)FileName);
 }
 
 INT_PTR CErrDlg::DoModal(HINSTANCE hInst, HWND hWndParent)
@@ -73,32 +73,33 @@
 		{ IDCANCEL, "BTN_CONTINUE" },
 		{ IDC_MACROERRHELP, "BTN_HELP" },
 	};
-	char buf[MaxLineLen*2], buf2[10];
+	wchar_t buf[MaxLineLen*2];
 
 	SetDlgTexts(m_hWnd, TextInfos, _countof(TextInfos), UILanguageFile);
 
-	SetDlgItemText(IDC_ERRMSG,MsgStr);
+	SetDlgItemTextW(IDC_ERRMSG,MsgStr);
 
 	// \x8Ds\x94ԍ\x86\x82\xF0\x90擪\x82ɂ‚\xAF\x82\xE9\x81B
 	// \x83t\x83@\x83C\x83\x8B\x96\xBC\x82\xE0\x82‚\xAF\x82\xE9\x81B
 	// \x83G\x83\x89\x81[\x89ӏ\x8A\x82Ɉ\xF3\x82\xF0\x82‚\xAF\x82\xE9\x81B
-	_snprintf_s(buf, sizeof(buf), _TRUNCATE, "%s:%d:", MacroFileName, LineNo);
-	SetDlgItemText(IDC_ERRLINE, buf);
+	_snwprintf_s(buf, _countof(buf), _TRUNCATE, L"%ls:%d:", MacroFileName, LineNo);
+	SetDlgItemTextW(IDC_ERRLINE, buf);
 
-	size_t len = strlen(LineStr);
+	size_t len = wcslen(LineStr);
 	buf[0] = 0;
 	for (size_t i = 0 ; i < len ; i++) {
 		if (i == StartPos)
-			strncat_s(buf, sizeof(buf), "<<<", _TRUNCATE);
+			wcsncat_s(buf, _countof(buf), L"<<<", _TRUNCATE);
 		if (i == EndPos)
-			strncat_s(buf, sizeof(buf), ">>>", _TRUNCATE);
+			wcsncat_s(buf, _countof(buf), L">>>", _TRUNCATE);
+		wchar_t buf2[10];
 		buf2[0] = LineStr[i];
 		buf2[1] = 0;
-		strncat_s(buf, sizeof(buf), buf2, _TRUNCATE);
+		wcsncat_s(buf, _countof(buf), buf2, _TRUNCATE);
 	}
 	if (EndPos == len)
-		strncat_s(buf, sizeof(buf), ">>>", _TRUNCATE);
-	SetDlgItemText(IDC_EDIT_ERRLINE, buf);
+		wcsncat_s(buf, _countof(buf), L">>>", _TRUNCATE);
+	SetDlgItemTextW(IDC_EDIT_ERRLINE, buf);
 
 	SetDlgPos();
 

Modified: trunk/teraterm/ttpmacro/errdlg.h
===================================================================
--- trunk/teraterm/ttpmacro/errdlg.h	2021-05-27 15:42:08 UTC (rev 9291)
+++ trunk/teraterm/ttpmacro/errdlg.h	2021-05-27 15:42:20 UTC (rev 9292)
@@ -42,11 +42,11 @@
 private:
 	enum { IDD = IDD_ERRDLG };
 
-	const TCHAR *MsgStr;
-	const TCHAR *LineStr;
+	const wchar_t *MsgStr;
+	const wchar_t *LineStr;
 	int LineNo;
 	int StartPos, EndPos;
-	const TCHAR *MacroFileName;
+	const wchar_t *MacroFileName;
 
 	virtual BOOL OnInitDialog();
 	BOOL OnCommand(WPARAM wp, LPARAM lp);

• 前の記事 (スレッド) [Ttssh2-commit] [9291] codeconvから TCHAR を削除
• 次の記事 (スレッド) [Ttssh2-commit] [9293] ライブラリのライセンスファイルなどを libs/doc_help/ にコピー
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]