From 688f55ba998c19304a29727c910504903f4cc49a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 30 Nov 2014 18:51:36 +0000 Subject: lstr* replacements git-svn-id: http://svn.miranda-ng.org/main/trunk@11176 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/StatusPlugins/commonstatus.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/StatusPlugins/commonstatus.cpp') diff --git a/plugins/StatusPlugins/commonstatus.cpp b/plugins/StatusPlugins/commonstatus.cpp index 74218f4ebf..7020509cad 100644 --- a/plugins/StatusPlugins/commonstatus.cpp +++ b/plugins/StatusPlugins/commonstatus.cpp @@ -54,7 +54,7 @@ char *StatusModeToDbSetting(int status,const char *suffix) case ID_STATUS_OUTTOLUNCH: prefix="Otl"; break; default: return NULL; } - lstrcpyA(str,prefix); lstrcatA(str,suffix); + mir_strcpy(str,prefix); mir_strcat(str,suffix); return str; } @@ -183,10 +183,10 @@ static void SetStatusMsg(PROTOCOLSETTINGEX *ps, int newstatus) else continue; - if (lstrlen(substituteStr) > 6) - tszMsg = (TCHAR*)mir_realloc(tszMsg, sizeof(TCHAR)*(lstrlen(tszMsg) + 1 + lstrlen(substituteStr) - 6)); - MoveMemory(tszMsg + j + lstrlen(substituteStr), tszMsg + j + 6, sizeof(TCHAR)*(lstrlen(tszMsg) - j - 5)); - CopyMemory(tszMsg + j, substituteStr, sizeof(TCHAR)*lstrlen(substituteStr)); + if (mir_tstrlen(substituteStr) > 6) + tszMsg = (TCHAR*)mir_realloc(tszMsg, sizeof(TCHAR)*(mir_tstrlen(tszMsg) + 1 + mir_tstrlen(substituteStr) - 6)); + MoveMemory(tszMsg + j + mir_tstrlen(substituteStr), tszMsg + j + 6, sizeof(TCHAR)*(mir_tstrlen(tszMsg) - j - 5)); + CopyMemory(tszMsg + j, substituteStr, sizeof(TCHAR)*mir_tstrlen(substituteStr)); } TCHAR *szFormattedMsg = variables_parsedup(tszMsg, ps->tszAccName, NULL); -- cgit v1.2.3