From 2f261839b60692e33d0e160344d0d636d49c90ba Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 27 Jul 2016 14:23:31 +0000 Subject: less TCHARs git-svn-id: http://svn.miranda-ng.org/main/trunk@17138 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/LotusNotify/src/LotusNotify.cpp | 14 +++++++------- plugins/LotusNotify/src/debug.cpp | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'plugins/LotusNotify/src') diff --git a/plugins/LotusNotify/src/LotusNotify.cpp b/plugins/LotusNotify/src/LotusNotify.cpp index 96aa582cf6..02a83da50d 100644 --- a/plugins/LotusNotify/src/LotusNotify.cpp +++ b/plugins/LotusNotify/src/LotusNotify.cpp @@ -446,7 +446,7 @@ void showMsg(wchar_t* sender,wchar_t* text, DWORD id, char *strUID) //99% of the times you'll just copy this line. //1% of the times you may wish to change the contact's name. I don't know why you should, but you can. //char * lpzText; - //The text for the second line. You could even make something like: char lpzText[128]; mir_tstrcpy(lpzText, "Hello world!"); It's your choice. + //The text for the second line. You could even make something like: char lpzText[128]; mir_wstrcpy(lpzText, "Hello world!"); It's your choice. POPUPATT * mpd = (POPUPATT*)malloc(sizeof(POPUPATT)); memset(&ppd, 0, sizeof(ppd)); //This is always a good thing to do. @@ -478,7 +478,7 @@ void showMsg(wchar_t* sender,wchar_t* text, DWORD id, char *strUID) //what to do with error msg void ErMsgW(WCHAR* msg) { - wchar_t* msgT = mir_u2t(msg); + wchar_t* msgT = mir_wstrdup(msg); ErMsgT(msgT); mir_free(msgT); } @@ -775,11 +775,11 @@ void checkthread(void*) if (attSize) { WCHAR field_attachments_UNICODE[MAX_FIELD]; - mir_sntprintf(field_attachments_UNICODE, TranslateT("Attachments: %d bytes"), attSize); - mir_sntprintf(msgSubject, L"%S\n%s\n%s", field_date, field_subject_UNICODE, field_attachments_UNICODE); + mir_snwprintf(field_attachments_UNICODE, TranslateT("Attachments: %d bytes"), attSize); + mir_snwprintf(msgSubject, L"%S\n%s\n%s", field_date, field_subject_UNICODE, field_attachments_UNICODE); } else { - mir_sntprintf(msgSubject, L"%S\n%s", field_date, field_subject_UNICODE); + mir_snwprintf(msgSubject, L"%S\n%s", field_date, field_subject_UNICODE); } //check if this is not filtered msg @@ -1574,7 +1574,7 @@ void checkEnvPath(wchar_t *path) wchar_t *cur = _wgetenv(L"PATH"); wcslwr(cur); wchar_t *found = wcsstr(cur, path); - size_t len = mir_tstrlen(path); + size_t len = mir_wstrlen(path); if (found != NULL && (found[len] == ';' || found[len] == 0 || (found[len] == '\\' && (found[len + 1] == ';' || found[len + 1] == 0)))) return; @@ -1600,7 +1600,7 @@ static int modulesloaded(WPARAM, LPARAM) GetLotusPath(path, sizeof(path)); checkEnvPath(path); wcscat_s(path, _countof(path), L"nnotes.dll"); - assert(mir_tstrlen(path) > 0); + assert(mir_wstrlen(path) > 0); log_p(L"Loading dll: %s", path); diff --git a/plugins/LotusNotify/src/debug.cpp b/plugins/LotusNotify/src/debug.cpp index 37f5f26948..965538e7f4 100644 --- a/plugins/LotusNotify/src/debug.cpp +++ b/plugins/LotusNotify/src/debug.cpp @@ -34,7 +34,7 @@ void log_p(const wchar_t* szText, ...){ va_start(args, szText); int len = _vscwprintf(szText, args ) + 1; // _vscprintf doesn't count terminating '\0' //!!!!!!!!!!!!!!!! wchar_t* buffer = new wchar_t[len * sizeof(wchar_t)]; - mir_vsntprintf(buffer, len, szText, args); + mir_vsnwprintf(buffer, len, szText, args); va_end(args); log(buffer); delete[] buffer; -- cgit v1.2.3