From 09cb37f721442717a5668594d140f5ebca42006e Mon Sep 17 00:00:00 2001 From: Tobias Weimer Date: Sun, 24 May 2015 14:14:42 +0000 Subject: ShlExt: - Reverted last changes due to crashes git-svn-id: http://svn.miranda-ng.org/main/trunk@13815 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/ShellExt/src/main.cpp | 2 +- plugins/ShellExt/src/shlcom.cpp | 8 ++++---- plugins/ShellExt/src/shlext.cpp | 10 +++++----- plugins/ShellExt/src/utils.cpp | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) (limited to 'plugins/ShellExt/src') diff --git a/plugins/ShellExt/src/main.cpp b/plugins/ShellExt/src/main.cpp index 93d0a09d03..12a09506a4 100644 --- a/plugins/ShellExt/src/main.cpp +++ b/plugins/ShellExt/src/main.cpp @@ -128,7 +128,7 @@ STDAPI DllRegisterServer() TCHAR tszFileName[MAX_PATH]; GetModuleFileName(hInst, tszFileName, SIZEOF(tszFileName)); - if ( RegSetValueEx(kInprocServer, NULL, 0, REG_SZ, (LPBYTE)tszFileName, sizeof(TCHAR)*(mir_tstrlen(tszFileName)+1))) + if ( RegSetValueEx(kInprocServer, NULL, 0, REG_SZ, (LPBYTE)tszFileName, sizeof(TCHAR)*(lstrlen(tszFileName)+1))) return E_FAIL; if ( RegSetValueExA(kInprocServer, "ThreadingModel", 0, REG_SZ, (PBYTE)str4, sizeof(str4))) return E_FAIL; diff --git a/plugins/ShellExt/src/shlcom.cpp b/plugins/ShellExt/src/shlcom.cpp index bcd6a75378..a4442d1460 100644 --- a/plugins/ShellExt/src/shlcom.cpp +++ b/plugins/ShellExt/src/shlcom.cpp @@ -95,7 +95,7 @@ BOOL AddToList(TAddArgList& args) szThis = args.szFile; args.szFile = szBuf; int cchThis = args.cch; - args.cch = (int)mir_strlen(szBuf) + 1; + args.cch = (int)strlen(szBuf) + 1; // recurse BOOL Result = AddToList(args); // restore @@ -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 = mir_strlen(dbv.pszVal) + 1; + n = lstrlenA(dbv.pszVal) + 1; } - int cch = mir_strlen(szContact) + 1; + int cch = lstrlenA(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, mir_strlen(dbv.pszVal + 1) + 1); + pct = ipcAlloc(pMMT, lstrlenA(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 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 diff --git a/plugins/ShellExt/src/utils.cpp b/plugins/ShellExt/src/utils.cpp index 1a71ca3fe8..22e033fb42 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 = mir_strlen(str); + size_t len = lstrlenA(str); // 'm' and 'r' are mixing constants generated offline. // They're not really 'magic', they just happen to work well. -- cgit v1.2.3