• R/O
  • SSH
  • HTTPS

ttssh2: Commit


Commit MetaInfo

Revision8548 (tree)
Zeit2020-02-20 00:20:44
Autorzmatsuo

Log Message

GetI18nStrT() を削除

Ändern Zusammenfassung

Diff

--- trunk/teraterm/common/i18n.h (revision 8547)
+++ trunk/teraterm/common/i18n.h (revision 8548)
@@ -48,6 +48,7 @@
4848
4949 DllExport void WINAPI GetI18nStrW(const char *section, const char *key, wchar_t *buf, int buf_len, const wchar_t *def, const char *iniFile);
5050 DllExport void WINAPI GetI18nStr(const char *section, const char *key, PCHAR buf, int buf_len, const char *def, const char *iniFile);
51+void GetI18nStrU8(const char* section, const char* key, char* buf, int buf_len, const char* def, const char* iniFile);
5152 DllExport int WINAPI GetI18nLogfont(const char *section, const char *key, PLOGFONTA logfont, int ppi, const char *iniFile);
5253 DllExport int WINAPI SetI18nDlgStrs(const char *section, HWND hDlgWnd,
5354 const DlgTextInfo *infos, size_t infoCount, const char *UILanguageFile);
@@ -54,12 +55,6 @@
5455 DllExport void WINAPI SetI18nMenuStrs(const char *section, HMENU hMenu,
5556 const DlgTextInfo *infos, size_t infoCount, const char *UILanguageFile);
5657
57-#if defined(_UNICODE)
58-#define GetI18nStrT(p1, p2, p3, p4, p5, p6) GetI18nStrW(p1, p2, p3, p4, p5, p6)
59-#else
60-#define GetI18nStrT(p1, p2, p3, p4, p5, p6) GetI18nStr(p1, p2, p3, p4, p5, p6)
61-#endif
62-
6358 #ifdef __cplusplus
6459 }
6560 #endif
--- trunk/ttssh2/ttxssh/auth.c (revision 8547)
+++ trunk/ttssh2/ttxssh/auth.c (revision 8548)
@@ -1053,25 +1053,25 @@
10531053 int result;
10541054 HMENU hMenu= CreatePopupMenu();
10551055 char *clipboard = GetClipboardTextA(dlg, FALSE);
1056- GetI18nStrT("TTSSH", "DLG_AUTH_PASTE_CLIPBOARD",
1057- uimsg, _countof(uimsg),
1058- "Paste from &clipboard",
1059- pvar->ts->UILanguageFile);
1056+ GetI18nStr("TTSSH", "DLG_AUTH_PASTE_CLIPBOARD",
1057+ uimsg, _countof(uimsg),
1058+ "Paste from &clipboard",
1059+ pvar->ts->UILanguageFile);
10601060 AppendMenu(hMenu, MF_ENABLED | MF_STRING | (clipboard == NULL ? MFS_DISABLED : 0), 1, uimsg);
1061- GetI18nStrT("ttssh", "DLG_AUTH_CLEAR_CLIPBOARD",
1062- uimsg, _countof(uimsg),
1063- "Paste from &clipboard and cl&ear clipboard",
1064- pvar->ts->UILanguageFile);
1061+ GetI18nStr("ttssh", "DLG_AUTH_CLEAR_CLIPBOARD",
1062+ uimsg, _countof(uimsg),
1063+ "Paste from &clipboard and cl&ear clipboard",
1064+ pvar->ts->UILanguageFile);
10651065 AppendMenu(hMenu, MF_ENABLED | MF_STRING | (clipboard == NULL ? MFS_DISABLED : 0), 2, uimsg);
1066- GetI18nStrT("ttssh", "DLG_AUTH_USE_CONTORL_CHARACTERS",
1067- uimsg, _countof(uimsg),
1068- "Use control charac&ters",
1069- pvar->ts->UILanguageFile);
1066+ GetI18nStr("ttssh", "DLG_AUTH_USE_CONTORL_CHARACTERS",
1067+ uimsg, _countof(uimsg),
1068+ "Use control charac&ters",
1069+ pvar->ts->UILanguageFile);
10701070 AppendMenu(hMenu, MF_ENABLED | MF_STRING | (UseControlChar ? MFS_CHECKED : 0), 3, uimsg);
1071- GetI18nStrT("ttssh", "DLG_AUTH_SHOW_PASSPHRASE",
1072- uimsg, _countof(uimsg),
1073- "&Show passphrase",
1074- pvar->ts->UILanguageFile);
1071+ GetI18nStr("ttssh", "DLG_AUTH_SHOW_PASSPHRASE",
1072+ uimsg, _countof(uimsg),
1073+ "&Show passphrase",
1074+ pvar->ts->UILanguageFile);
10751075 AppendMenu(hMenu, MF_ENABLED | MF_STRING | (ShowPassPhrase ? MFS_CHECKED : 0), 4, uimsg);
10761076 if (clipboard != NULL) {
10771077 free(clipboard);
@@ -1141,16 +1141,16 @@
11411141 HMENU hMenu= CreatePopupMenu();
11421142 int result;
11431143 const BOOL DisableDefaultUserName = pvar->session_settings.DefaultUserName[0] == 0;
1144- GetI18nStrT("TTSSH", "DLG_AUTH_USE_DEFAULT_USERNAME",
1145- uimsg, _countof(uimsg),
1146- "Use &default username",
1147- pvar->ts->UILanguageFile);
1144+ GetI18nStr("TTSSH", "DLG_AUTH_USE_DEFAULT_USERNAME",
1145+ uimsg, _countof(uimsg),
1146+ "Use &default username",
1147+ pvar->ts->UILanguageFile);
11481148 AppendMenu(hMenu, MF_ENABLED | MF_STRING | (DisableDefaultUserName ? MFS_DISABLED : 0), 1,
11491149 uimsg);
1150- GetI18nStrT("TTSSH", "DLG_AUTH_USE_LOGON_USERNAME",
1151- uimsg, _countof(uimsg),
1152- "Use &logon username",
1153- pvar->ts->UILanguageFile);
1150+ GetI18nStr("TTSSH", "DLG_AUTH_USE_LOGON_USERNAME",
1151+ uimsg, _countof(uimsg),
1152+ "Use &logon username",
1153+ pvar->ts->UILanguageFile);
11541154 AppendMenu(hMenu, MF_ENABLED | MF_STRING, 2, uimsg);
11551155 hWndButton = GetDlgItem(dlg, IDC_USERNAME_OPTION);
11561156 GetWindowRect(hWndButton, &rect);
Show on old repository browser