[Ttssh2-commit] [8548] GetI18nStrT() を削除

scmno****@osdn***** scmno****@osdn*****
2020年 2月 20日 (木) 00:20:45 JST


Revision: 8548
          https://osdn.net/projects/ttssh2/scm/svn/commits/8548
Author:   zmatsuo
Date:     2020-02-20 00:20:44 +0900 (Thu, 20 Feb 2020)
Log Message:
-----------
GetI18nStrT() を削除

Modified Paths:
--------------
    trunk/teraterm/common/i18n.h
    trunk/ttssh2/ttxssh/auth.c

-------------- next part --------------
Modified: trunk/teraterm/common/i18n.h
===================================================================
--- trunk/teraterm/common/i18n.h	2020-02-19 15:20:34 UTC (rev 8547)
+++ trunk/teraterm/common/i18n.h	2020-02-19 15:20:44 UTC (rev 8548)
@@ -48,6 +48,7 @@
 
 DllExport void WINAPI GetI18nStrW(const char *section, const char *key, wchar_t *buf, int buf_len, const wchar_t *def, const char *iniFile);
 DllExport void WINAPI GetI18nStr(const char *section, const char *key, PCHAR buf, int buf_len, const char *def, const char *iniFile);
+void GetI18nStrU8(const char* section, const char* key, char* buf, int buf_len, const char* def, const char* iniFile);
 DllExport int WINAPI GetI18nLogfont(const char *section, const char *key, PLOGFONTA logfont, int ppi, const char *iniFile);
 DllExport int WINAPI SetI18nDlgStrs(const char *section, HWND hDlgWnd,
 							 const DlgTextInfo *infos, size_t infoCount, const char *UILanguageFile);
@@ -54,12 +55,6 @@
 DllExport void WINAPI SetI18nMenuStrs(const char *section, HMENU hMenu,
 							  const DlgTextInfo *infos, size_t infoCount, const char *UILanguageFile);
 
-#if defined(_UNICODE)
-#define	GetI18nStrT(p1, p2, p3, p4, p5, p6) GetI18nStrW(p1, p2, p3, p4, p5, p6)
-#else
-#define	GetI18nStrT(p1, p2, p3, p4, p5, p6) GetI18nStr(p1, p2, p3, p4, p5, p6)
-#endif
-
 #ifdef __cplusplus
 }
 #endif

Modified: trunk/ttssh2/ttxssh/auth.c
===================================================================
--- trunk/ttssh2/ttxssh/auth.c	2020-02-19 15:20:34 UTC (rev 8547)
+++ trunk/ttssh2/ttxssh/auth.c	2020-02-19 15:20:44 UTC (rev 8548)
@@ -1053,25 +1053,25 @@
 			int result;
 			HMENU hMenu= CreatePopupMenu();
 			char *clipboard = GetClipboardTextA(dlg, FALSE);
-			GetI18nStrT("TTSSH", "DLG_AUTH_PASTE_CLIPBOARD",
-						uimsg, _countof(uimsg),
-						"Paste from &clipboard",
-						pvar->ts->UILanguageFile);
+			GetI18nStr("TTSSH", "DLG_AUTH_PASTE_CLIPBOARD",
+					   uimsg, _countof(uimsg),
+					   "Paste from &clipboard",
+					   pvar->ts->UILanguageFile);
 			AppendMenu(hMenu, MF_ENABLED | MF_STRING | (clipboard == NULL ? MFS_DISABLED : 0), 1, uimsg);
-			GetI18nStrT("ttssh", "DLG_AUTH_CLEAR_CLIPBOARD",
-						uimsg, _countof(uimsg),
-						"Paste from &clipboard and cl&ear clipboard",
-						pvar->ts->UILanguageFile);
+			GetI18nStr("ttssh", "DLG_AUTH_CLEAR_CLIPBOARD",
+					   uimsg, _countof(uimsg),
+					   "Paste from &clipboard and cl&ear clipboard",
+					   pvar->ts->UILanguageFile);
 			AppendMenu(hMenu, MF_ENABLED | MF_STRING | (clipboard == NULL ? MFS_DISABLED : 0), 2, uimsg);
-			GetI18nStrT("ttssh", "DLG_AUTH_USE_CONTORL_CHARACTERS",
-						uimsg, _countof(uimsg),
-						"Use control charac&ters",
-						pvar->ts->UILanguageFile);
+			GetI18nStr("ttssh", "DLG_AUTH_USE_CONTORL_CHARACTERS",
+					   uimsg, _countof(uimsg),
+					   "Use control charac&ters",
+					   pvar->ts->UILanguageFile);
 			AppendMenu(hMenu, MF_ENABLED | MF_STRING  | (UseControlChar ? MFS_CHECKED : 0), 3, uimsg);
-			GetI18nStrT("ttssh", "DLG_AUTH_SHOW_PASSPHRASE",
-						uimsg, _countof(uimsg),
-						"&Show passphrase",
-						pvar->ts->UILanguageFile);
+			GetI18nStr("ttssh", "DLG_AUTH_SHOW_PASSPHRASE",
+					   uimsg, _countof(uimsg),
+					   "&Show passphrase",
+					   pvar->ts->UILanguageFile);
 			AppendMenu(hMenu, MF_ENABLED | MF_STRING | (ShowPassPhrase ? MFS_CHECKED : 0), 4, uimsg);
 			if (clipboard != NULL) {
 				free(clipboard);
@@ -1141,16 +1141,16 @@
 			HMENU hMenu= CreatePopupMenu();
 			int result;
 			const BOOL DisableDefaultUserName = pvar->session_settings.DefaultUserName[0] == 0;
-			GetI18nStrT("TTSSH", "DLG_AUTH_USE_DEFAULT_USERNAME",
-						uimsg, _countof(uimsg),
-						"Use &default username",
-						pvar->ts->UILanguageFile);
+			GetI18nStr("TTSSH", "DLG_AUTH_USE_DEFAULT_USERNAME",
+					   uimsg, _countof(uimsg),
+					   "Use &default username",
+					   pvar->ts->UILanguageFile);
 			AppendMenu(hMenu, MF_ENABLED | MF_STRING | (DisableDefaultUserName ? MFS_DISABLED : 0), 1,
 					   uimsg);
-			GetI18nStrT("TTSSH", "DLG_AUTH_USE_LOGON_USERNAME",
-						uimsg, _countof(uimsg),
-						"Use &logon username",
-						pvar->ts->UILanguageFile);
+			GetI18nStr("TTSSH", "DLG_AUTH_USE_LOGON_USERNAME",
+					   uimsg, _countof(uimsg),
+					   "Use &logon username",
+					   pvar->ts->UILanguageFile);
 			AppendMenu(hMenu, MF_ENABLED | MF_STRING, 2, uimsg);
 			hWndButton = GetDlgItem(dlg, IDC_USERNAME_OPTION);
 			GetWindowRect(hWndButton, &rect);


Ttssh2-commit メーリングリストの案内