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/ModernOpt/src/mopt_selector.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/ModernOpt/src') diff --git a/plugins/ModernOpt/src/mopt_selector.cpp b/plugins/ModernOpt/src/mopt_selector.cpp index 7ac405b294..0c923acfcb 100644 --- a/plugins/ModernOpt/src/mopt_selector.cpp +++ b/plugins/ModernOpt/src/mopt_selector.cpp @@ -47,9 +47,9 @@ static void sttPreviewSkin(MODERNOPTOBJECT *obj, TCHAR *fn, LPDRAWITEMSTRUCT lps } char *afn = mir_t2a(fn); - char *fnpreview = (char *)mir_alloc(lstrlenA(afn) + 10); - lstrcpyA(fnpreview, afn); - lstrcatA(fnpreview, ".png"); + char *fnpreview = (char *)mir_alloc(mir_strlen(afn) + 10); + mir_strcpy(fnpreview, afn); + mir_strcat(fnpreview, ".png"); HBITMAP hbmPreview = (HBITMAP)CallService(MS_UTILS_LOADBITMAP, 0, (LPARAM)fnpreview); mir_free(afn); mir_free(fnpreview); @@ -96,7 +96,7 @@ struct TSkinListItem path = (TCHAR *)mir_alloc(MAX_PATH * sizeof(TCHAR)); PathToRelativeT(curPath, path); - int length = lstrlen(curPath)+lstrlen(fn)+2; + int length = mir_tstrlen(curPath)+mir_tstrlen(fn)+2; filename = (TCHAR *)mir_alloc(length * sizeof(TCHAR)); mir_sntprintf(filename, length, _T("%s\\%s"), curPath, fn); } @@ -128,7 +128,7 @@ struct TSelectorData static bool CheckExt(TCHAR *fn, TCHAR *ext, int n) { - int l = lstrlen(fn); + int l = mir_tstrlen(fn); return (l > n) && !lstrcmp(fn + l - n, ext); } @@ -140,7 +140,7 @@ static void BuildSkinList(HWND hwndList, TCHAR *szExt, int nExtLength = -1, bool if (TCHAR *p = _tcsrchr(mirPath, _T('\\'))) *p = 0; SetCurrentDirectory(mirPath); SendMessage(hwndList, LB_RESETCONTENT, 0, 0); - nExtLength = lstrlen(szExt); + nExtLength = mir_tstrlen(szExt); SendMessage(hwndList, WM_SETREDRAW, FALSE, 0); } -- cgit v1.2.3