From b499ebc740aa5480be013d40e0d8097066800642 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 22 May 2015 10:18:21 +0000 Subject: replace _tcslen to mir_tstrlen git-svn-id: http://svn.miranda-ng.org/main/trunk@13748 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Exchange/src/MirandaExchange.cpp | 14 +++++++------- plugins/Exchange/src/emails.cpp | 2 +- plugins/Exchange/src/utils.cpp | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'plugins/Exchange/src') diff --git a/plugins/Exchange/src/MirandaExchange.cpp b/plugins/Exchange/src/MirandaExchange.cpp index 6d9f455f35..2026967762 100644 --- a/plugins/Exchange/src/MirandaExchange.cpp +++ b/plugins/Exchange/src/MirandaExchange.cpp @@ -116,14 +116,14 @@ CKeeper::CKeeper( LPTSTR szSender, LPTSTR szSubject, LPSTR szEntryID) m_nSizeEntryID = 0 ; if (NULL != szSender) { - m_nSizeSender = (UINT)_tcslen(szSender)+1; + m_nSizeSender = (UINT)mir_tstrlen(szSender)+1; m_szSender = new TCHAR[ m_nSizeSender ]; memset(m_szSender, 0, m_nSizeSender * sizeof(TCHAR)); _tcscpy(m_szSender, szSender); } if (NULL != szSubject) { - m_nSizeSubject = (UINT)_tcslen(szSubject) +1; + m_nSizeSubject = (UINT)mir_tstrlen(szSubject) +1; m_szSubject = new TCHAR[m_nSizeSubject]; memset(m_szSubject, 0, m_nSizeSubject * sizeof(TCHAR)); _tcscpy(m_szSubject, szSubject); @@ -392,7 +392,7 @@ HRESULT CMirandaExchange::InitializeAndLogin( LPCTSTR szUsername, LPCTSTR szPass short nSizeOfTCHAR = sizeof( TCHAR ); if (m_szUsername == NULL && NULL != szUsername) { - nSize = (UINT)_tcslen(szUsername); + nSize = (UINT)mir_tstrlen(szUsername); if (nSize > 0) { nSize++; m_szUsername = new TCHAR[nSize]; @@ -402,7 +402,7 @@ HRESULT CMirandaExchange::InitializeAndLogin( LPCTSTR szUsername, LPCTSTR szPass } if (m_szPassword == NULL && NULL != szPassword) { - nSize = (UINT)_tcslen(szPassword); + nSize = (UINT)mir_tstrlen(szPassword); if (nSize > 0) { nSize++; m_szPassword = new TCHAR[nSize]; @@ -412,7 +412,7 @@ HRESULT CMirandaExchange::InitializeAndLogin( LPCTSTR szUsername, LPCTSTR szPass } if (m_szExchangeServer == NULL && NULL != szExchangeServer) { - nSize = (UINT)_tcslen(szExchangeServer); + nSize = (UINT)mir_tstrlen(szExchangeServer); if (nSize > 0) { nSize++; m_szExchangeServer = new TCHAR[nSize]; @@ -562,7 +562,7 @@ HRESULT CMirandaExchange::CreateProfile( LPTSTR szProfileName ) if (FAILED(hr)) return hr; - nSize = _tcslen(m_szUsername); + nSize = mir_tstrlen(m_szUsername); szUniqName = (TCHAR*)mir_alloc(sizeof(TCHAR) * (nSize + 4)); if (szUniqName != NULL) { memcpy(szUniqName, _T("="), sizeof(TCHAR)); @@ -867,7 +867,7 @@ HRESULT CMirandaExchange::OpenTheMessage( LPTSTR ) if ( NULL != szTheEnd ) { - szRegValue[ _tcslen(szRegValue) - _tcslen(szTheEnd) +5 ] = _T('\0'); + szRegValue[ mir_tstrlen(szRegValue) - mir_tstrlen(szTheEnd) +5 ] = _T('\0'); _tcscat( szRegValue, _T(" /recycle") ); STARTUPINFO si; PROCESS_INFORMATION pi; diff --git a/plugins/Exchange/src/emails.cpp b/plugins/Exchange/src/emails.cpp index 23be8a9359..ae6b2309e7 100644 --- a/plugins/Exchange/src/emails.cpp +++ b/plugins/Exchange/src/emails.cpp @@ -69,7 +69,7 @@ int CExchangeServer::Connect(int bForceConnect) GetStringFromDatabase("Server", _T(""), server, _countof(server)); int port = db_get_dw(NULL, ModuleName, "Port", EXCHANGE_PORT); - if (_tcslen(server) > 0) //only connect if there's a server to connect to + if (mir_tstrlen(server) > 0) //only connect if there's a server to connect to return DoConnect(user, password, server, port); _popupUtil(TranslateT("Server is not configured...")); diff --git a/plugins/Exchange/src/utils.cpp b/plugins/Exchange/src/utils.cpp index c580d67925..0cda52c2df 100644 --- a/plugins/Exchange/src/utils.cpp +++ b/plugins/Exchange/src/utils.cpp @@ -116,7 +116,7 @@ int GetStringFromDatabase(char *szSettingName, TCHAR *szError, TCHAR *szResult, dbv.type = DBVT_ASCIIZ; if (db_get_ts(NULL, ModuleName, szSettingName, &dbv) == 0) { res = 0; - int tmp = _tcslen(dbv.ptszVal); + int tmp = mir_tstrlen(dbv.ptszVal); len = (tmp < size - 1) ? tmp : size - 1; _tcsncpy(szResult, dbv.ptszVal, len); szResult[len] = '\0'; @@ -124,7 +124,7 @@ int GetStringFromDatabase(char *szSettingName, TCHAR *szError, TCHAR *szResult, } else { res = 1; - int tmp = _tcslen(szError); + int tmp = mir_tstrlen(szError); len = (tmp < size - 1) ? tmp : size - 1; _tcsncpy(szResult, szError, len); szResult[len] = '\0'; -- cgit v1.2.3