diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2015-05-22 10:18:21 +0000 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2015-05-22 10:18:21 +0000 |
| commit | b499ebc740aa5480be013d40e0d8097066800642 (patch) | |
| tree | ed410ee863f4afc0c579599741bf38b4e3ffb706 /plugins/KeyboardNotify | |
| parent | 5a17c9299e03bebf46169927abdeee34aaf8e854 (diff) | |
replace _tcslen to mir_tstrlen
git-svn-id: http://svn.miranda-ng.org/main/trunk@13748 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/KeyboardNotify')
| -rw-r--r-- | plugins/KeyboardNotify/src/main.cpp | 2 | ||||
| -rw-r--r-- | plugins/KeyboardNotify/src/options.cpp | 22 |
2 files changed, 12 insertions, 12 deletions
diff --git a/plugins/KeyboardNotify/src/main.cpp b/plugins/KeyboardNotify/src/main.cpp index 8a9b7c36b8..eb6b3f68ff 100644 --- a/plugins/KeyboardNotify/src/main.cpp +++ b/plugins/KeyboardNotify/src/main.cpp @@ -692,7 +692,7 @@ void createEventPrefix(TCHAR *prefixName, size_t maxLen) while (str = _tcschr(profileName, _T('\\'))) *str = _T('/'); - if ((len = _tcslen(profileName)) <= maxLen) + if ((len = mir_tstrlen(profileName)) <= maxLen) _tcsncpy_s(prefixName, maxLen, profileName, _TRUNCATE); else { str = profileName + len - maxLen / 2; diff --git a/plugins/KeyboardNotify/src/options.cpp b/plugins/KeyboardNotify/src/options.cpp index 72bf91d5f6..8fbb05e2a9 100644 --- a/plugins/KeyboardNotify/src/options.cpp +++ b/plugins/KeyboardNotify/src/options.cpp @@ -873,13 +873,13 @@ INT_PTR CALLBACK DlgProcThemeOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR ofn.hInstance = NULL; _tcscpy(filter, TranslateT("Keyboard Notify Theme")); wcscat(filter, _T(" (*.knt)")); - pfilter = filter + _tcslen(filter) + 1; + pfilter = filter + mir_tstrlen(filter) + 1; _tcscpy(pfilter, _T("*.knt")); - pfilter = pfilter + _tcslen(pfilter) + 1; + pfilter = pfilter + mir_tstrlen(pfilter) + 1; _tcscpy(pfilter, TranslateT("All Files")); - pfilter = pfilter + _tcslen(pfilter) + 1; + pfilter = pfilter + mir_tstrlen(pfilter) + 1; _tcscpy(pfilter, _T("*.*")); - pfilter = pfilter + _tcslen(pfilter) + 1; + pfilter = pfilter + mir_tstrlen(pfilter) + 1; *pfilter = _T('\0'); ofn.lpstrFilter = filter; ofn.lpstrFile = path; @@ -901,13 +901,13 @@ INT_PTR CALLBACK DlgProcThemeOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR ofn.hInstance = NULL; _tcscpy(filter, TranslateT("Keyboard Notify Theme")); wcscat(filter, _T(" (*.knt)")); - pfilter = filter + _tcslen(filter) + 1; + pfilter = filter + mir_tstrlen(filter) + 1; _tcscpy(pfilter, _T("*.knt")); - pfilter = pfilter + _tcslen(pfilter) + 1; + pfilter = pfilter + mir_tstrlen(pfilter) + 1; _tcscpy(pfilter, TranslateT("All Files")); - pfilter = pfilter + _tcslen(pfilter) + 1; + pfilter = pfilter + mir_tstrlen(pfilter) + 1; _tcscpy(pfilter, _T("*.*")); - pfilter = pfilter + _tcslen(pfilter) + 1; + pfilter = pfilter + mir_tstrlen(pfilter) + 1; *pfilter = _T('\0'); ofn.lpstrFilter = filter; ofn.lpstrFile = path; @@ -1038,7 +1038,7 @@ void importThemes(const TCHAR *filename, BOOL overrideExisting) for (str=buffer; *str && isspace(*str); str++); //ltrim if (!*str || *str == ';') //empty line or comment continue; - for (i=_tcslen(str)-1; isspace(str[i]); str[i--]='\0'); //rtrim + for (i=mir_tstrlen(str)-1; isspace(str[i]); str[i--]='\0'); //rtrim switch (status) { case 0: if (i > 1 && str[0] == '[' && str[i] == ']') { @@ -1166,7 +1166,7 @@ INT_PTR CALLBACK DlgProcProcesses(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM TCHAR szFileNameAux[MAX_PATH+1]; SendDlgItemMessage(hwndDlg, IDC_PROGRAMS, CB_GETLBTEXT, (WPARAM)i, (LPARAM)szFileNameAux); - ProcessListAux.szFileName[i] = (TCHAR *)malloc((_tcslen(szFileNameAux) + 1)*sizeof(TCHAR)); + ProcessListAux.szFileName[i] = (TCHAR *)malloc((mir_tstrlen(szFileNameAux) + 1)*sizeof(TCHAR)); if (ProcessListAux.szFileName[i]) _tcscpy(ProcessListAux.szFileName[i], szFileNameAux); } @@ -1193,7 +1193,7 @@ void createProcessListAux(void) if (!ProcessList.szFileName[i]) ProcessListAux.szFileName[i] = NULL; else { - ProcessListAux.szFileName[i] = (TCHAR *)malloc((_tcslen(ProcessList.szFileName[i]) + 1)*sizeof(TCHAR)); + ProcessListAux.szFileName[i] = (TCHAR *)malloc((mir_tstrlen(ProcessList.szFileName[i]) + 1)*sizeof(TCHAR)); if (ProcessListAux.szFileName[i]) _tcscpy(ProcessListAux.szFileName[i], ProcessList.szFileName[i]); } |