From 1eb922f8075c53a1a8487045b096693bd27b56dd Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 22 May 2015 19:23:27 +0000 Subject: replace _tcsicmp to mir_tstrcmpi git-svn-id: http://svn.miranda-ng.org/main/trunk@13761 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/chat/manager.cpp | 14 +++++++------- src/modules/clist/clistmod.cpp | 2 +- src/modules/clist/contact.cpp | 2 +- src/modules/database/database.cpp | 12 ++++++------ src/modules/extraicons/extraicons.cpp | 2 +- src/modules/findadd/searchresults.cpp | 2 +- src/modules/icolib/skin2icons.cpp | 2 +- src/modules/netlib/netlibsecurity.cpp | 8 ++++---- src/modules/options/options.cpp | 4 ++-- src/modules/plugins/newplugins.cpp | 4 ++-- src/modules/utils/timezones.cpp | 4 ++-- 11 files changed, 28 insertions(+), 28 deletions(-) (limited to 'src') diff --git a/src/modules/chat/manager.cpp b/src/modules/chat/manager.cpp index 41d0571c92..bbc846c89f 100644 --- a/src/modules/chat/manager.cpp +++ b/src/modules/chat/manager.cpp @@ -177,7 +177,7 @@ static BOOL SM_SetOffline(const TCHAR *pszID, const char *pszModule) return FALSE; for (SESSION_INFO *si = ci.wndList; si != NULL; si = si->next) { - if ((pszID && _tcsicmp(si->ptszID, pszID)) || mir_strcmpi(si->pszModule, pszModule)) + if ((pszID && mir_tstrcmpi(si->ptszID, pszID)) || mir_strcmpi(si->pszModule, pszModule)) continue; ci.UM_RemoveAll(&si->pUsers); @@ -198,7 +198,7 @@ static BOOL SM_SetStatusEx(const TCHAR *pszID, const char *pszModule, const TCHA return FALSE; for (SESSION_INFO *si = ci.wndList; si != NULL; si = si->next) { - if ((pszID && _tcsicmp(si->ptszID, pszID)) || mir_strcmpi(si->pszModule, pszModule)) + if ((pszID && mir_tstrcmpi(si->ptszID, pszID)) || mir_strcmpi(si->pszModule, pszModule)) continue; ci.UM_SetStatusEx(si->pUsers, pszText, flags); @@ -310,7 +310,7 @@ static BOOL SM_RemoveUser(const TCHAR *pszID, const char *pszModule, const TCHAR return FALSE; for (SESSION_INFO *si = ci.wndList; si != NULL; si = si->next) { - if ((pszID && _tcsicmp(si->ptszID, pszID)) || mir_strcmpi(si->pszModule, pszModule)) + if ((pszID && mir_tstrcmpi(si->ptszID, pszID)) || mir_strcmpi(si->pszModule, pszModule)) continue; USERINFO *ui = ci.UM_FindUser(si->pUsers, pszUID); @@ -403,7 +403,7 @@ static LRESULT SM_SendMessage(const TCHAR *pszID, const char *pszModule, UINT ms return 0; for (SESSION_INFO *si = ci.wndList; si != NULL; si = si->next) { - if ((pszID && _tcsicmp(si->ptszID, pszID)) || mir_strcmpi(si->pszModule, pszModule)) + if ((pszID && mir_tstrcmpi(si->ptszID, pszID)) || mir_strcmpi(si->pszModule, pszModule)) continue; if (si->hWnd) { @@ -450,7 +450,7 @@ static BOOL SM_SetStatus(const TCHAR *pszID, const char *pszModule, int wStatus) return FALSE; for (SESSION_INFO *si = ci.wndList; si != NULL; si = si->next) { - if ((pszID && _tcsicmp(si->ptszID, pszID)) || mir_strcmpi(si->pszModule, pszModule)) + if ((pszID && mir_tstrcmpi(si->ptszID, pszID)) || mir_strcmpi(si->pszModule, pszModule)) continue; si->wStatus = wStatus; @@ -476,7 +476,7 @@ static BOOL SM_SendUserMessage(const TCHAR *pszID, const char *pszModule, const return FALSE; for (SESSION_INFO *si = ci.wndList; si != NULL; si = si->next) { - if ((pszID && _tcsicmp(si->ptszID, pszID)) || mir_strcmpi(si->pszModule, pszModule)) + if ((pszID && mir_tstrcmpi(si->ptszID, pszID)) || mir_strcmpi(si->pszModule, pszModule)) continue; if (si->iType == GCW_CHATROOM || si->iType == GCW_PRIVMESS) @@ -493,7 +493,7 @@ static BOOL SM_ChangeUID(const TCHAR *pszID, const char *pszModule, const TCHAR return FALSE; for (SESSION_INFO *si = ci.wndList; si != NULL; si = si->next) { - if ((pszID && _tcsicmp(si->ptszID, pszID)) || mir_strcmpi(si->pszModule, pszModule)) + if ((pszID && mir_tstrcmpi(si->ptszID, pszID)) || mir_strcmpi(si->pszModule, pszModule)) continue; USERINFO* ui = ci.UM_FindUser(si->pUsers, pszUID); diff --git a/src/modules/clist/clistmod.cpp b/src/modules/clist/clistmod.cpp index 1ab5fd2c8f..81be885ba7 100644 --- a/src/modules/clist/clistmod.cpp +++ b/src/modules/clist/clistmod.cpp @@ -464,7 +464,7 @@ static INT_PTR CompareContacts(WPARAM wParam, LPARAM lParam) nameb = cli.pfnGetContactDisplayName(b, 0); //otherwise just compare names - return _tcsicmp(namea, nameb); + return mir_tstrcmpi(namea, nameb); } /***************************************************************************************/ diff --git a/src/modules/clist/contact.cpp b/src/modules/clist/contact.cpp index 64c2727c86..661d3040cf 100644 --- a/src/modules/clist/contact.cpp +++ b/src/modules/clist/contact.cpp @@ -130,7 +130,7 @@ int fnCompareContacts(const ClcContact* c1, const ClcContact* c2) nameb = cli.pfnGetContactDisplayName(b, 0); //otherwise just compare names - return _tcsicmp(namea, nameb); + return mir_tstrcmpi(namea, nameb); } void fnSortContacts(void) diff --git a/src/modules/database/database.cpp b/src/modules/database/database.cpp index b0d201f551..bdf770646d 100644 --- a/src/modules/database/database.cpp +++ b/src/modules/database/database.cpp @@ -64,7 +64,7 @@ bool IsInsideRootDir(TCHAR* profiledir, bool exact) { VARST pfd( _T("%miranda_path%")); if (exact) - return _tcsicmp(profiledir, pfd) == 0; + return mir_tstrcmpi(profiledir, pfd) == 0; return _tcsnicmp(profiledir, pfd, mir_tstrlen(pfd)) == 0; } @@ -90,7 +90,7 @@ int getProfilePath(TCHAR *buf, size_t cch) int isValidProfileName(const TCHAR *name) { size_t len = mir_tstrlen(name) - 4; - return len > 0 && _tcsicmp(&name[len], _T(".dat")) == 0; + return len > 0 && mir_tstrcmpi(&name[len], _T(".dat")) == 0; } // returns 1 if the profile manager should be shown @@ -103,7 +103,7 @@ static bool showProfileManager(void) // wanna show it? GetPrivateProfileString(_T("Database"), _T("ShowProfileMgr"), _T("never"), Mgr, SIZEOF(Mgr), mirandabootini); - return (_tcsicmp(Mgr, _T("yes")) == 0); + return (mir_tstrcmpi(Mgr, _T("yes")) == 0); } bool shouldAutoCreate(TCHAR *szProfile) @@ -113,7 +113,7 @@ bool shouldAutoCreate(TCHAR *szProfile) TCHAR ac[32]; GetPrivateProfileString(_T("Database"), _T("AutoCreate"), _T(""), ac, SIZEOF(ac), mirandabootini); - return _tcsicmp(ac, _T("yes")) == 0; + return mir_tstrcmpi(ac, _T("yes")) == 0; } static void getDefaultProfile(TCHAR *szProfile, size_t cch) @@ -157,7 +157,7 @@ static void loadProfileByShortName(const TCHAR* src, TCHAR *szProfile, size_t cc if (profileName[0]) { p = _tcsrchr(g_profileDir, '\\'); *p = 0; p = _tcsrchr(g_profileDir, '\\'); - if (p && _tcsicmp(p + 1, profileName) == 0) + if (p && mir_tstrcmpi(p + 1, profileName) == 0) *p = 0; } else szProfile[0] = 0; @@ -288,7 +288,7 @@ static int getProfileAutoRun(TCHAR *szProfile) TCHAR Mgr[32]; GetPrivateProfileString(_T("Database"), _T("ShowProfileMgr"), _T(""), Mgr, SIZEOF(Mgr), mirandabootini); - if (_tcsicmp(Mgr, _T("never"))) + if (mir_tstrcmpi(Mgr, _T("never"))) return 0; return fileExist(szProfile) || shouldAutoCreate(szProfile); diff --git a/src/modules/extraicons/extraicons.cpp b/src/modules/extraicons/extraicons.cpp index b2ca2b9c95..90ac2c35b2 100644 --- a/src/modules/extraicons/extraicons.cpp +++ b/src/modules/extraicons/extraicons.cpp @@ -369,7 +369,7 @@ INT_PTR ExtraIcon_Register(WPARAM wParam, LPARAM lParam) return 0; // Found one, now merge it - if (_tcsicmp(extra->getDescription(), desc)) { + if (mir_tstrcmpi(extra->getDescription(), desc)) { CMString newDesc = extra->getDescription(); newDesc += _T(" / "); newDesc += desc; diff --git a/src/modules/findadd/searchresults.cpp b/src/modules/findadd/searchresults.cpp index 499756ec17..20b9cc344c 100644 --- a/src/modules/findadd/searchresults.cpp +++ b/src/modules/findadd/searchresults.cpp @@ -152,7 +152,7 @@ int CALLBACK SearchResultsCompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lPa TCHAR szText2[100]; ListView_GetItemText(hList, (int)lParam1, sortCol, szText1, SIZEOF(szText1)); ListView_GetItemText(hList, (int)lParam2, sortCol, szText2, SIZEOF(szText2)); - return _tcsicmp(szText1, szText2)*sortMultiplier; + return mir_tstrcmpi(szText1, szText2)*sortMultiplier; } return 0; } diff --git a/src/modules/icolib/skin2icons.cpp b/src/modules/icolib/skin2icons.cpp index 62b9a21461..2f5bfed191 100644 --- a/src/modules/icolib/skin2icons.cpp +++ b/src/modules/icolib/skin2icons.cpp @@ -50,7 +50,7 @@ LIST sectionList(20, sttCompareSections); static int sttCompareIconSourceFiles(const IconSourceFile* p1, const IconSourceFile* p2) { - return _tcsicmp(p1->file, p2->file); + return mir_tstrcmpi(p1->file, p2->file); } static LIST iconSourceFileList(10, sttCompareIconSourceFiles); diff --git a/src/modules/netlib/netlibsecurity.cpp b/src/modules/netlib/netlibsecurity.cpp index 6533a1fa5f..a1ddd855aa 100644 --- a/src/modules/netlib/netlibsecurity.cpp +++ b/src/modules/netlib/netlibsecurity.cpp @@ -106,7 +106,7 @@ HANDLE NetlibInitSecurityProvider(const TCHAR* szProvider, const TCHAR* szPrinci { HANDLE hSecurity = NULL; - if (_tcsicmp(szProvider, _T("Basic")) == 0) { + if (mir_tstrcmpi(szProvider, _T("Basic")) == 0) { NtlmHandleType* hNtlm = (NtlmHandleType*)mir_calloc(sizeof(NtlmHandleType)); hNtlm->szProvider = mir_tstrdup(szProvider); SecInvalidateHandle(&hNtlm->hClientContext); @@ -126,7 +126,7 @@ HANDLE NetlibInitSecurityProvider(const TCHAR* szProvider, const TCHAR* szPrinci if (g_pSSPI != NULL) { PSecPkgInfo ntlmSecurityPackageInfo; - bool isGSSAPI = _tcsicmp(szProvider, _T("GSSAPI")) == 0; + bool isGSSAPI = mir_tstrcmpi(szProvider, _T("GSSAPI")) == 0; const TCHAR *szProviderC = isGSSAPI ? _T("Kerberos") : szProvider; SECURITY_STATUS sc = g_pSSPI->QuerySecurityPackageInfo((LPTSTR)szProviderC, &ntlmSecurityPackageInfo); if (sc == SEC_E_OK) { @@ -251,8 +251,8 @@ char* NtlmCreateResponseFromChallenge(HANDLE hSecurity, const char *szChallenge, char *szOutputToken; NtlmHandleType* hNtlm = (NtlmHandleType*)hSecurity; - if (_tcsicmp(hNtlm->szProvider, _T("Basic"))) { - bool isGSSAPI = _tcsicmp(hNtlm->szProvider, _T("GSSAPI")) == 0; + if (mir_tstrcmpi(hNtlm->szProvider, _T("Basic"))) { + bool isGSSAPI = mir_tstrcmpi(hNtlm->szProvider, _T("GSSAPI")) == 0; TCHAR *szProvider = isGSSAPI ? _T("Kerberos") : hNtlm->szProvider; bool hasChallenge = szChallenge != NULL && szChallenge[0] != '\0'; if (hasChallenge) { diff --git a/src/modules/options/options.cpp b/src/modules/options/options.cpp index c0aa2c7a86..8b52feb368 100644 --- a/src/modules/options/options.cpp +++ b/src/modules/options/options.cpp @@ -164,7 +164,7 @@ HTREEITEM FindNamedTreeItemAtRoot(HWND hwndTree, const TCHAR* name) tvi.hItem = TreeView_GetRoot(hwndTree); while (tvi.hItem != NULL) { SendMessage(hwndTree, TVM_GETITEM, 0, (LPARAM)&tvi); - if (!_tcsicmp(str, name)) + if (!mir_tstrcmpi(str, name)) return tvi.hItem; tvi.hItem = TreeView_GetNextSibling(hwndTree, tvi.hItem); @@ -182,7 +182,7 @@ static HTREEITEM FindNamedTreeItemAtChildren(HWND hwndTree, HTREEITEM hItem, con tvi.hItem = TreeView_GetChild(hwndTree, hItem); while (tvi.hItem != NULL) { SendMessage(hwndTree, TVM_GETITEM, 0, (LPARAM)&tvi); - if (!_tcsicmp(str, name)) + if (!mir_tstrcmpi(str, name)) return tvi.hItem; tvi.hItem = TreeView_GetNextSibling(hwndTree, tvi.hItem); diff --git a/src/modules/plugins/newplugins.cpp b/src/modules/plugins/newplugins.cpp index b2cabeecab..16f17dfed1 100644 --- a/src/modules/plugins/newplugins.cpp +++ b/src/modules/plugins/newplugins.cpp @@ -627,7 +627,7 @@ int UnloadPlugin(TCHAR* buf, int bufLen) { for (int i = pluginList.getCount() - 1; i >= 0; i--) { pluginEntry *p = pluginList[i]; - if (!_tcsicmp(p->pluginname, buf)) { + if (!mir_tstrcmpi(p->pluginname, buf)) { GetModuleFileName(p->bpi.hInst, buf, bufLen); Plugin_Uninit(p); return TRUE; @@ -694,7 +694,7 @@ void EnsureCheckerLoaded(bool bEnable) { for (int i = 0; i < pluginList.getCount(); i++) { pluginEntry *p = pluginList[i]; - if (_tcsicmp(p->pluginname, _T("dbchecker.dll"))) + if (mir_tstrcmpi(p->pluginname, _T("dbchecker.dll"))) continue; if (bEnable) { diff --git a/src/modules/utils/timezones.cpp b/src/modules/utils/timezones.cpp index aa993d73cd..ce928fbb24 100644 --- a/src/modules/utils/timezones.cpp +++ b/src/modules/utils/timezones.cpp @@ -311,9 +311,9 @@ static const ListMessages* GetListMessages(HWND hWnd, DWORD dwFlags) if (!(dwFlags & (TZF_PLF_CB | TZF_PLF_LB))) { TCHAR tszClassName[128]; GetClassName(hWnd, tszClassName, SIZEOF(tszClassName)); - if (!_tcsicmp(tszClassName, _T("COMBOBOX"))) + if (!mir_tstrcmpi(tszClassName, _T("COMBOBOX"))) dwFlags |= TZF_PLF_CB; - else if (!_tcsicmp(tszClassName, _T("LISTBOX"))) + else if (!mir_tstrcmpi(tszClassName, _T("LISTBOX"))) dwFlags |= TZF_PLF_LB; } if (dwFlags & TZF_PLF_CB) -- cgit v1.2.3