From 428bf0cbd77813a43094cb5c984436deff251936 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 29 Jul 2016 12:36:34 +0000 Subject: no more TCHARs git-svn-id: http://svn.miranda-ng.org/main/trunk@17143 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/AimOscar/src/avatars.cpp | 6 +++--- protocols/AimOscar/src/file.cpp | 4 ++-- protocols/AimOscar/src/links.cpp | 2 +- protocols/AimOscar/src/popup.cpp | 2 +- protocols/AimOscar/src/proto.cpp | 6 +++--- protocols/AimOscar/src/server.cpp | 2 +- protocols/AimOscar/src/ui.cpp | 4 ++-- protocols/AimOscar/src/utility.cpp | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) (limited to 'protocols/AimOscar') diff --git a/protocols/AimOscar/src/avatars.cpp b/protocols/AimOscar/src/avatars.cpp index 9a8a160503..fa966348e1 100644 --- a/protocols/AimOscar/src/avatars.cpp +++ b/protocols/AimOscar/src/avatars.cpp @@ -118,15 +118,15 @@ void CAimProto::avatar_retrieval_handler(const char* sn, const char* /*hash*/, c int CAimProto::get_avatar_filename(MCONTACT hContact, wchar_t* pszDest, size_t cbLen, const wchar_t *ext) { - int tPathLen = mir_snwprintf(pszDest, cbLen, L"%s\\%S", VARST(L"%miranda_avatarcache%"), m_szModuleName); + int tPathLen = mir_snwprintf(pszDest, cbLen, L"%s\\%S", VARSW(L"%miranda_avatarcache%"), m_szModuleName); if (ext && _waccess(pszDest, 0)) - CreateDirectoryTreeT(pszDest); + CreateDirectoryTreeW(pszDest); size_t tPathLen2 = tPathLen; DBVARIANT dbv; - if (getTString(hContact, AIM_KEY_AH, &dbv)) return GAIR_NOAVATAR; + if (getWString(hContact, AIM_KEY_AH, &dbv)) return GAIR_NOAVATAR; tPathLen += mir_snwprintf(pszDest + tPathLen, cbLen - tPathLen, L"\\%s", dbv.ptszVal); db_free(&dbv); diff --git a/protocols/AimOscar/src/file.cpp b/protocols/AimOscar/src/file.cpp index a186b29fa8..007359eb8f 100644 --- a/protocols/AimOscar/src/file.cpp +++ b/protocols/AimOscar/src/file.cpp @@ -335,7 +335,7 @@ int CAimProto::receiving_file(file_transfer *ft, HANDLE hServerPacketRecver, NET if (ft->pfts.tszCurrentFile) { wchar_t* dir = get_dir(ft->pfts.tszCurrentFile); - CreateDirectoryTreeT(dir); + CreateDirectoryTreeW(dir); mir_free(dir); oft->type = _htons(ft->pfts.currentFileProgress ? 0x0205 : 0x0202); @@ -491,7 +491,7 @@ file_transfer::file_transfer(MCONTACT hCont, char* nick, char* cookie) memset(this, 0, sizeof(*this)); pfts.cbSize = sizeof(pfts); - pfts.flags = PFTS_TCHAR; + pfts.flags = PFTS_UNICODE; pfts.hContact = hCont; hContact = hCont; diff --git a/protocols/AimOscar/src/links.cpp b/protocols/AimOscar/src/links.cpp index d759679d9f..15aab1fb90 100644 --- a/protocols/AimOscar/src/links.cpp +++ b/protocols/AimOscar/src/links.cpp @@ -127,7 +127,7 @@ static INT_PTR ServiceParseAimLink(WPARAM, LPARAM lParam) MCONTACT hContact = proto->contact_from_sn(sn, true, true); if (hContact) - CallService(MS_MSG_SENDMESSAGET, hContact, (LPARAM)msg); + CallService(MS_MSG_SENDMESSAGEW, hContact, (LPARAM)msg); mir_free(sn); return 0; diff --git a/protocols/AimOscar/src/popup.cpp b/protocols/AimOscar/src/popup.cpp index 7e52cd572c..082e6fe606 100644 --- a/protocols/AimOscar/src/popup.cpp +++ b/protocols/AimOscar/src/popup.cpp @@ -80,7 +80,7 @@ void CAimProto::ShowPopup(const char* msg, int flags, char* url) } wchar_t *msgt = (flags & TCHAR_POPUP) ? mir_wstrdup((wchar_t*)msg) : mir_a2u(msg); - wcsncpy_s(ppd.lptzText, TranslateTS(msgt), _TRUNCATE); + wcsncpy_s(ppd.lptzText, TranslateW(msgt), _TRUNCATE); mir_free(msgt); if (!ServiceExists(MS_POPUP_ADDPOPUPT)) diff --git a/protocols/AimOscar/src/proto.cpp b/protocols/AimOscar/src/proto.cpp index 0a1f2e9e35..3530efa2ed 100644 --- a/protocols/AimOscar/src/proto.cpp +++ b/protocols/AimOscar/src/proto.cpp @@ -50,7 +50,7 @@ CAimProto::CAimProto(const char* aProtoName, const wchar_t* aUserName) : NETLIBUSER nlu = { 0 }; nlu.cbSize = sizeof(nlu); - nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS | NUF_TCHAR; + nlu.flags = NUF_OUTGOING | NUF_HTTPCONNS | NUF_UNICODE; nlu.szSettingsModule = m_szModuleName; mir_snwprintf(descr, TranslateT("%s server connection"), m_tszUserName); nlu.ptszDescriptiveName = descr; @@ -58,7 +58,7 @@ CAimProto::CAimProto(const char* aProtoName, const wchar_t* aUserName) : char szP2P[128]; mir_snprintf(szP2P, "%sP2P", m_szModuleName); - nlu.flags = NUF_OUTGOING | NUF_INCOMING | NUF_TCHAR; + nlu.flags = NUF_OUTGOING | NUF_INCOMING | NUF_UNICODE; mir_snwprintf(descr, TranslateT("%s client-to-client connections"), m_tszUserName); nlu.szSettingsModule = szP2P; nlu.minIncomingPorts = 1; @@ -555,7 +555,7 @@ void __cdecl CAimProto::get_online_msg_thread(void* arg) MCONTACT hContact = (UINT_PTR)arg; DBVARIANT dbv; - if (!db_get_ts(hContact, MOD_KEY_CL, OTH_KEY_SM, &dbv)) { + if (!db_get_ws(hContact, MOD_KEY_CL, OTH_KEY_SM, &dbv)) { ProtoBroadcastAck(hContact, ACKTYPE_AWAYMSG, ACKRESULT_SUCCESS, (HANDLE)1, (LPARAM)dbv.ptszVal); db_free(&dbv); } diff --git a/protocols/AimOscar/src/server.cpp b/protocols/AimOscar/src/server.cpp index db3679447b..a41ea0d5ce 100644 --- a/protocols/AimOscar/src/server.cpp +++ b/protocols/AimOscar/src/server.cpp @@ -1250,7 +1250,7 @@ void CAimProto::snac_received_message(SNAC &snac, HANDLE hServerConn, unsigned s wchar_t* filenameT = mir_utf8decodeW(filename); PROTORECVFILET pre = { 0 }; - pre.dwFlags = PRFF_TCHAR; + pre.dwFlags = PRFF_UNICODE; pre.fileCount = 1; pre.timestamp = time(NULL); pre.descr.w = mir_utf8decodeW(msg_buf); diff --git a/protocols/AimOscar/src/ui.cpp b/protocols/AimOscar/src/ui.cpp index 71ebfb2e10..0613134dd1 100755 --- a/protocols/AimOscar/src/ui.cpp +++ b/protocols/AimOscar/src/ui.cpp @@ -683,7 +683,7 @@ int CAimProto::OnUserInfoInit(WPARAM wParam, LPARAM lParam) { OPTIONSDIALOGPAGE odp = { 0 }; odp.position = -1900000000; - odp.flags = ODPF_USERINFOTAB | ODPF_TCHAR; + odp.flags = ODPF_USERINFOTAB | ODPF_UNICODE; odp.hInstance = hInstance; odp.pwszTitle = m_tszUserName; odp.dwInitParam = LPARAM(this); @@ -1061,7 +1061,7 @@ int CAimProto::OnOptionsInit(WPARAM wParam, LPARAM) odp.pwszGroup = LPGENW("Network"); odp.pwszTitle = m_tszUserName; odp.dwInitParam = LPARAM(this); - odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR | ODPF_DONTTRANSLATE; + odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE | ODPF_DONTTRANSLATE; odp.pwszTab = LPGENW("Basic"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_AIM); diff --git a/protocols/AimOscar/src/utility.cpp b/protocols/AimOscar/src/utility.cpp index 10a18ba5af..c5a7519817 100755 --- a/protocols/AimOscar/src/utility.cpp +++ b/protocols/AimOscar/src/utility.cpp @@ -533,12 +533,12 @@ int CAimProto::open_contact_file(const char*, const wchar_t* file, const char*, { path = (wchar_t*)mir_alloc(MAX_PATH * sizeof(wchar_t)); - int pos = mir_snwprintf(path, MAX_PATH, L"%s\\%S", VARST(L"%miranda_userdata%"), m_szModuleName); + int pos = mir_snwprintf(path, MAX_PATH, L"%s\\%S", VARSW(L"%miranda_userdata%"), m_szModuleName); if (contact_dir) pos += mir_snwprintf(path + pos, MAX_PATH - pos, L"\\%S", m_szModuleName); if (_waccess(path, 0)) - CreateDirectoryTreeT(path); + CreateDirectoryTreeW(path); mir_snwprintf(path + pos, MAX_PATH - pos, L"\\%s", file); int fid = _wopen(path, _O_CREAT | _O_RDWR | _O_BINARY, _S_IREAD); -- cgit v1.2.3