From 52592007b35811a902ead1d9999a558880178e10 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 16 Nov 2017 21:58:06 +0300 Subject: fixes #1034 (StopSpam: wrong codepage) --- plugins/StopSpamPlus/src/utils.cpp | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'plugins/StopSpamPlus/src/utils.cpp') diff --git a/plugins/StopSpamPlus/src/utils.cpp b/plugins/StopSpamPlus/src/utils.cpp index 562ac2a570..b542d91469 100644 --- a/plugins/StopSpamPlus/src/utils.cpp +++ b/plugins/StopSpamPlus/src/utils.cpp @@ -31,21 +31,15 @@ bool IsExistMyMessage(MCONTACT hContact) return false; } -void SetDlgItemString(HWND hwndDlg, UINT idItem, std::string const &str) -{ - SetDlgItemTextA(hwndDlg, idItem, str.c_str()); -} - void SetDlgItemString(HWND hwndDlg, UINT idItem, std::wstring const &str) { SetDlgItemTextW(hwndDlg, idItem, str.c_str()); } -tstring variables_parse(tstring const &tstrFormat, MCONTACT hContact){ +tstring variables_parse(tstring const &tstrFormat, MCONTACT hContact) +{ if (ServiceExists(MS_VARS_FORMATSTRING)) { FORMATINFO fi; - tstring tstrResult; - memset(&fi, 0, sizeof(fi)); fi.cbSize = sizeof(fi); fi.tszFormat = wcsdup(tstrFormat.c_str()); @@ -54,7 +48,7 @@ tstring variables_parse(tstring const &tstrFormat, MCONTACT hContact){ wchar_t *tszParsed = (wchar_t *)CallService(MS_VARS_FORMATSTRING, (WPARAM)&fi, 0); free(fi.tszFormat); if (tszParsed) { - tstrResult = tszParsed; + tstring tstrResult = tszParsed; mir_free(tszParsed); return tstrResult; } @@ -69,6 +63,6 @@ tstring trim(const tstring &tstr, const tstring& trimChars) if ((tstring::npos == s) || (tstring::npos == e)) return L""; - else - return tstr.substr(s, e - s + 1); -} \ No newline at end of file + + return tstr.substr(s, e - s + 1); +} -- cgit v1.2.3