diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-11-30 18:51:36 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-11-30 18:51:36 +0000 |
| commit | 688f55ba998c19304a29727c910504903f4cc49a (patch) | |
| tree | 69121ebb6d02bcf9e670428b11813087fc7f1640 /plugins/mTextControl/src | |
| parent | 4f0e30cdf56fbafdf955bbe8b93930bab9e39bd0 (diff) | |
lstr* replacements
git-svn-id: http://svn.miranda-ng.org/main/trunk@11176 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/mTextControl/src')
| -rw-r--r-- | plugins/mTextControl/src/FormattedTextDraw.cpp | 10 | ||||
| -rw-r--r-- | plugins/mTextControl/src/textusers.cpp | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/plugins/mTextControl/src/FormattedTextDraw.cpp b/plugins/mTextControl/src/FormattedTextDraw.cpp index 247b688189..6555e8d0a0 100644 --- a/plugins/mTextControl/src/FormattedTextDraw.cpp +++ b/plugins/mTextControl/src/FormattedTextDraw.cpp @@ -67,7 +67,7 @@ HRESULT CFormattedTextDraw::putRTFTextA(char *newVal) m_editCookie.isUnicode = false;
m_editCookie.ansi = newVal;
- m_editCookie.dwSize = lstrlenA(m_editCookie.ansi);
+ m_editCookie.dwSize = mir_strlen(m_editCookie.ansi);
m_editCookie.dwCount = 0;
editStream.dwCookie = (DWORD_PTR) &m_editCookie;
editStream.dwError = 0;
@@ -88,7 +88,7 @@ HRESULT CFormattedTextDraw::putRTFTextW(WCHAR *newVal) m_editCookie.isUnicode = true;
m_editCookie.unicode = newVal;
- m_editCookie.dwSize = lstrlenW(m_editCookie.unicode);
+ m_editCookie.dwSize = mir_wstrlen(m_editCookie.unicode);
m_editCookie.dwCount = 0;
editStream.dwCookie = (DWORD_PTR) &m_editCookie;
editStream.dwError = 0;
@@ -109,7 +109,7 @@ HRESULT CFormattedTextDraw::putTextA(char *newVal) m_editCookie.isUnicode = false;
m_editCookie.ansi = newVal;
- m_editCookie.dwSize = lstrlenA(m_editCookie.ansi);
+ m_editCookie.dwSize = mir_strlen(m_editCookie.ansi);
m_editCookie.dwCount = 0;
editStream.dwCookie = (DWORD_PTR) &m_editCookie;
editStream.dwError = 0;
@@ -138,7 +138,7 @@ HRESULT CFormattedTextDraw::putTextW(WCHAR *newVal) m_editCookie.isUnicode = true;
m_editCookie.unicode = newVal;
- m_editCookie.dwSize = lstrlenW(m_editCookie.unicode);
+ m_editCookie.dwSize = mir_wstrlen(m_editCookie.unicode);
m_editCookie.dwCount = 0;
editStream.dwCookie = (DWORD_PTR) &m_editCookie;
editStream.dwError = 0;
@@ -507,7 +507,7 @@ HRESULT CFormattedTextDraw::CharFormatFromHFONT(CHARFORMAT2W* pCF, HFONT hFont) pCF->bPitchAndFamily = lf.lfPitchAndFamily;
- lstrcpyW(pCF->szFaceName, lf.lfFaceName);
+ mir_wstrcpy(pCF->szFaceName, lf.lfFaceName);
return S_OK;
diff --git a/plugins/mTextControl/src/textusers.cpp b/plugins/mTextControl/src/textusers.cpp index 3f2c2f0f0f..96dad7d8c6 100644 --- a/plugins/mTextControl/src/textusers.cpp +++ b/plugins/mTextControl/src/textusers.cpp @@ -44,8 +44,8 @@ HANDLE DLL_CALLCONV MTI_TextUserAdd(const char *userTitle, DWORD options)
{
TextUser *textUserNew = new TextUser;
- textUserNew->name = new char [lstrlenA(userTitle)+1];
- lstrcpyA(textUserNew->name, userTitle);
+ textUserNew->name = new char [mir_strlen(userTitle)+1];
+ mir_strcpy(textUserNew->name, userTitle);
textUserNew->options =
(db_get_dw(0, MODULNAME, userTitle, options)&MTEXT_FANCY_MASK) | (textUserNew->options&MTEXT_SYSTEM_MASK);
db_set_dw(0, MODULNAME, userTitle, textUserNew->options);
|