From 4b99b5b4abad1cf12ac5c7bbb8788899ba6a48ab Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 9 Jul 2018 13:03:28 +0300 Subject: massive Variables-related code cleaning (removed TCHAR, manually created unions replaced with MAllString etc) --- plugins/StopSpamPlus/src/utils.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'plugins/StopSpamPlus') diff --git a/plugins/StopSpamPlus/src/utils.cpp b/plugins/StopSpamPlus/src/utils.cpp index a71e829d24..6fb2233318 100644 --- a/plugins/StopSpamPlus/src/utils.cpp +++ b/plugins/StopSpamPlus/src/utils.cpp @@ -34,14 +34,13 @@ bool IsExistMyMessage(MCONTACT hContact) tstring variables_parse(const wchar_t *tstrFormat, MCONTACT hContact) { if (ServiceExists(MS_VARS_FORMATSTRING)) { - FORMATINFO fi; - memset(&fi, 0, sizeof(fi)); + FORMATINFO fi = {}; fi.cbSize = sizeof(fi); - fi.tszFormat = wcsdup(tstrFormat); + fi.szFormat.w = wcsdup(tstrFormat); fi.hContact = hContact; - fi.flags |= FIF_TCHAR; - wchar_t *tszParsed = (wchar_t *)CallService(MS_VARS_FORMATSTRING, (WPARAM)&fi, 0); - free(fi.tszFormat); + fi.flags = FIF_UNICODE; + wchar_t *tszParsed = (wchar_t*)CallService(MS_VARS_FORMATSTRING, (WPARAM)&fi, 0); + free(fi.szFormat.w); if (tszParsed) { tstring tstrResult = tszParsed; mir_free(tszParsed); -- cgit v1.2.3