From 6e53dfca72b932c4bdcd7aa02ca62bf8b2630eac Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 26 Jul 2016 09:20:25 +0000 Subject: less TCHARs: - TCHAR is replaced with wchar_t everywhere; - LPGENT replaced with either LPGENW or LPGEN; - fixes for ANSI plugins that improperly used _t functions; - TCHAR *t removed from MAllStrings; - ptszGroup, ptszTitle & ptszTab in OPTIONSDIALOGPAGE replaced with pwsz* git-svn-id: http://svn.miranda-ng.org/main/trunk@17133 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/AVS/src/main.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/AVS/src/main.cpp') diff --git a/plugins/AVS/src/main.cpp b/plugins/AVS/src/main.cpp index 8a9bc4170a..516d6a204b 100644 --- a/plugins/AVS/src/main.cpp +++ b/plugins/AVS/src/main.cpp @@ -32,7 +32,7 @@ bool g_shutDown = false; int hLangpack; -TCHAR g_szDataPath[MAX_PATH]; // user datae path (read at startup only) +wchar_t g_szDataPath[MAX_PATH]; // user datae path (read at startup only) BOOL g_AvatarHistoryAvail = FALSE; HWND hwndSetMyAvatar = 0; @@ -144,7 +144,7 @@ static void LoadProtoInfo(PROTOCOLDESCRIPTOR *proto) char protoName[MAX_PATH]; mir_snprintf(protoName, "Global avatar for %s accounts", proto->szName); - TCHAR protoNameTmp[MAX_PATH]; + wchar_t protoNameTmp[MAX_PATH]; mir_sntprintf(protoNameTmp, TranslateT("Global avatar for %s accounts"), _A2T(proto->szName)); protoPicCacheEntry *pce = new protoPicCacheEntry; if (CreateAvatarInCache(0, pce, protoName) != 1) @@ -322,7 +322,7 @@ void InternalDrawAvatar(AVATARDRAWREQUEST *r, HBITMAP hbm, LONG bmWidth, LONG bm static int ModulesLoaded(WPARAM, LPARAM) { - TCHAR szEventName[100]; + wchar_t szEventName[100]; mir_sntprintf(szEventName, L"avs_loaderthread_%d", GetCurrentThreadId()); hLoaderEvent = CreateEvent(NULL, TRUE, FALSE, szEventName); @@ -381,8 +381,8 @@ static int LoadAvatarModule() InitServices(); InitPolls(); - _tcsncpy_s(g_szDataPath, _countof(g_szDataPath), VARST(L"%miranda_userdata%\\"), _TRUNCATE); - _tcslwr(g_szDataPath); + wcsncpy_s(g_szDataPath, _countof(g_szDataPath), VARST(L"%miranda_userdata%\\"), _TRUNCATE); + wcslwr(g_szDataPath); return 0; } -- cgit v1.2.3