From 5aed15a8d8d8e4f913539761be496e0d1ba2c4f0 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sun, 24 May 2015 12:20:50 +0000 Subject: replace wcslen to mir_wstrlen git-svn-id: http://svn.miranda-ng.org/main/trunk@13813 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/TabSRMM/src/chat/window.cpp | 2 +- plugins/TabSRMM/src/utils.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/TabSRMM/src') diff --git a/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp index f74ca657aa..fb30a32607 100644 --- a/plugins/TabSRMM/src/chat/window.cpp +++ b/plugins/TabSRMM/src/chat/window.cpp @@ -495,7 +495,7 @@ LBL_SkipEnd: if (end != start) { ptrT szReplace; if (!isRoom && !isTopic && g_Settings.bAddColonToAutoComplete && start == 0) { - szReplace = (TCHAR*)mir_alloc((wcslen(pszName) + 4) * sizeof(TCHAR)); + szReplace = (TCHAR*)mir_alloc((mir_wstrlen(pszName) + 4) * sizeof(TCHAR)); wcscpy(szReplace, pszName); wcscat(szReplace, L": "); pszName = szReplace; diff --git a/plugins/TabSRMM/src/utils.cpp b/plugins/TabSRMM/src/utils.cpp index f8762db894..378b5a8869 100644 --- a/plugins/TabSRMM/src/utils.cpp +++ b/plugins/TabSRMM/src/utils.cpp @@ -1000,7 +1000,7 @@ HMODULE Utils::loadSystemLibrary(const wchar_t* szFilename) return 0; sysPathName[MAX_PATH - 1] = 0; - if (wcslen(sysPathName) + wcslen(szFilename) >= MAX_PATH) + if (mir_wstrlen(sysPathName) + mir_wstrlen(szFilename) >= MAX_PATH) return 0; mir_wstrcat(sysPathName, szFilename); @@ -1187,7 +1187,7 @@ LRESULT CWarning::show(const int uId, DWORD dwFlags, const wchar_t* tszTxt) */ _s = TranslateTS(warnings[uId]); - if (wcslen(_s) < 3 || 0 == wcschr(_s, '|')) + if (mir_wstrlen(_s) < 3 || 0 == wcschr(_s, '|')) _s = TranslateTS(warnings[uId]); } } @@ -1195,7 +1195,7 @@ LRESULT CWarning::show(const int uId, DWORD dwFlags, const wchar_t* tszTxt) return -1; } - if ((wcslen(_s) > 3) && ((separator_pos = wcschr(_s, '|')) != 0)) { + if ((mir_wstrlen(_s) > 3) && ((separator_pos = wcschr(_s, '|')) != 0)) { if (uId >= 0) { mask = getMask(); val = ((__int64)1L) << uId; @@ -1203,7 +1203,7 @@ LRESULT CWarning::show(const int uId, DWORD dwFlags, const wchar_t* tszTxt) else mask = val = 0; if (0 == (mask & val) || dwFlags & CWF_NOALLOWHIDE) { - wchar_t *s = reinterpret_cast(mir_alloc((wcslen(_s) + 1) * 2)); + wchar_t *s = reinterpret_cast(mir_alloc((mir_wstrlen(_s) + 1) * 2)); wcscpy(s, _s); separator_pos = wcschr(s, '|'); -- cgit v1.2.3