diff options
author | Kirill Volinsky <mataes2007@gmail.com> | 2015-05-22 10:27:55 +0000 |
---|---|---|
committer | Kirill Volinsky <mataes2007@gmail.com> | 2015-05-22 10:27:55 +0000 |
commit | 2ad5305d32e3e85d511ce81a7273b9de7c05d4ed (patch) | |
tree | c82101cb7e69f460ffa8af0718700ccbb5de6575 /plugins | |
parent | a371c34e0720a4d41a81da6b0cede16c5cf8779d (diff) |
replace lstrlenA to mir_strlen
git-svn-id: http://svn.miranda-ng.org/main/trunk@13750 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/ExternalAPI/m_assocmgr.h | 2 | ||||
-rw-r--r-- | plugins/ShellExt/src/shlcom.cpp | 6 | ||||
-rw-r--r-- | plugins/ShellExt/src/shlext.cpp | 6 | ||||
-rw-r--r-- | plugins/ShellExt/src/utils.cpp | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/plugins/ExternalAPI/m_assocmgr.h b/plugins/ExternalAPI/m_assocmgr.h index 1f7162f256..94e590dc86 100644 --- a/plugins/ExternalAPI/m_assocmgr.h +++ b/plugins/ExternalAPI/m_assocmgr.h @@ -259,7 +259,7 @@ static __inline char *Netlib_UrlDecode(char *str) MoveMemory(psz,&psz[1],2);
psz[2]=0;
*psz=(char)strtol(psz,NULL,16);
- MoveMemory(&psz[1],&psz[3],lstrlenA(&psz[3])+1);
+ MoveMemory(&psz[1],&psz[3],mir_strlen(&psz[3])+1);
break;
}
return str;
diff --git a/plugins/ShellExt/src/shlcom.cpp b/plugins/ShellExt/src/shlcom.cpp index 5f77e9b231..bcd6a75378 100644 --- a/plugins/ShellExt/src/shlcom.cpp +++ b/plugins/ShellExt/src/shlcom.cpp @@ -310,9 +310,9 @@ bool ipcGetSortedContacts(THeaderIPC *ipch, int *pSlot, bool bGroupMode) if (bGroupMode) {
rc = db_get_s(pContacts[i].hContact, "CList", "Group", &dbv);
if (!rc)
- n = lstrlenA(dbv.pszVal) + 1;
+ n = mir_strlen(dbv.pszVal) + 1;
}
- int cch = lstrlenA(szContact) + 1;
+ int cch = mir_strlen(szContact) + 1;
TSlotIPC *pct = ipcAlloc(ipch, cch + 1 + n);
if (pct == NULL) {
db_free(&dbv);
@@ -444,7 +444,7 @@ void __stdcall ipcService(ULONG_PTR dwParam) _itoa(iSlot, szGroupStr, 10);
if ( db_get_s(0, "CListGroups", szGroupStr, &dbv) != 0)
break;
- pct = ipcAlloc(pMMT, lstrlenA(dbv.pszVal + 1) + 1);
+ pct = ipcAlloc(pMMT, mir_strlen(dbv.pszVal + 1) + 1);
// first byte has flags, need null term
if (pct != NULL) {
if (pMMT->GroupsBegin == NULL)
diff --git a/plugins/ShellExt/src/shlext.cpp b/plugins/ShellExt/src/shlext.cpp index 7b30f1bb73..94369413f6 100644 --- a/plugins/ShellExt/src/shlext.cpp +++ b/plugins/ShellExt/src/shlext.cpp @@ -370,7 +370,7 @@ static void BuildMenus(TEnumData *lParam) // since it maybe Miranda\Blah\Blah and we have created the first node
// which maybe Miranda, thus giving the wrong hash
// since "Miranda" can be a group of it's own and a full path
- q->cchGroup = lstrlenA(Token);
+ q->cchGroup = mir_strlen(Token);
q->szGroup = (LPSTR)HeapAlloc(hDllHeap, 0, q->cchGroup + 1);
lstrcpyA(q->szGroup, Token);
q->dwItems = 0;
@@ -862,7 +862,7 @@ HRESULT TShellExt::HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESU GetTextExtentPoint32A(dwi->hDC, psd->szText, psd->cch, &tS);
dwi->rcItem.left += tS.cx + 8;
SetTextColor(dwi->hDC, GetSysColor(COLOR_GRAYTEXT));
- DrawTextA(dwi->hDC, psd->szProfile, lstrlenA(psd->szProfile), &dwi->rcItem, DT_NOCLIP | DT_NOPREFIX | DT_SINGLELINE | DT_VCENTER);
+ DrawTextA(dwi->hDC, psd->szProfile, mir_strlen(psd->szProfile), &dwi->rcItem, DT_NOCLIP | DT_NOPREFIX | DT_SINGLELINE | DT_VCENTER);
}
}
else {
@@ -908,7 +908,7 @@ HRESULT TShellExt::HandleMenuMsg2(UINT uMsg, WPARAM wParam, LPARAM lParam, LRESU dx += tS.cx;
// main menu item?
if (psd->szProfile != NULL) {
- GetTextExtentPoint32A(hMemDC, psd->szProfile, lstrlenA(psd->szProfile), &tS);
+ GetTextExtentPoint32A(hMemDC, psd->szProfile, mir_strlen(psd->szProfile), &tS);
dx += tS.cx;
}
// store it
diff --git a/plugins/ShellExt/src/utils.cpp b/plugins/ShellExt/src/utils.cpp index 22e033fb42..1a71ca3fe8 100644 --- a/plugins/ShellExt/src/utils.cpp +++ b/plugins/ShellExt/src/utils.cpp @@ -20,7 +20,7 @@ void logA(const char *format, ...) UINT murmur_hash(const char *str)
{
- size_t len = lstrlenA(str);
+ size_t len = mir_strlen(str);
// 'm' and 'r' are mixing constants generated offline.
// They're not really 'magic', they just happen to work well.
|