diff options
| author | Tobias Weimer <wishmaster51@googlemail.com> | 2015-05-24 14:14:42 +0000 |
|---|---|---|
| committer | Tobias Weimer <wishmaster51@googlemail.com> | 2015-05-24 14:14:42 +0000 |
| commit | 09cb37f721442717a5668594d140f5ebca42006e (patch) | |
| tree | c64a752f0be61477d7e0a1ea50e1ea06e9df598a /plugins/ShellExt/src/shlext.cpp | |
| parent | ee697e0b699bcefec907c089e3ad455538c72c2f (diff) | |
ShlExt:
- Reverted last changes due to crashes
git-svn-id: http://svn.miranda-ng.org/main/trunk@13815 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/ShellExt/src/shlext.cpp')
| -rw-r--r-- | plugins/ShellExt/src/shlext.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/ShellExt/src/shlext.cpp b/plugins/ShellExt/src/shlext.cpp index 94369413f6..977232ba19 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 = mir_strlen(Token);
+ q->cchGroup = lstrlenA(Token);
q->szGroup = (LPSTR)HeapAlloc(hDllHeap, 0, q->cchGroup + 1);
lstrcpyA(q->szGroup, Token);
q->dwItems = 0;
@@ -443,7 +443,7 @@ static void BuildMenus(TEnumData *lParam) psd->szProfile = "MRU";
psd->fTypes = dtGroup;
// the IPC string pointer wont be around forever, must make a copy
- psd->cch = (int)mir_strlen(lParam->ipch->MRUMenuName);
+ psd->cch = (int)strlen(lParam->ipch->MRUMenuName);
psd->szText = (LPSTR)HeapAlloc(hDllHeap, 0, psd->cch + 1);
lstrcpynA(psd->szText, lParam->ipch->MRUMenuName, sizeof(lParam->ipch->MRUMenuName) - 1);
@@ -480,7 +480,7 @@ static void BuildMenus(TEnumData *lParam) RemoveCheckmarkSpace(hGroupMenu);
psd = (TMenuDrawInfo*)HeapAlloc(hDllHeap, 0, sizeof(TMenuDrawInfo));
- psd->cch = (int)mir_strlen(lParam->ipch->MirandaName);
+ psd->cch = (int)strlen(lParam->ipch->MirandaName);
psd->szText = (LPSTR)HeapAlloc(hDllHeap, 0, psd->cch + 1);
lstrcpynA(psd->szText, lParam->ipch->MirandaName, sizeof(lParam->ipch->MirandaName) - 1);
// there may not be a profile name
@@ -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, mir_strlen(psd->szProfile), &dwi->rcItem, DT_NOCLIP | DT_NOPREFIX | DT_SINGLELINE | DT_VCENTER);
+ DrawTextA(dwi->hDC, psd->szProfile, lstrlenA(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, mir_strlen(psd->szProfile), &tS);
+ GetTextExtentPoint32A(hMemDC, psd->szProfile, lstrlenA(psd->szProfile), &tS);
dx += tS.cx;
}
// store it
|