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 --- src/core/stdchat/src/manager.cpp | 2 +- src/core/stdchat/src/options.cpp | 8 ++++---- src/core/stdchat/src/tools.cpp | 14 ++++++------- src/core/stdchat/src/window.cpp | 44 ++++++++++++++++++++-------------------- 4 files changed, 34 insertions(+), 34 deletions(-) (limited to 'src/core/stdchat') diff --git a/src/core/stdchat/src/manager.cpp b/src/core/stdchat/src/manager.cpp index bc901042e8..069e2230a9 100644 --- a/src/core/stdchat/src/manager.cpp +++ b/src/core/stdchat/src/manager.cpp @@ -86,7 +86,7 @@ BOOL TabM_AddTab(const wchar_t *pszID, const char* pszModule) node = (TABLIST*)mir_alloc(sizeof(TABLIST)); memset(node, 0, sizeof(TABLIST)); - node->pszID = mir_tstrdup(pszID); + node->pszID = mir_wstrdup(pszID); node->pszModule = mir_strdup(pszModule); if (g_TabList == NULL) { // list is empty diff --git a/src/core/stdchat/src/options.cpp b/src/core/stdchat/src/options.cpp index 5ce45f72ce..79ea5fc3d2 100644 --- a/src/core/stdchat/src/options.cpp +++ b/src/core/stdchat/src/options.cpp @@ -324,10 +324,10 @@ static void InitSetting(wchar_t** ppPointer, char* pszSetting, wchar_t* pszDefau { DBVARIANT dbv; if (!db_get_ts(NULL, CHAT_MODULE, pszSetting, &dbv)) { - replaceStrT(*ppPointer, dbv.ptszVal); + replaceStrW(*ppPointer, dbv.ptszVal); db_free(&dbv); } - else replaceStrT(*ppPointer, pszDefault); + else replaceStrW(*ppPointer, pszDefault); } ///////////////////////////////////////////////////////////////////////////////////////// @@ -542,9 +542,9 @@ static INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPITEMIDLIST idList = SHBrowseForFolder(&bi); if (idList) { SHGetPathFromIDList(idList, szDirectory); - mir_tstrcat(szDirectory, L"\\"); + mir_wstrcat(szDirectory, L"\\"); PathToRelativeT(szDirectory, szTemp); - SetDlgItemText(hwndDlg, IDC_LOGDIRECTORY, mir_tstrlen(szTemp) > 1 ? szTemp : L"Logs\\"); + SetDlgItemText(hwndDlg, IDC_LOGDIRECTORY, mir_wstrlen(szTemp) > 1 ? szTemp : L"Logs\\"); CoTaskMemFree(idList); } } diff --git a/src/core/stdchat/src/tools.cpp b/src/core/stdchat/src/tools.cpp index 12731649f2..3568f75caf 100644 --- a/src/core/stdchat/src/tools.cpp +++ b/src/core/stdchat/src/tools.cpp @@ -51,9 +51,9 @@ bool LoadMessageFont(LOGFONT *lf, COLORREF *colour) DBVARIANT dbv; if (db_get_ts(NULL, "SRMM", str, &dbv)) - mir_tstrcpy(lf->lfFaceName, L"Arial"); + mir_wstrcpy(lf->lfFaceName, L"Arial"); else { - mir_tstrncpy(lf->lfFaceName, dbv.ptszVal, _countof(lf->lfFaceName)); + mir_wstrncpy(lf->lfFaceName, dbv.ptszVal, _countof(lf->lfFaceName)); db_free(&dbv); } mir_snprintf(str, "SRMFont%dSet", i); @@ -135,7 +135,7 @@ UINT CreateGCMenu(HWND hwndDlg, HMENU *hMenu, int iIndex, POINT pt, SESSION_INFO if (pszWordText && pszWordText[0]) { wchar_t szMenuText[4096]; - mir_sntprintf(szMenuText, TranslateT("Look up '%s':"), pszWordText); + mir_snwprintf(szMenuText, TranslateT("Look up '%s':"), pszWordText); ModifyMenu(*hMenu, 4, MF_STRING | MF_BYPOSITION, 4, szMenuText); } else ModifyMenu(*hMenu, 4, MF_STRING | MF_GRAYED | MF_BYPOSITION, 4, TranslateT("No word to look up")); @@ -144,12 +144,12 @@ UINT CreateGCMenu(HWND hwndDlg, HMENU *hMenu, int iIndex, POINT pt, SESSION_INFO else if (iIndex == 0) { wchar_t szTemp[50]; if (pszWordText) - mir_sntprintf(szTemp, TranslateT("&Message %s"), pszWordText); + mir_snwprintf(szTemp, TranslateT("&Message %s"), pszWordText); else - mir_tstrncpy(szTemp, TranslateT("&Message"), _countof(szTemp) - 1); + mir_wstrncpy(szTemp, TranslateT("&Message"), _countof(szTemp) - 1); - if (mir_tstrlen(szTemp) > 40) - mir_tstrcpy(szTemp + 40, L"..."); + if (mir_wstrlen(szTemp) > 40) + mir_wstrcpy(szTemp + 40, L"..."); ModifyMenu(*hMenu, ID_MESS, MF_STRING | MF_BYCOMMAND, ID_MESS, szTemp); gcmi.Type = MENU_ON_NICKLIST; } diff --git a/src/core/stdchat/src/window.cpp b/src/core/stdchat/src/window.cpp index bf71ea9f90..b6b54681b8 100644 --- a/src/core/stdchat/src/window.cpp +++ b/src/core/stdchat/src/window.cpp @@ -390,10 +390,10 @@ static LRESULT CALLBACK MessageSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, end++; if (dat->szTabSave[0] == '\0') - mir_tstrncpy(dat->szTabSave, pszText + start, end - start + 1); + mir_wstrncpy(dat->szTabSave, pszText + start, end - start + 1); wchar_t *pszSelName = (wchar_t *)mir_alloc(sizeof(wchar_t)*(end - start + 1)); - mir_tstrncpy(pszSelName, pszText + start, end - start + 1); + mir_wstrncpy(pszSelName, pszText + start, end - start + 1); wchar_t *pszName = pci->UM_FindUserAutoComplete(Parentsi->pUsers, dat->szTabSave, pszSelName); if (pszName == NULL) { @@ -996,7 +996,7 @@ static void ProcessNickListHovering(HWND hwnd, int hoveredItem, SESSION_INFO *si } if (tszBuf[0] == 0) - mir_sntprintf(tszBuf, L"%s: %s\r\n%s: %s\r\n%s: %s", + mir_snwprintf(tszBuf, L"%s: %s\r\n%s: %s\r\n%s: %s", TranslateT("Nickname"), ui->pszNick, TranslateT("Unique ID"), ui->pszUID, TranslateT("Status"), pci->TM_WordToString(si->pStatuses, ui->Status)); @@ -1314,17 +1314,17 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar wchar_t szTemp[100]; switch (si->iType) { case GCW_CHATROOM: - mir_sntprintf(szTemp, + mir_snwprintf(szTemp, (si->nUsersInNicklist == 1) ? TranslateT("%s: chat room (%u user)") : TranslateT("%s: chat room (%u users)"), si->ptszName, si->nUsersInNicklist); break; case GCW_PRIVMESS: - mir_sntprintf(szTemp, + mir_snwprintf(szTemp, (si->nUsersInNicklist == 1) ? TranslateT("%s: message session") : TranslateT("%s: message session (%u users)"), si->ptszName, si->nUsersInNicklist); break; case GCW_SERVER: - mir_sntprintf(szTemp, L"%s: Server", si->ptszName); + mir_snwprintf(szTemp, L"%s: Server", si->ptszName); break; } SetWindowText(hwndDlg, szTemp); @@ -1605,9 +1605,9 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar int insertat; wchar_t szTemp[30]; - mir_tstrncpy(szTemp, s1->ptszName, 21); - if (mir_tstrlen(s1->ptszName) > 20) - mir_tstrncpy(szTemp + 20, L"...", 4); + mir_wstrncpy(szTemp, s1->ptszName, 21); + if (mir_wstrlen(s1->ptszName) > 20) + mir_wstrncpy(szTemp + 20, L"...", 4); tci.mask = TCIF_TEXT | TCIF_PARAM; tci.pszText = szTemp; @@ -1863,11 +1863,11 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar } SetTextColor(dis->hDC, ui->iStatusEx == 0 ? g_Settings.crUserListColor : g_Settings.crUserListHeadingsColor); - TextOut(dis->hDC, dis->rcItem.left + x_offset, dis->rcItem.top, ui->pszNick, (int)mir_tstrlen(ui->pszNick)); + TextOut(dis->hDC, dis->rcItem.left + x_offset, dis->rcItem.top, ui->pszNick, (int)mir_wstrlen(ui->pszNick)); SelectObject(dis->hDC, hOldFont); if (si->pAccPropServicesForNickList) { - wchar_t *nick = mir_t2u(ui->pszNick); + wchar_t *nick = mir_wstrdup(ui->pszNick); si->pAccPropServicesForNickList->SetHwndPropStr(GetDlgItem(hwndDlg, IDC_LIST), OBJID_CLIENT, dis->itemID + 1, PROPID_ACC_NAME, nick); mir_free(nick); } @@ -2199,7 +2199,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar tr.lpstrText = pszWord; long iRes = SendDlgItemMessage(hwndDlg, IDC_LOG, EM_GETTEXTRANGE, 0, (LPARAM)&tr); if (iRes > 0) - for (size_t iLen = mir_tstrlen(pszWord) - 1; wcschr(szTrimString, pszWord[iLen]); iLen--) + for (size_t iLen = mir_wstrlen(pszWord) - 1; wcschr(szTrimString, pszWord[iLen]); iLen--) pszWord[iLen] = 0; } @@ -2298,8 +2298,8 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar if (!OpenClipboard(hwndDlg)) break; EmptyClipboard(); - hData = GlobalAlloc(GMEM_MOVEABLE, sizeof(wchar_t)*(mir_tstrlen(tr.lpstrText) + 1)); - mir_tstrcpy((wchar_t*)GlobalLock(hData), tr.lpstrText); + hData = GlobalAlloc(GMEM_MOVEABLE, sizeof(wchar_t)*(mir_wstrlen(tr.lpstrText) + 1)); + mir_wstrcpy((wchar_t*)GlobalLock(hData), tr.lpstrText); GlobalUnlock(hData); SetClipboardData(CF_UNICODETEXT, hData); CloseClipboard(); @@ -2331,7 +2331,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar USERINFO *ui = pci->SM_GetUserFromIndex(parentdat->ptszID, parentdat->pszModule, item); if (ui != NULL) { static wchar_t ptszBuf[1024]; - mir_sntprintf(ptszBuf, L"%s: %s\r\n%s: %s\r\n%s: %s", + mir_snwprintf(ptszBuf, L"%s: %s\r\n%s: %s\r\n%s: %s", TranslateT("Nickname"), ui->pszNick, TranslateT("Unique ID"), ui->pszUID, TranslateT("Status"), pci->TM_WordToString(parentdat->pStatuses, ui->Status)); @@ -2356,12 +2356,12 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar if (GetKeyState(VK_SHIFT) & 0x8000) { LRESULT lResult = (LRESULT)SendDlgItemMessage(hwndDlg, IDC_MESSAGE, EM_GETSEL, 0, 0); int start = LOWORD(lResult); - size_t dwNameLenMax = (mir_tstrlen(ui->pszUID) + 3); + size_t dwNameLenMax = (mir_wstrlen(ui->pszUID) + 3); wchar_t* pszName = (wchar_t*)alloca(sizeof(wchar_t) * dwNameLenMax); if (start == 0) - mir_sntprintf(pszName, dwNameLenMax, L"%s: ", ui->pszUID); + mir_snwprintf(pszName, dwNameLenMax, L"%s: ", ui->pszUID); else - mir_sntprintf(pszName, dwNameLenMax, L"%s ", ui->pszUID); + mir_snwprintf(pszName, dwNameLenMax, L"%s ", ui->pszUID); SendDlgItemMessage(hwndDlg, IDC_MESSAGE, EM_REPLACESEL, FALSE, (LPARAM)pszName); PostMessage(hwndDlg, WM_MOUSEACTIVATE, 0, 0); @@ -2388,7 +2388,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar pci->SM_AddCommand(si->ptszID, si->pszModule, pszRtf); - CMString ptszText(ptrT(mir_utf8decodeT(pszRtf))); + CMString ptszText(ptrW(mir_utf8decodeW(pszRtf))); pci->DoRtfToTags(ptszText, mi->nColorCount, mi->crColors); ptszText.Trim(); ptszText.Replace(L"%", L"%%"); @@ -2450,11 +2450,11 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar wcsncpy_s(szName, (pInfo->ptszModDispName ? pInfo->ptszModDispName : _A2T(si->pszModule)), _TRUNCATE); ValidateFilename(szName); - mir_sntprintf(szFolder, L"%s\\%s", g_Settings.pszLogDir, szName); - mir_sntprintf(szName, L"%s.log", si->ptszID); + mir_snwprintf(szFolder, L"%s\\%s", g_Settings.pszLogDir, szName); + mir_snwprintf(szName, L"%s.log", si->ptszID); ValidateFilename(szName); - mir_sntprintf(szFile, L"%s\\%s", szFolder, szName); + mir_snwprintf(szFile, L"%s\\%s", szFolder, szName); ShellExecute(hwndDlg, L"open", szFile, NULL, NULL, SW_SHOW); } } -- cgit v1.2.3