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/MyDetails/src/data.cpp | 26 ++++++++-------- plugins/MyDetails/src/frame.cpp | 64 +++++++++++++++++++------------------- plugins/MyDetails/src/services.cpp | 22 ++++++------- 3 files changed, 56 insertions(+), 56 deletions(-) (limited to 'plugins/MyDetails/src') diff --git a/plugins/MyDetails/src/data.cpp b/plugins/MyDetails/src/data.cpp index c9b2a1b0ea..681c2d4f61 100644 --- a/plugins/MyDetails/src/data.cpp +++ b/plugins/MyDetails/src/data.cpp @@ -55,7 +55,7 @@ void DeInitProtocolData() Protocol::Protocol(const char *aName, const wchar_t *descr) { mir_strncpy(name, aName, _countof(name)); - mir_tstrncpy(description, descr, _countof(description)); + mir_wstrncpy(description, descr, _countof(description)); data_changed = true; @@ -86,9 +86,9 @@ Protocol::~Protocol() void Protocol::lcopystr(wchar_t *dest, wchar_t *src, size_t maxlen) { - if (mir_tstrcmp(dest, src) != 0) { + if (mir_wstrcmp(dest, src) != 0) { data_changed = true; - mir_tstrncpy(dest, src, (DWORD)maxlen); + mir_wstrncpy(dest, src, (DWORD)maxlen); } } @@ -134,7 +134,7 @@ int Protocol::GetStatus() else { wchar_t *p = (tszXStatusName[0] != 0) ? TranslateTS(tszXStatusName) : TranslateT(""); if (tszXStatusMessage[0]) - mir_sntprintf(status_name, L"%s: %s", p, tszXStatusMessage); + mir_snwprintf(status_name, L"%s: %s", p, tszXStatusMessage); else lcopystr(status_name, p, _countof(status_name)); } @@ -214,11 +214,11 @@ void Protocol::GetStatusMsg(int aStatus, wchar_t *msg, size_t msg_size) if (!CanGetStatusMsg()) lcopystr(msg, L"", msg_size); else if (aStatus == status && ProtoServiceExists(name, PS_GETMYAWAYMSG)) { - ptrT tmp((wchar_t *)CallProtoService(name, PS_GETMYAWAYMSG, 0, SGMA_TCHAR)); + ptrW tmp((wchar_t *)CallProtoService(name, PS_GETMYAWAYMSG, 0, SGMA_TCHAR)); lcopystr(msg, tmp == NULL ? L"" : tmp, msg_size); } else if (ServiceExists(MS_AWAYMSG_GETSTATUSMSGT)) { - ptrT tmp((wchar_t *)CallService(MS_AWAYMSG_GETSTATUSMSGT, (WPARAM)aStatus, (LPARAM)name)); + ptrW tmp((wchar_t *)CallService(MS_AWAYMSG_GETSTATUSMSGT, (WPARAM)aStatus, (LPARAM)name)); lcopystr(msg, tmp == NULL ? L"" : tmp, msg_size); } } @@ -286,7 +286,7 @@ int Protocol::GetNickMaxLength() wchar_t* Protocol::GetNick() { - ptrT nick(Contact_GetInfo(CNF_DISPLAY, NULL, name)); + ptrW nick(Contact_GetInfo(CNF_DISPLAY, NULL, name)); lcopystr(nickname, (nick != NULL) ? nick : L"", _countof(nickname)); return nickname; } @@ -458,7 +458,7 @@ void ProtocolArray::SetNicks(const wchar_t *nick) if (nick == NULL || nick[0] == '\0') return; - mir_tstrncpy(default_nick, nick, _countof(default_nick)); + mir_wstrncpy(default_nick, nick, _countof(default_nick)); db_set_ts(0, MODULE_NAME, SETTING_DEFAULT_NICK, nick); @@ -493,18 +493,18 @@ void ProtocolArray::SetStatusMsgs(int status, const wchar_t *message) void ProtocolArray::GetDefaultNick() { - ptrT tszNick(db_get_tsa(0, MODULE_NAME, SETTING_DEFAULT_NICK)); + ptrW tszNick(db_get_tsa(0, MODULE_NAME, SETTING_DEFAULT_NICK)); if (tszNick) - mir_tstrncpy(default_nick, tszNick, _countof(default_nick)); + mir_wstrncpy(default_nick, tszNick, _countof(default_nick)); else default_nick[0] = '\0'; } void ProtocolArray::GetDefaultAvatar() { - ptrT tszFile(db_get_tsa(0, "ContactPhoto", "File")); + ptrW tszFile(db_get_tsa(0, "ContactPhoto", "File")); if (tszFile) - mir_tstrncpy(default_avatar_file, tszFile, _countof(default_avatar_file)); + mir_wstrncpy(default_avatar_file, tszFile, _countof(default_avatar_file)); else default_avatar_file[0] = '\0'; } @@ -523,7 +523,7 @@ wchar_t *ProtocolArray::GetDefaultStatusMsg(int status) wchar_t *tmp = (wchar_t *)CallService(MS_AWAYMSG_GETSTATUSMSGT, (WPARAM)status, 0); if (tmp != NULL) { - mir_tstrncpy(default_status_message, tmp, _countof(default_status_message)); + mir_wstrncpy(default_status_message, tmp, _countof(default_status_message)); mir_free(tmp); } diff --git a/plugins/MyDetails/src/frame.cpp b/plugins/MyDetails/src/frame.cpp index 2778f655b9..b392bbc185 100644 --- a/plugins/MyDetails/src/frame.cpp +++ b/plugins/MyDetails/src/frame.cpp @@ -234,11 +234,11 @@ int CreateFrame() memset(&font_id[i], 0, sizeof(font_id[i])); font_id[i].cbSize = sizeof(FontIDT); - mir_tstrncpy(font_id[i].group, LPGENW("My details"), _countof(font_id[i].group)); - mir_tstrncpy(font_id[i].name, font_names[i], _countof(font_id[i].name)); + mir_wstrncpy(font_id[i].group, LPGENW("My details"), _countof(font_id[i].group)); + mir_wstrncpy(font_id[i].name, font_names[i], _countof(font_id[i].name)); mir_strncpy(font_id[i].dbSettingsGroup, MODULE_NAME, _countof(font_id[i].dbSettingsGroup)); - mir_tstrncpy(font_id[i].backgroundName, LPGENW("Background"), _countof(font_id[i].backgroundName)); - mir_tstrncpy(font_id[i].backgroundGroup, LPGENW("My details"), _countof(font_id[i].backgroundGroup)); + mir_wstrncpy(font_id[i].backgroundName, LPGENW("Background"), _countof(font_id[i].backgroundName)); + mir_wstrncpy(font_id[i].backgroundGroup, LPGENW("My details"), _countof(font_id[i].backgroundGroup)); mir_strncpy(font_id[i].prefix, font_settings[i], _countof(font_id[i].prefix)); @@ -246,7 +246,7 @@ int CreateFrame() font_id[i].deffontsettings.size = -MulDiv(font_sizes[i], GetDeviceCaps(hdc, LOGPIXELSY), 72); font_id[i].deffontsettings.style = font_styles[i]; font_id[i].deffontsettings.charset = DEFAULT_CHARSET; - mir_tstrncpy(font_id[i].deffontsettings.szFace, L"Tahoma", _countof(font_id[i].deffontsettings.szFace)); + mir_wstrncpy(font_id[i].deffontsettings.szFace, L"Tahoma", _countof(font_id[i].deffontsettings.szFace)); font_id[i].order = i; font_id[i].flags = FIDF_DEFAULTVALID; FontRegisterT(&font_id[i]); @@ -493,7 +493,7 @@ RECT GetRect(HDC hdc, RECT rc, const wchar_t *text, const wchar_t *def_text, Pro RECT r_tmp = rc; // Only first line - wchar_t *tmp2 = mir_tstrdup(tmp); + wchar_t *tmp2 = mir_wstrdup(tmp); wchar_t *pos = wcschr(tmp2, '\r'); if (pos != NULL) pos[0] = '\0'; @@ -502,7 +502,7 @@ RECT GetRect(HDC hdc, RECT rc, const wchar_t *text, const wchar_t *def_text, Pro pos[0] = '\0'; if (smileys) - DRAW_TEXT(hdc, tmp2, (int)mir_tstrlen(tmp2), &r_tmp, uFormat | DT_CALCRECT, proto->name); + DRAW_TEXT(hdc, tmp2, (int)mir_wstrlen(tmp2), &r_tmp, uFormat | DT_CALCRECT, proto->name); else DrawText(hdc, tmp2, -1, &r_tmp, uFormat | DT_CALCRECT); @@ -1030,7 +1030,7 @@ void DrawTextWithRect(HDC hdc, const wchar_t *text, const wchar_t *def_text, REC tmp = text; // Only first line - wchar_t *tmp2 = mir_tstrdup(tmp); + wchar_t *tmp2 = mir_wstrdup(tmp); wchar_t *pos = wcsrchr(tmp2, '\r'); if (pos != NULL) pos[0] = '\0'; @@ -1073,7 +1073,7 @@ void DrawTextWithRect(HDC hdc, const wchar_t *text, const wchar_t *def_text, REC } } - DRAW_TEXT(hdc, tmp2, (int)mir_tstrlen(tmp2), &r, uFormat, proto->name); + DRAW_TEXT(hdc, tmp2, (int)mir_wstrlen(tmp2), &r, uFormat, proto->name); if (mouse_over) DrawText(hdc, L" ...", 4, &rc_tmp, uFormat); @@ -1267,7 +1267,7 @@ void Draw(HWND hwnd, HDC hdc_orig) SelectObject(hdc, hFont[FONT_STATUS]); SetTextColor(hdc, font_colour[FONT_STATUS]); - DRAW_TEXT(hdc, proto->status_name, (int)mir_tstrlen(proto->status_name), &rc, uFormat, proto->name); + DRAW_TEXT(hdc, proto->status_name, (int)mir_wstrlen(proto->status_name), &rc, uFormat, proto->name); SelectClipRgn(hdc, NULL); DeleteObject(rgn); @@ -1421,7 +1421,7 @@ void ShowProtocolStatusMenu(HWND hwnd, MyDetailsFrameData *data, Protocol *proto mii.dwTypeData = (wchar_t *)malloc(sizeof(wchar_t) * mii.cch); GetMenuItemInfo(menu, i, TRUE, &mii); - if (mir_tstrcmp(mii.dwTypeData, proto->description) == 0) + if (mir_wstrcmp(mii.dwTypeData, proto->description) == 0) submenu = GetSubMenu(menu, i); free(mii.dwTypeData); @@ -1478,7 +1478,7 @@ void ShowListeningToMenu(HWND hwnd, MyDetailsFrameData *data, Protocol *proto, P // Add this proto to menu wchar_t tmp[128]; - mir_sntprintf(tmp, TranslateT("Enable listening to for %s"), proto->description); + mir_snwprintf(tmp, TranslateT("Enable listening to for %s"), proto->description); MENUITEMINFO mii = { 0 }; mii.cbSize = sizeof(mii); @@ -1486,7 +1486,7 @@ void ShowListeningToMenu(HWND hwnd, MyDetailsFrameData *data, Protocol *proto, P mii.fType = MFT_STRING; mii.fState = proto->ListeningToEnabled() ? MFS_CHECKED : 0; mii.dwTypeData = tmp; - mii.cch = (int)mir_tstrlen(tmp); + mii.cch = (int)mir_wstrlen(tmp); mii.wID = 1; if (!proto->CanSetListeningTo()) @@ -1665,7 +1665,7 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar mii.fMask = MIIM_ID | MIIM_TYPE; mii.fType = MFT_STRING; mii.dwTypeData = protocols->Get(i)->description; - mii.cch = (int)mir_tstrlen(protocols->Get(i)->description); + mii.cch = (int)mir_wstrlen(protocols->Get(i)->description); mii.wID = i + 1; if (i == data->protocol_number) { @@ -1716,14 +1716,14 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar // Add this proto to menu wchar_t tmp[128]; - mir_sntprintf(tmp, TranslateT("Set my avatar for %s..."), proto->description); + mir_snwprintf(tmp, TranslateT("Set my avatar for %s..."), proto->description); MENUITEMINFO mii = { 0 }; mii.cbSize = sizeof(mii); mii.fMask = MIIM_ID | MIIM_TYPE; mii.fType = MFT_STRING; mii.dwTypeData = tmp; - mii.cch = (int)mir_tstrlen(tmp); + mii.cch = (int)mir_wstrlen(tmp); mii.wID = 1; if (!proto->CanSetAvatar()) { @@ -1756,14 +1756,14 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar // Add this proto to menu wchar_t tmp[128]; - mir_sntprintf(tmp, TranslateT("Set my nickname for %s..."), proto->description); + mir_snwprintf(tmp, TranslateT("Set my nickname for %s..."), proto->description); MENUITEMINFO mii = { 0 }; mii.cbSize = sizeof(mii); mii.fMask = MIIM_ID | MIIM_TYPE; mii.fType = MFT_STRING; mii.dwTypeData = tmp; - mii.cch = (int)mir_tstrlen(tmp); + mii.cch = (int)mir_wstrlen(tmp); mii.wID = 1; if (!proto->CanSetNick()) { @@ -1804,14 +1804,14 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar if (protocols->CanSetStatusMsgPerProtocol()) { // Add this proto to menu - mir_sntprintf(tmp, TranslateT("Set my status message for %s..."), proto->description); + mir_snwprintf(tmp, TranslateT("Set my status message for %s..."), proto->description); MENUITEMINFO mii = { 0 }; mii.cbSize = sizeof(mii); mii.fMask = MIIM_ID | MIIM_TYPE; mii.fType = MFT_STRING; mii.dwTypeData = tmp; - mii.cch = (int)mir_tstrlen(tmp); + mii.cch = (int)mir_wstrlen(tmp); mii.wID = 1; if (!proto->CanSetStatusMsg()) { @@ -1823,14 +1823,14 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar } // Add this to menu - mir_sntprintf(tmp, TranslateT("Set my status message for %s..."), pcli->pfnGetStatusModeDescription(proto->status, 0)); + mir_snwprintf(tmp, TranslateT("Set my status message for %s..."), pcli->pfnGetStatusModeDescription(proto->status, 0)); MENUITEMINFO mii = { 0 }; mii.cbSize = sizeof(mii); mii.fMask = MIIM_ID | MIIM_TYPE; mii.fType = MFT_STRING; mii.dwTypeData = tmp; - mii.cch = (int)mir_tstrlen(tmp); + mii.cch = (int)mir_wstrlen(tmp); mii.wID = 2; if (proto->status == ID_STATUS_OFFLINE) { @@ -1886,7 +1886,7 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar // Add this proto to menu wchar_t tmp[128]; - mir_sntprintf(tmp, TranslateT("Enable listening to for %s"), proto->description); + mir_snwprintf(tmp, TranslateT("Enable listening to for %s"), proto->description); MENUITEMINFO mii = { 0 }; mii.cbSize = sizeof(mii); @@ -1894,7 +1894,7 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar mii.fType = MFT_STRING; mii.fState = proto->ListeningToEnabled() ? MFS_CHECKED : 0; mii.dwTypeData = tmp; - mii.cch = (int)mir_tstrlen(tmp); + mii.cch = (int)mir_wstrlen(tmp); mii.wID = 5; if (!proto->CanSetListeningTo()) mii.fState |= MFS_DISABLED; @@ -1902,14 +1902,14 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar InsertMenuItem(submenu, 0, TRUE, &mii); // Add this to menu - mir_sntprintf(tmp, TranslateT("Set my status message for %s..."), pcli->pfnGetStatusModeDescription(proto->status, 0)); + mir_snwprintf(tmp, TranslateT("Set my status message for %s..."), pcli->pfnGetStatusModeDescription(proto->status, 0)); memset(&mii, 0, sizeof(mii)); mii.cbSize = sizeof(mii); mii.fMask = MIIM_ID | MIIM_TYPE; mii.fType = MFT_STRING; mii.dwTypeData = tmp; - mii.cch = (int)mir_tstrlen(tmp); + mii.cch = (int)mir_wstrlen(tmp); mii.wID = 4; if (proto->status == ID_STATUS_OFFLINE) { @@ -1921,14 +1921,14 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar if (protocols->CanSetStatusMsgPerProtocol()) { // Add this proto to menu - mir_sntprintf(tmp, TranslateT("Set my status message for %s..."), proto->description); + mir_snwprintf(tmp, TranslateT("Set my status message for %s..."), proto->description); memset(&mii, 0, sizeof(mii)); mii.cbSize = sizeof(mii); mii.fMask = MIIM_ID | MIIM_TYPE; mii.fType = MFT_STRING; mii.dwTypeData = tmp; - mii.cch = (int)mir_tstrlen(tmp); + mii.cch = (int)mir_wstrlen(tmp); mii.wID = 3; if (!proto->CanSetStatusMsg()) { @@ -1939,14 +1939,14 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar InsertMenuItem(submenu, 0, TRUE, &mii); } - mir_sntprintf(tmp, TranslateT("Set my nickname for %s..."), proto->description); + mir_snwprintf(tmp, TranslateT("Set my nickname for %s..."), proto->description); memset(&mii, 0, sizeof(mii)); mii.cbSize = sizeof(mii); mii.fMask = MIIM_ID | MIIM_TYPE; mii.fType = MFT_STRING; mii.dwTypeData = tmp; - mii.cch = (int)mir_tstrlen(tmp); + mii.cch = (int)mir_wstrlen(tmp); mii.wID = 2; if (!proto->CanSetNick()) { @@ -1956,14 +1956,14 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar InsertMenuItem(submenu, 0, TRUE, &mii); - mir_sntprintf(tmp, TranslateT("Set my avatar for %s..."), proto->description); + mir_snwprintf(tmp, TranslateT("Set my avatar for %s..."), proto->description); memset(&mii, 0, sizeof(mii)); mii.cbSize = sizeof(mii); mii.fMask = MIIM_ID | MIIM_TYPE; mii.fType = MFT_STRING; mii.dwTypeData = tmp; - mii.cch = (int)mir_tstrlen(tmp); + mii.cch = (int)mir_wstrlen(tmp); mii.wID = 1; if (!proto->CanSetAvatar()) { diff --git a/plugins/MyDetails/src/services.cpp b/plugins/MyDetails/src/services.cpp index 30be916a0f..aa474bb453 100644 --- a/plugins/MyDetails/src/services.cpp +++ b/plugins/MyDetails/src/services.cpp @@ -52,15 +52,15 @@ static INT_PTR CALLBACK DlgProcSetNickname(HWND hwndDlg, UINT msg, WPARAM wParam bool foundDefNick = true; for (int i = 1; foundDefNick && i < protocols->GetSize(); i++) { - if (mir_tstrcmpi(protocols->Get(i)->nickname, nick) != 0) { + if (mir_wstrcmpi(protocols->Get(i)->nickname, nick) != 0) { foundDefNick = false; break; } } if (foundDefNick) - if (mir_tstrcmpi(protocols->default_nick, nick) != 0) - mir_tstrcpy(protocols->default_nick, nick); + if (mir_wstrcmpi(protocols->default_nick, nick) != 0) + mir_wstrcpy(protocols->default_nick, nick); } SetDlgItemText(hwndDlg, IDC_NICKNAME, protocols->default_nick); @@ -70,7 +70,7 @@ static INT_PTR CALLBACK DlgProcSetNickname(HWND hwndDlg, UINT msg, WPARAM wParam Protocol *proto = protocols->Get(proto_num); wchar_t tmp[128]; - mir_sntprintf(tmp, TranslateT("Set my nickname for %s"), proto->description); + mir_snwprintf(tmp, TranslateT("Set my nickname for %s"), proto->description); SetWindowText(hwndDlg, tmp); @@ -188,13 +188,13 @@ INT_PTR PluginCommand_GetMyNickname(WPARAM wParam, LPARAM lParam) char *proto = (char *)wParam; if (proto == NULL) { - mir_tstrncpy(ret, protocols->default_nick, MS_MYDETAILS_GETMYNICKNAME_BUFFER_SIZE); + mir_wstrncpy(ret, protocols->default_nick, MS_MYDETAILS_GETMYNICKNAME_BUFFER_SIZE); return 0; } else { Protocol *protocol = protocols->Get(proto); if (protocol != NULL) { - mir_tstrncpy(ret, protocol->nickname, MS_MYDETAILS_GETMYNICKNAME_BUFFER_SIZE); + mir_wstrncpy(ret, protocol->nickname, MS_MYDETAILS_GETMYNICKNAME_BUFFER_SIZE); return 0; } @@ -263,7 +263,7 @@ INT_PTR PluginCommand_GetMyAvatar(WPARAM wParam, LPARAM lParam) return -1; if (proto == NULL) { - mir_tstrncpy(ret, protocols->default_avatar_file, MS_MYDETAILS_GETMYAVATAR_BUFFER_SIZE); + mir_wstrncpy(ret, protocols->default_avatar_file, MS_MYDETAILS_GETMYAVATAR_BUFFER_SIZE); return 0; } @@ -274,8 +274,8 @@ INT_PTR PluginCommand_GetMyAvatar(WPARAM wParam, LPARAM lParam) protocols->Get(i)->GetAvatar(); - if (mir_tstrlen(protocols->Get(i)->avatar_file)) - mir_tstrncpy(ret, protocols->Get(i)->avatar_file, MS_MYDETAILS_GETMYAVATAR_BUFFER_SIZE); + if (mir_wstrlen(protocols->Get(i)->avatar_file)) + mir_wstrncpy(ret, protocols->Get(i)->avatar_file, MS_MYDETAILS_GETMYAVATAR_BUFFER_SIZE); else ret[0] = '\0'; @@ -333,7 +333,7 @@ static INT_PTR CALLBACK DlgProcSetStatusMessage(HWND hwndDlg, UINT msg, WPARAM w } wchar_t title[256]; - mir_sntprintf(title, TranslateT("Set my status message for %s"), proto->description); + mir_snwprintf(title, TranslateT("Set my status message for %s"), proto->description); SetWindowText(hwndDlg, title); SetDlgItemText(hwndDlg, IDC_STATUSMESSAGE, proto->GetStatusMsg()); @@ -342,7 +342,7 @@ static INT_PTR CALLBACK DlgProcSetStatusMessage(HWND hwndDlg, UINT msg, WPARAM w Window_SetProtoIcon_IcoLib(hwndDlg, NULL, data->status); wchar_t title[256]; - mir_sntprintf(title, TranslateT("Set my status message for %s"), pcli->pfnGetStatusModeDescription(data->status, 0)); + mir_snwprintf(title, TranslateT("Set my status message for %s"), pcli->pfnGetStatusModeDescription(data->status, 0)); SetWindowText(hwndDlg, title); SetDlgItemText(hwndDlg, IDC_STATUSMESSAGE, protocols->GetDefaultStatusMsg(data->status)); -- cgit v1.2.3