Tera TermRevision: 9342
https://osdn.net/projects/ttssh2/scm/svn/commits/9342
Author: zmatsuo
Date: 2021-08-02 00:32:15 +0900 (Mon, 02 Aug 2021)
Log Message:
-----------
TTMessageBoxW() を TTMessageBoxA() へ改名
- 引数 uType を TTMessageBoxInfoW へ移動
- 未使用マクロ get_lang_msgT() を削除
Modified Paths:
--------------
trunk/TTXSamples/TTXCheckUpdate/ttxcheckupdate.c
trunk/teraterm/common/ttlib.h
trunk/teraterm/common/ttlib_static_cpp.cpp
trunk/teraterm/teraterm/addsetting.cpp
trunk/teraterm/teraterm/commlib.c
trunk/teraterm/teraterm/sendfiledlg.cpp
trunk/teraterm/teraterm/setupdirdlg.cpp
trunk/teraterm/teraterm/ttplug.c
trunk/teraterm/teraterm/vtwin.cpp
trunk/teraterm/ttpcmn/ttcmn.c
trunk/ttssh2/ttxssh/ttxssh.c
-------------- next part --------------
Modified: trunk/TTXSamples/TTXCheckUpdate/ttxcheckupdate.c
===================================================================
--- trunk/TTXSamples/TTXCheckUpdate/ttxcheckupdate.c 2021-08-01 15:32:01 UTC (rev 9341)
+++ trunk/TTXSamples/TTXCheckUpdate/ttxcheckupdate.c 2021-08-01 15:32:15 UTC (rev 9342)
@@ -188,12 +188,14 @@
static const TTMessageBoxInfoW info = {
"TTXCheckUpdate",
NULL, L"Tera Term",
- "MSG_CHECKUPDATE", L"Do you want to check update?\n%s" };
+ "MSG_CHECKUPDATE", L"Do you want to check update?\n%s",
+ MB_YESNO | MB_ICONEXCLAMATION
+ };
/* \x8DX\x90V\x8F\xEE\x95\xF1\x82\xF0\x8E擾\x82\xB5\x82Ă\xE0ok? */
GetI18nStrW("TTXCheckUpdate", "JSON_URL", update_info_url, _countof(update_info_url), update_info_url_default,
UILanguageFile);
- result_mb = TTMessageBoxW(hWnd, &info, MB_YESNO | MB_ICONEXCLAMATION, UILanguageFile, update_info_url);
+ result_mb = TTMessageBoxA(hWnd, &info, UILanguageFile, update_info_url);
if (result_mb == IDNO) {
return;
}
Modified: trunk/teraterm/common/ttlib.h
===================================================================
--- trunk/teraterm/common/ttlib.h 2021-08-01 15:32:01 UTC (rev 9341)
+++ trunk/teraterm/common/ttlib.h 2021-08-01 15:32:15 UTC (rev 9342)
@@ -138,12 +138,6 @@
#define get_OPENFILENAME_SIZE() get_OPENFILENAME_SIZEA()
-#if defined(_UNICODE)
-#define get_lang_msgT(p1, p2, p3, p4, p5) get_lang_msgW(p1, p2, p3, p4, p5)
-#else
-#define get_lang_msgT(p1, p2, p3, p4, p5) get_lang_msg(p1, p2, p3, p4, p5)
-#endif
-
/*
* \x83V\x83\x8A\x83A\x83\x8B\x83|\x81[\x83g\x8A֘A\x82̐ݒ\xE8\x92\xE8\x8B`
*/
@@ -163,9 +157,11 @@
const wchar_t *title_default; // lng \x83t\x83@\x83C\x83\x8B\x82Ɍ\xA9\x82\xA9\x82\xE7\x82Ȃ\xA9\x82\xC1\x82\xBD\x82Ƃ\xAB\x8Eg\x97p
const char *message_key; // \x83\x81\x83b\x83Z\x81[\x83W
const wchar_t *message_default; // lng \x83t\x83@\x83C\x83\x8B\x82Ɍ\xA9\x82\xA9\x82\xE7\x82Ȃ\xA9\x82\xC1\x82\xBD\x82Ƃ\xAB\x8Eg\x97p
+ UINT uType; // \x83\x81\x83b\x83Z\x81[\x83W\x83{\x83b\x83N\x83X\x82̃^\x83C\x83v
} TTMessageBoxInfoW;
-int TTMessageBoxW(HWND hWnd, const TTMessageBoxInfoW *info, UINT uType, const char *UILanguageFile, ...);
+int TTMessageBoxA(HWND hWnd, const TTMessageBoxInfoW *info, const char *UILanguageFile, ...);
+int TTMessageBoxW(HWND hWnd, const TTMessageBoxInfoW *info, const wchar_t *UILanguageFile, ...);
wchar_t *TTGetLangStrW(const char *section, const char *key, const wchar_t *def, const char *UILanguageFile);
wchar_t *GetClipboardTextW(HWND hWnd, BOOL empty);
char *GetClipboardTextA(HWND hWnd, BOOL empty);
Modified: trunk/teraterm/common/ttlib_static_cpp.cpp
===================================================================
--- trunk/teraterm/common/ttlib_static_cpp.cpp 2021-08-01 15:32:01 UTC (rev 9341)
+++ trunk/teraterm/common/ttlib_static_cpp.cpp 2021-08-01 15:32:15 UTC (rev 9342)
@@ -61,7 +61,6 @@
*
* @param[in] hWnd \x90e window
* @param[in] info \x83^\x83C\x83g\x83\x8B\x81A\x83\x81\x83b\x83Z\x81[\x83W
- * @param[in] uType MessageBox\x82\xCC uType
* @param[in] UILanguageFile lng\x83t\x83@\x83C\x83\x8B
* @param[in] ... \x83t\x83H\x81[\x83}\x83b\x83g\x88\xF8\x90\x94
*
@@ -71,9 +70,10 @@
* info.message_key, info.message_default \x97\xBC\x95\xFB\x82Ƃ\xE0NULL\x82̏ꍇ
* \x89ψ\xF8\x90\x94\x82\xCC1\x82ڂ\xF0\x8F\x91\x8E\xAE\x89\xBB\x95\xB6\x8E\x9A\x97\xF1\x82Ƃ\xB5\x82Ďg\x97p\x82\xB7\x82\xE9
*/
-int TTMessageBoxW(HWND hWnd, const TTMessageBoxInfoW *info, UINT uType, const char *UILanguageFile, ...)
+int TTMessageBoxA(HWND hWnd, const TTMessageBoxInfoW *info, const char *UILanguageFile, ...)
{
const char *section = info->section;
+ const UINT uType = info->uType;
wchar_t *title;
if (info->title_key == NULL) {
title = _wcsdup(info->title_default);
Modified: trunk/teraterm/teraterm/addsetting.cpp
===================================================================
--- trunk/teraterm/teraterm/addsetting.cpp 2021-08-01 15:32:01 UTC (rev 9341)
+++ trunk/teraterm/teraterm/addsetting.cpp 2021-08-01 15:32:15 UTC (rev 9342)
@@ -1497,8 +1497,9 @@
static const TTMessageBoxInfoW info = {
"Tera Term",
"MSG_ERROR", L"ERROR",
- "MSG_LOGFILE_INVALID_CHAR_ERROR", L"Invalid character is included in log file name." };
- TTMessageBoxW(m_hWnd, &info, MB_ICONEXCLAMATION, ts.UILanguageFile);
+ "MSG_LOGFILE_INVALID_CHAR_ERROR", L"Invalid character is included in log file name.",
+ MB_ICONEXCLAMATION };
+ TTMessageBoxA(m_hWnd, &info, ts.UILanguageFile);
return;
}
@@ -1510,8 +1511,9 @@
static const TTMessageBoxInfoW info = {
"Tera Term",
"MSG_ERROR", L"ERROR",
- "MSG_LOGFILE_TOOLONG_ERROR", L"The log file name is too long." };
- TTMessageBoxW(m_hWnd, &info, MB_ICONEXCLAMATION, ts.UILanguageFile);
+ "MSG_LOGFILE_TOOLONG_ERROR", L"The log file name is too long.",
+ MB_ICONEXCLAMATION };
+ TTMessageBoxA(m_hWnd, &info, ts.UILanguageFile);
return;
}
if (isInvalidFileNameChar(buf2)) {
@@ -1518,8 +1520,9 @@
static const TTMessageBoxInfoW info = {
"Tera Term",
"MSG_ERROR", L"ERROR",
- "MSG_LOGFILE_INVALID_CHAR_ERROR", L"Invalid character is included in log file name." };
- TTMessageBoxW(m_hWnd, &info, MB_ICONEXCLAMATION, ts.UILanguageFile);
+ "MSG_LOGFILE_INVALID_CHAR_ERROR", L"Invalid character is included in log file name.",
+ MB_ICONEXCLAMATION };
+ TTMessageBoxA(m_hWnd, &info, ts.UILanguageFile);
return;
}
strncpy_s(ts.LogDefaultName, sizeof(ts.LogDefaultName), buf, _TRUNCATE);
Modified: trunk/teraterm/teraterm/commlib.c
===================================================================
--- trunk/teraterm/teraterm/commlib.c 2021-08-01 15:32:01 UTC (rev 9341)
+++ trunk/teraterm/teraterm/commlib.c 2021-08-01 15:32:15 UTC (rev 9342)
@@ -355,11 +355,9 @@
"Tera Term",
"MSG_TT_ERROR", L"Tera Term: Error",
"MSG_WINSOCK_ERROR", L"Cannot use winsock",
+ MB_TASKMODAL | MB_ICONEXCLAMATION,
};
- TTMessageBoxW(
- cv->HWin,
- &info, (MB_TASKMODAL | MB_ICONEXCLAMATION),
- ts->UILanguageFile);
+ TTMessageBoxA(cv->HWin, &info, ts->UILanguageFile);
}
InvalidHost = TRUE;
}
@@ -416,10 +414,10 @@
static const TTMessageBoxInfoW info = {
"Tera Term",
"MSG_TT_ERROR", L"Tera Term: Error",
- "MSG_INVALID_HOST_ERROR", L"Invalid host"
+ "MSG_INVALID_HOST_ERROR", L"Invalid host",
+ MB_TASKMODAL | MB_ICONEXCLAMATION
};
- TTMessageBoxW(
- cv->HWin, &info, MB_TASKMODAL | MB_ICONEXCLAMATION, ts->UILanguageFile);
+ TTMessageBoxA(cv->HWin, &info, ts->UILanguageFile);
}
goto BreakSC;
}
@@ -452,7 +450,8 @@
static const TTMessageBoxInfoW info = {
"Tera Term",
"MSG_TT_ERROR", L"Tera Term: Error",
- NULL, NULL
+ NULL, NULL,
+ MB_TASKMODAL | MB_ICONEXCLAMATION
};
switch (err) {
@@ -472,8 +471,7 @@
free(format);
free(PW);
- TTMessageBoxW(
- cv->HWin, &info, MB_TASKMODAL | MB_ICONEXCLAMATION, ts->UILanguageFile, ErrMsgW);
+ TTMessageBoxA(cv->HWin, &info, ts->UILanguageFile, ErrMsgW);
}
InvalidHost = TRUE;
}
@@ -503,10 +501,10 @@
static const TTMessageBoxInfoW info = {
"Tera Term",
"MSG_TT_ERROR", L"Tera Term: Error",
- "MSG_CANTOPEN_FILE_ERROR", L"Cannot open file"
+ "MSG_CANTOPEN_FILE_ERROR", L"Cannot open file",
+ MB_TASKMODAL | MB_ICONEXCLAMATION
};
- TTMessageBoxW(
- cv->HWin, &info, MB_TASKMODAL | MB_ICONEXCLAMATION, ts->UILanguageFile);
+ TTMessageBoxA(cv->HWin, &info, ts->UILanguageFile);
}
}
else {
@@ -527,7 +525,8 @@
static const TTMessageBoxInfoW info = {
"Tera Term",
"MSG_TT_ERROR", L"Tera Term: Error",
- NULL, NULL
+ NULL, NULL,
+ MB_TASKMODAL | MB_ICONEXCLAMATION
};
InvalidHost = TRUE;
@@ -536,7 +535,7 @@
L"A valid pipe name has the form\n"
L"\"\\\\<ServerName>\\pipe\\<PipeName>\"",
GetLastError());
- TTMessageBoxW(cv->HWin, &info, MB_TASKMODAL | MB_ICONEXCLAMATION, ts->UILanguageFile, ErrMsgW);
+ TTMessageBoxA(cv->HWin, &info, ts->UILanguageFile, ErrMsgW);
break;
}
@@ -551,7 +550,8 @@
static const TTMessageBoxInfoW info = {
"Tera Term",
"MSG_TT_ERROR", L"Tera Term: Error",
- NULL, NULL
+ NULL, NULL,
+ MB_TASKMODAL | MB_ICONEXCLAMATION
};
switch (err) {
@@ -575,8 +575,7 @@
free(format);
free(PW);
- TTMessageBoxW(
- cv->HWin, &info, MB_TASKMODAL | MB_ICONEXCLAMATION, ts->UILanguageFile, ErrMsgW);
+ TTMessageBoxA(cv->HWin, &info, ts->UILanguageFile, ErrMsgW);
}
InvalidHost = TRUE;
}
@@ -737,12 +736,10 @@
static const TTMessageBoxInfoW info = {
"Tera Term",
"MSG_TT_ERROR", L"Tera Term: Error",
- NULL, NULL
+ NULL, NULL,
+ MB_TASKMODAL | MB_ICONEXCLAMATION
};
- TTMessageBoxW(
- cv->HWin,
- &info, (MB_TASKMODAL | MB_ICONEXCLAMATION),
- ts->UILanguageFile, ErrMsgW);
+ TTMessageBoxA(cv->HWin, &info, ts->UILanguageFile, ErrMsgW);
}
PostMessage(cv->HWin, WM_USER_COMMNOTIFY, 0, FD_CLOSE);
cv->RetryWithOtherProtocol = FALSE;
@@ -771,9 +768,10 @@
static const TTMessageBoxInfoW info = {
"Tera Term",
"MSG_TT_ERROR", L"Tera Term: Error",
- "MSG_TT_ERROR", L"Can't create thread"
+ "MSG_TT_ERROR", L"Can't create thread",
+ MB_TASKMODAL | MB_ICONEXCLAMATION
};
- TTMessageBoxW(cv->HWin, &info, MB_TASKMODAL | MB_ICONEXCLAMATION, ts->UILanguageFile);
+ TTMessageBoxA(cv->HWin, &info, ts->UILanguageFile);
}
break;
@@ -797,9 +795,10 @@
static const TTMessageBoxInfoW info = {
"Tera Term",
"MSG_TT_ERROR", L"Tera Term: Error",
- "MSG_TT_ERROR", L"Can't create thread"
+ "MSG_TT_ERROR", L"Can't create thread",
+ MB_TASKMODAL | MB_ICONEXCLAMATION
};
- TTMessageBoxW(cv->HWin, &info, MB_TASKMODAL | MB_ICONEXCLAMATION, ts->UILanguageFile);
+ TTMessageBoxA(cv->HWin, &info, ts->UILanguageFile);
}
break;
}
Modified: trunk/teraterm/teraterm/sendfiledlg.cpp
===================================================================
--- trunk/teraterm/teraterm/sendfiledlg.cpp 2021-08-01 15:32:01 UTC (rev 9341)
+++ trunk/teraterm/teraterm/sendfiledlg.cpp 2021-08-01 15:32:15 UTC (rev 9342)
@@ -182,8 +182,9 @@
static const TTMessageBoxInfoW mbinfo = {
"Tera Term",
"MSG_TT_ERROR", L"Tera Term: Error",
- "MSG_CANTOPEN_FILE_ERROR", L"Cannot open file" };
- TTMessageBoxW(hDlgWnd, &mbinfo, MB_TASKMODAL | MB_ICONEXCLAMATION, data->UILanguageFile);
+ "MSG_CANTOPEN_FILE_ERROR", L"Cannot open file",
+ MB_TASKMODAL | MB_ICONEXCLAMATION };
+ TTMessageBoxA(hDlgWnd, &mbinfo, data->UILanguageFile);
free(strW);
Modified: trunk/teraterm/teraterm/setupdirdlg.cpp
===================================================================
--- trunk/teraterm/teraterm/setupdirdlg.cpp 2021-08-01 15:32:01 UTC (rev 9341)
+++ trunk/teraterm/teraterm/setupdirdlg.cpp 2021-08-01 15:32:15 UTC (rev 9342)
@@ -155,8 +155,10 @@
static const TTMessageBoxInfoW info = {
"Tera Term",
"MSG_ERROR", L"ERROR",
- "DLG_SETUPDIR_NOFILE_ERROR", L"File does not exist.(%d)" };
- TTMessageBoxW(NULL, &info, MB_OK | MB_ICONWARNING, UILanguageFile, no);
+ "DLG_SETUPDIR_NOFILE_ERROR", L"File does not exist.(%d)",
+ MB_OK | MB_ICONWARNING
+ };
+ TTMessageBoxA(NULL, &info, UILanguageFile, no);
goto error;
}
@@ -175,8 +177,10 @@
static const TTMessageBoxInfoW info = {
"Tera Term",
"MSG_ERROR", L"ERROR",
- "DLG_SETUPDIR_OPENFILE_ERROR", L"Cannot open file.(%d)" };
- TTMessageBoxW(NULL, &info, MB_OK | MB_ICONWARNING, UILanguageFile, no);
+ "DLG_SETUPDIR_OPENFILE_ERROR", L"Cannot open file.(%d)",
+ MB_OK | MB_ICONWARNING
+ };
+ TTMessageBoxA(NULL, &info, UILanguageFile, no);
goto error;
}
@@ -210,8 +214,10 @@
static const TTMessageBoxInfoW info = {
"Tera Term",
"MSG_ERROR", L"ERROR",
- "DLG_SETUPDIR_NOFILE_ERROR", L"File does not exist.(%d)" };
- TTMessageBoxW(NULL, &info, MB_OK | MB_ICONWARNING, UILanguageFile, no);
+ "DLG_SETUPDIR_NOFILE_ERROR", L"File does not exist.(%d)",
+ MB_OK | MB_ICONWARNING
+ };
+ TTMessageBoxA(NULL, &info, UILanguageFile, no);
ret = FALSE;
} else if ((attr & FILE_ATTRIBUTE_DIRECTORY) != 0) {
// \x83t\x83H\x83\x8B\x83_\x82\xF0\x8AJ\x82\xAD
Modified: trunk/teraterm/teraterm/ttplug.c
===================================================================
--- trunk/teraterm/teraterm/ttplug.c 2021-08-01 15:32:01 UTC (rev 9341)
+++ trunk/teraterm/teraterm/ttplug.c 2021-08-01 15:32:15 UTC (rev 9342)
@@ -131,9 +131,13 @@
// \x8C\xBE\x8C\xEA\x83t\x83@\x83C\x83\x8B\x82ɂ\xE6\x82郁\x83b\x83Z\x81[\x83W\x82̍\x91\x8Dۉ\xBB\x82\xF0\x8Ds\x82\xC1\x82Ă\xA2\x82邪\x81A\x82\xB1\x82̎\x9E\x93_\x82ł͐ݒ肪
// \x82܂\xBE\x93ǂݍ\x9E\x82܂\xEA\x82Ă\xA2\x82Ȃ\xA2\x88ׁA\x83\x81\x83b\x83Z\x81[\x83W\x82\xAA\x89p\x8C\xEA\x82̂܂܂ƂȂ\xE9\x81B\x97v\x8C\x9F\x93\xA2\x81B
{
- static const TTMessageBoxInfoW info = {"Tera Term", "MSG_TT_ERROR", L"Tera Term: Error", "MSG_LOAD_EXT_ERROR",
- L"Cannot load extension %s (%d, %s)"};
- TTMessageBoxW(NULL, &info, MB_OK | MB_ICONEXCLAMATION, ts.UILanguageFile, fileName, err, sub_message);
+ static const TTMessageBoxInfoW info = {
+ "Tera Term",
+ "MSG_TT_ERROR", L"Tera Term: Error",
+ "MSG_LOAD_EXT_ERROR", L"Cannot load extension %s (%d, %s)",
+ MB_OK | MB_ICONEXCLAMATION
+ };
+ TTMessageBoxA(NULL, &info, ts.UILanguageFile, fileName, err, sub_message);
}
}
Modified: trunk/teraterm/teraterm/vtwin.cpp
===================================================================
--- trunk/teraterm/teraterm/vtwin.cpp 2021-08-01 15:32:01 UTC (rev 9341)
+++ trunk/teraterm/teraterm/vtwin.cpp 2021-08-01 15:32:15 UTC (rev 9342)
@@ -3843,9 +3843,10 @@
static const TTMessageBoxInfoW mbinfo = {
"Tera Term",
NULL, L"Tera Term: File open error",
- NULL, L"Can not create a `%s' file."
+ NULL, L"Can not create a `%s' file.",
+ MB_OK | MB_ICONERROR
};
- TTMessageBoxW(m_hWnd, &mbinfo, MB_OK | MB_ICONERROR, ts.UILanguageFile, filename);
+ TTMessageBoxA(m_hWnd, &mbinfo, ts.UILanguageFile, filename);
}
free(info.filename);
}
@@ -3894,9 +3895,10 @@
static const TTMessageBoxInfoW mbinfo = {
"Tera Term",
"MSG_ERROR", L"ERROR",
- "MSG_VIEW_LOGFILE_ERROR", L"Can't view logging file. (%d)"
+ "MSG_VIEW_LOGFILE_ERROR", L"Can't view logging file. (%d)",
+ MB_OK | MB_ICONWARNING
};
- TTMessageBoxW(m_hWnd, &mbinfo, MB_OK | MB_ICONWARNING, ts.UILanguageFile, error);
+ TTMessageBoxA(m_hWnd, &mbinfo, ts.UILanguageFile, error);
} else {
CloseHandle(pi.hThread);
CloseHandle(pi.hProcess);
Modified: trunk/teraterm/ttpcmn/ttcmn.c
===================================================================
--- trunk/teraterm/ttpcmn/ttcmn.c 2021-08-01 15:32:01 UTC (rev 9341)
+++ trunk/teraterm/ttpcmn/ttcmn.c 2021-08-01 15:32:15 UTC (rev 9342)
@@ -161,9 +161,10 @@
NULL, L"Tera Term: Configuration Warning",
"MSG_TT_TAKE_EFFECT",
L"This option takes effect the next time a session is started.\n"
- L"Are you sure that you want to relaunch Tera Term?"
+ L"Are you sure that you want to relaunch Tera Term?",
+ MB_YESNO | MB_ICONEXCLAMATION | MB_DEFBUTTON2
};
- ret = TTMessageBoxW(hwnd, &info, MB_YESNO | MB_ICONEXCLAMATION | MB_DEFBUTTON2, ts->UILanguageFile);
+ ret = TTMessageBoxA(hwnd, &info, ts->UILanguageFile);
if (ret != IDYES)
return;
@@ -515,8 +516,9 @@
static const TTMessageBoxInfoW info = {
"Tera Term",
NULL, L"Tera Term: HTML help",
- "MSG_OPENHELP_ERROR", L"Can't open HTML help file(%s)." };
- TTMessageBoxW(HWin, &info, MB_OK | MB_ICONERROR, UILanguageFile, HelpFN);
+ "MSG_OPENHELP_ERROR", L"Can't open HTML help file(%s).",
+ MB_OK | MB_ICONERROR };
+ TTMessageBoxA(HWin, &info, UILanguageFile, HelpFN);
}
free(HelpFN);
}
Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c 2021-08-01 15:32:01 UTC (rev 9341)
+++ trunk/ttssh2/ttxssh/ttxssh.c 2021-08-01 15:32:15 UTC (rev 9342)
@@ -1203,9 +1203,10 @@
static const TTMessageBoxInfoW info = {
"TTSSH",
NULL, L"Tera Term",
- "MSG_TCPPORT_NAN_ERROR", L"The TCP port must be a number."
+ "MSG_TCPPORT_NAN_ERROR", L"The TCP port must be a number.",
+ MB_OK | MB_ICONEXCLAMATION
};
- TTMessageBoxW(dlg, &info, MB_OK | MB_ICONEXCLAMATION, pvar->ts->UILanguageFile);
+ TTMessageBoxA(dlg, &info, pvar->ts->UILanguageFile);
return TRUE;
}
GetHNRec->TCPPort = i;
@@ -1569,9 +1570,10 @@
static const TTMessageBoxInfoW info = {
"TTSSH",
NULL, L"TTSSH",
- "MSG_UNKNOWN_OPTION_ERROR", L"Unrecognized command-line option: %s"
+ "MSG_UNKNOWN_OPTION_ERROR", L"Unrecognized command-line option: %s",
+ MB_OK | MB_ICONEXCLAMATION
};
- TTMessageBoxW(NULL, &info, MB_OK | MB_ICONEXCLAMATION, pvar->ts->UILanguageFile, option);
+ TTMessageBoxA(NULL, &info, pvar->ts->UILanguageFile, option);
}
// ttermpro.exe \x82\xCC /T= \x8Ew\x92\xE8\x82̗\xAC\x97p\x82Ȃ̂ŁA\x91啶\x8E\x9A\x82\xE0\x8B\x96\x82\xB7 (2006.10.19 maya)
@@ -2768,9 +2770,10 @@
static const TTMessageBoxInfoW info = {
"TTSSH",
NULL, L"TTSSH Error",
- "MSG_OPEN_FILEDLG_KNOWNHOSTS_ERROR", L"Unable to display file dialog box: error %d"
+ "MSG_OPEN_FILEDLG_KNOWNHOSTS_ERROR", L"Unable to display file dialog box: error %d",
+ MB_OK | MB_ICONEXCLAMATION
};
- TTMessageBoxW(parent, &info, MB_OK | MB_ICONEXCLAMATION, pvar->ts->UILanguageFile, err);
+ TTMessageBoxA(parent, &info, pvar->ts->UILanguageFile, err);
}
return 0;
@@ -3604,9 +3607,10 @@
static const TTMessageBoxInfoW info = {
"TTSSH",
"MSG_ERROR", L"ERROR",
- "MSG_SAVE_KEY_OPENFILE_ERROR", L"Can't open key file"
+ "MSG_SAVE_KEY_OPENFILE_ERROR", L"Can't open key file",
+ MB_OK | MB_ICONEXCLAMATION
};
- TTMessageBoxW(dlg, &info, MB_OK | MB_ICONEXCLAMATION, pvar->ts->UILanguageFile);
+ TTMessageBoxA(dlg, &info, pvar->ts->UILanguageFile);
goto ed25519_error;
}
n = fwrite(buffer_ptr(blob), buffer_len(blob), 1, fp);
@@ -3614,9 +3618,10 @@
static const TTMessageBoxInfoW info = {
"TTSSH",
"MSG_ERROR", L"ERROR",
- "MSG_SAVE_KEY_WRITEFILE_ERROR", L"Can't open key file"
+ "MSG_SAVE_KEY_WRITEFILE_ERROR", L"Can't open key file",
+ MB_OK | MB_ICONEXCLAMATION
};
- TTMessageBoxW(dlg, &info, MB_OK | MB_ICONEXCLAMATION, pvar->ts->UILanguageFile);
+ TTMessageBoxA(dlg, &info, pvar->ts->UILanguageFile);
}
fclose(fp);
@@ -3713,9 +3718,10 @@
static const TTMessageBoxInfoW info = {
"TTSSH",
NULL, L"Tera Term",
- "MSG_KEYBITS_MIN_ERROR", L"The key bits is too small."
+ "MSG_KEYBITS_MIN_ERROR", L"The key bits is too small.",
+ MB_OK | MB_ICONEXCLAMATION
};
- TTMessageBoxW(dlg, &info, MB_OK | MB_ICONEXCLAMATION, pvar->ts->UILanguageFile);
+ TTMessageBoxA(dlg, &info, pvar->ts->UILanguageFile);
return TRUE;
}
break;
@@ -4014,9 +4020,10 @@
static const TTMessageBoxInfoW info = {
"TTSSH",
"MSG_ERROR", L"ERROR",
- "MSG_SAVE_KEY_OPENFILE_ERROR", L"Can't open key file"
+ "MSG_SAVE_KEY_OPENFILE_ERROR", L"Can't open key file",
+ MB_OK | MB_ICONEXCLAMATION
};
- TTMessageBoxW(dlg, &info, MB_OK | MB_ICONEXCLAMATION, pvar->ts->UILanguageFile);
+ TTMessageBoxA(dlg, &info, pvar->ts->UILanguageFile);
break;
}
@@ -4140,9 +4147,10 @@
static const TTMessageBoxInfoW info = {
"TTSSH",
"MSG_ERROR", L"ERROR",
- "MSG_SAVE_PRIVATE_KEY_MISMATCH_ERROR", L"Two passphrases don't match."
+ "MSG_SAVE_PRIVATE_KEY_MISMATCH_ERROR", L"Two passphrases don't match.",
+ MB_OK | MB_ICONEXCLAMATION
};
- TTMessageBoxW(dlg, &info, MB_OK | MB_ICONEXCLAMATION, pvar->ts->UILanguageFile);
+ TTMessageBoxA(dlg, &info, pvar->ts->UILanguageFile);
break;
}
@@ -4152,8 +4160,9 @@
"TTSSH",
"MSG_WARNING", L"WARNING",
"MSG_SAVE_PRIVATEKEY_EMPTY_WARN", L"Are you sure that you want to use a empty passphrase?",
+ MB_OK | MB_ICONEXCLAMATION
};
- ret = TTMessageBoxW(dlg, &info, MB_OK | MB_ICONEXCLAMATION, pvar->ts->UILanguageFile);
+ ret = TTMessageBoxA(dlg, &info, pvar->ts->UILanguageFile);
if (ret == IDNO)
break;
}
@@ -4165,9 +4174,10 @@
static const TTMessageBoxInfoW info = {
"TTSSH",
NULL, L"Tera Term",
- "MSG_BCRYPT_ROUNDS_MIN_ERROR", L"The number of rounds is too small."
+ "MSG_BCRYPT_ROUNDS_MIN_ERROR", L"The number of rounds is too small.",
+ MB_OK | MB_ICONEXCLAMATION
};
- TTMessageBoxW(dlg, &info, MB_OK | MB_ICONEXCLAMATION, pvar->ts->UILanguageFile);
+ TTMessageBoxA(dlg, &info, pvar->ts->UILanguageFile);
break;
}
if (rounds > SSH_KEYGEN_MAXIMUM_ROUNDS) {
@@ -4174,9 +4184,10 @@
static const TTMessageBoxInfoW info = {
"TTSSH",
NULL, L"Tera Term",
- "MSG_BCRYPT_ROUNDS_MAX_ERROR", L"The number of rounds is too large."
+ "MSG_BCRYPT_ROUNDS_MAX_ERROR", L"The number of rounds is too large.",
+ MB_OK | MB_ICONEXCLAMATION
};
- TTMessageBoxW(dlg, &info, MB_OK | MB_ICONEXCLAMATION, pvar->ts->UILanguageFile);
+ TTMessageBoxA(dlg, &info, pvar->ts->UILanguageFile);
break;
}
}
@@ -4349,9 +4360,10 @@
static const TTMessageBoxInfoW info = {
"TTSSH",
"MSG_ERROR", L"ERROR",
- "MSG_SAVE_KEY_OPENFILE_ERROR", L"Can't open key file"
+ "MSG_SAVE_KEY_OPENFILE_ERROR", L"Can't open key file",
+ MB_OK | MB_ICONEXCLAMATION
};
- TTMessageBoxW(dlg, &info, MB_OK | MB_ICONEXCLAMATION, pvar->ts->UILanguageFile);
+ TTMessageBoxA(dlg, &info, pvar->ts->UILanguageFile);
break;
}
fwrite(buffer_ptr(enc), buffer_len(enc), 1, fp);
@@ -4389,9 +4401,10 @@
static const TTMessageBoxInfoW info = {
"TTSSH",
"MSG_ERROR", L"ERROR",
- "MSG_SAVE_KEY_OPENFILE_ERROR", L"Can't open key file"
+ "MSG_SAVE_KEY_OPENFILE_ERROR", L"Can't open key file",
+ MB_OK | MB_ICONEXCLAMATION
};
- TTMessageBoxW(dlg, &info, MB_OK | MB_ICONEXCLAMATION, pvar->ts->UILanguageFile);
+ TTMessageBoxA(dlg, &info, pvar->ts->UILanguageFile);
break;
}
@@ -4412,9 +4425,10 @@
static const TTMessageBoxInfoW info = {
"TTSSH",
"MSG_ERROR", L"ERROR",
- "MSG_SAVE_KEY_WRITEFILE_ERROR", L"Can't open key file"
+ "MSG_SAVE_KEY_WRITEFILE_ERROR", L"Can't open key file",
+ MB_OK | MB_ICONEXCLAMATION
};
- TTMessageBoxW(dlg, &info, MB_OK | MB_ICONEXCLAMATION, pvar->ts->UILanguageFile);
+ TTMessageBoxA(dlg, &info, pvar->ts->UILanguageFile);
}
fclose(fp);
}
@@ -4451,9 +4465,10 @@
static const TTMessageBoxInfoW info = {
"TTSSH",
"MSG_TTSSH_ERROR", L"TTSSH Error",
- "MSG_CREATEWINDOW_SCP_ERROR", L"Unable to display SCP dialog box."
+ "MSG_CREATEWINDOW_SCP_ERROR", L"Unable to display SCP dialog box.",
+ MB_OK | MB_ICONEXCLAMATION
};
- TTMessageBoxW(hWin, &info, MB_OK | MB_ICONEXCLAMATION, pvar->ts->UILanguageFile);
+ TTMessageBoxA(hWin, &info, pvar->ts->UILanguageFile);
}
return 1;
@@ -4464,9 +4479,10 @@
static const TTMessageBoxInfoW info = {
"TTSSH",
"MSG_TTSSH_ERROR", L"TTSSH Error",
- "MSG_CREATEWINDOW_KEYGEN_ERROR", L"Unable to display Key Generator dialog box."
+ "MSG_CREATEWINDOW_KEYGEN_ERROR", L"Unable to display Key Generator dialog box.",
+ MB_OK | MB_ICONEXCLAMATION
};
- TTMessageBoxW(hWin, &info, MB_OK | MB_ICONEXCLAMATION, pvar->ts->UILanguageFile);
+ TTMessageBoxA(hWin, &info, pvar->ts->UILanguageFile);
}
return 1;
@@ -4477,9 +4493,10 @@
static const TTMessageBoxInfoW info = {
"TTSSH",
"MSG_TTSSH_ERROR", L"TTSSH Error",
- "MSG_CREATEWINDOW_ABOUT_ERROR", L"Unable to display About dialog box."
+ "MSG_CREATEWINDOW_ABOUT_ERROR", L"Unable to display About dialog box.",
+ MB_OK | MB_ICONEXCLAMATION
};
- TTMessageBoxW(hWin, &info, MB_OK | MB_ICONEXCLAMATION, pvar->ts->UILanguageFile);
+ TTMessageBoxA(hWin, &info, pvar->ts->UILanguageFile);
}
return 1;
case ID_SSHAUTH:
@@ -4493,9 +4510,10 @@
static const TTMessageBoxInfoW info = {
"TTSSH",
"MSG_TTSSH_ERROR", L"TTSSH Error",
- "MSG_CREATEWINDOW_SETUP_ERROR", L"Unable to display TTSSH Setup dialog box."
+ "MSG_CREATEWINDOW_SETUP_ERROR", L"Unable to display TTSSH Setup dialog box.",
+ MB_OK | MB_ICONEXCLAMATION
};
- TTMessageBoxW(hWin, &info, MB_OK | MB_ICONEXCLAMATION, pvar->ts->UILanguageFile);
+ TTMessageBoxA(hWin, &info, pvar->ts->UILanguageFile);
}
return 1;
case ID_SSHAUTHSETUPMENU: