From d9c98bcdfca6da51a1a82dc6c0dc5996b3b6cd6d Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 30 Nov 2014 21:20:14 +0000 Subject: new sorting functions applied git-svn-id: http://svn.miranda-ng.org/main/trunk@11180 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/modules/clist/clc.cpp | 6 +++--- src/modules/clist/clcfiledrop.cpp | 4 ++-- src/modules/clist/clcitems.cpp | 10 +++++----- src/modules/clist/clcutils.cpp | 6 +++--- src/modules/clist/clistevents.cpp | 4 ++-- src/modules/clist/clistmenus.cpp | 10 +++++----- src/modules/clist/clisttray.cpp | 10 +++++----- src/modules/clist/clui.cpp | 6 +++--- src/modules/clist/cluiservices.cpp | 2 +- src/modules/clist/contact.cpp | 2 +- src/modules/clist/genmenu.cpp | 4 ++-- src/modules/clist/genmenuopt.cpp | 4 ++-- src/modules/clist/groups.cpp | 6 +++--- 13 files changed, 37 insertions(+), 37 deletions(-) (limited to 'src/modules/clist') diff --git a/src/modules/clist/clc.cpp b/src/modules/clist/clc.cpp index eba07e1068..788ae8604b 100644 --- a/src/modules/clist/clc.cpp +++ b/src/modules/clist/clc.cpp @@ -162,7 +162,7 @@ static int ClcProtoAck(WPARAM, LPARAM lParam) WindowList_BroadcastAsync(hClcWindowList, INTM_INVALIDATE, 0, 0); if (ack->result == ACKRESULT_SUCCESS) { for (int i=0; i < cli.hClcProtoCount; i++) { - if (!lstrcmpA(cli.clcProto[i].szProto, ack->szModule)) { + if (!mir_strcmp(cli.clcProto[i].szProto, ack->szModule)) { cli.clcProto[i].dwStatus = (WORD) ack->lParam; break; } @@ -432,14 +432,14 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, if (dbcws->value.type == DBVT_ASCIIZ) { WCHAR* wszGrpName = mir_a2u(dbcws->value.pszVal+1); - eq = !lstrcmp(szFullName, wszGrpName); + eq = !mir_tstrcmp(szFullName, wszGrpName); mir_free(wszGrpName); } else { char* szGrpName = NEWSTR_ALLOCA(dbcws->value.pszVal+1); WCHAR* wszGrpName; Utf8Decode(szGrpName, &wszGrpName); - eq = !lstrcmp(szFullName, wszGrpName); + eq = !mir_tstrcmp(szFullName, wszGrpName); mir_free(wszGrpName); } if (eq && (contact->group->hideOffline != 0) == ((dbcws->value.pszVal[0] & GROUPF_HIDEOFFLINE) != 0)) diff --git a/src/modules/clist/clcfiledrop.cpp b/src/modules/clist/clcfiledrop.cpp index c3ee8a0980..c575b81672 100644 --- a/src/modules/clist/clcfiledrop.cpp +++ b/src/modules/clist/clcfiledrop.cpp @@ -148,7 +148,7 @@ HRESULT CDropTarget::DragEnter(IDataObject *pDataObj, DWORD grfKeyState, POINTL shortPt.y = pt.y; hwnd = WindowFromPoint(shortPt); GetClassName(hwnd, szWindowClass, SIZEOF(szWindowClass)); - if (!lstrcmp(szWindowClass, _T(CLISTCONTROL_CLASS))) { + if (!mir_tstrcmp(szWindowClass, _T(CLISTCONTROL_CLASS))) { struct ClcData *dat; hwndCurrentDrag = hwnd; dat = (struct ClcData *) GetWindowLongPtr(hwndCurrentDrag, 0); @@ -188,7 +188,7 @@ static void AddToFileList(TCHAR ***pppFiles, int *totalCount, const TCHAR *szFil mir_tstrcat(szPath, _T("\\*")); if (hFind = FindFirstFile(szPath, &fd)) { do { - if (!lstrcmp(fd.cFileName, _T(".")) || !lstrcmp(fd.cFileName, _T(".."))) + if (!mir_tstrcmp(fd.cFileName, _T(".")) || !mir_tstrcmp(fd.cFileName, _T(".."))) continue; mir_tstrcpy(szPath, szFilename); mir_tstrcat(szPath, _T("\\")); diff --git a/src/modules/clist/clcitems.cpp b/src/modules/clist/clcitems.cpp index ca54079ade..36650d19be 100644 --- a/src/modules/clist/clcitems.cpp +++ b/src/modules/clist/clcitems.cpp @@ -66,7 +66,7 @@ ClcGroup* fnAddGroup(HWND hwnd, struct ClcData *dat, const TCHAR *szName, DWORD break; if (group->cl.items[i]->type != CLCIT_GROUP) continue; - compareResult = lstrcmp(szThisField, group->cl.items[i]->szText); + compareResult = mir_tstrcmp(szThisField, group->cl.items[i]->szText); if (compareResult == 0) { if (pNextField == NULL && flags != (DWORD) - 1) { group->cl.items[i]->groupId = (WORD) groupId; @@ -110,7 +110,7 @@ ClcGroup* fnAddGroup(HWND hwnd, struct ClcData *dat, const TCHAR *szName, DWORD DWORD style = GetWindowLongPtr(hwnd, GWL_STYLE); for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) { ClcCacheEntry *cache = cli.pfnGetCacheEntry(hContact); - if (!lstrcmp(cache->tszGroup, szName) && (style & CLS_SHOWHIDDEN || !cache->bIsHidden)) + if (!mir_tstrcmp(cache->tszGroup, szName) && (style & CLS_SHOWHIDDEN || !cache->bIsHidden)) group->totalMembers++; } } @@ -248,7 +248,7 @@ void fnAddContactToTree(HWND hwnd, struct ClcData *dat, MCONTACT hContact, int u mir_free(dbv.ptszVal); return; } - if (!lstrcmp(szGroupName, dbv.ptszVal)) + if (!mir_tstrcmp(szGroupName, dbv.ptszVal)) break; } if (groupFlags & GROUPF_HIDEOFFLINE) { @@ -262,7 +262,7 @@ void fnAddContactToTree(HWND hwnd, struct ClcData *dat, MCONTACT hContact, int u mir_free(dbv.ptszVal); return; } - if (!lstrcmp(szGroupName, dbv.ptszVal)) + if (!mir_tstrcmp(szGroupName, dbv.ptszVal)) break; len = mir_tstrlen(szGroupName); if (!_tcsncmp(szGroupName, dbv.ptszVal, len) && dbv.ptszVal[len] == '\\') @@ -455,7 +455,7 @@ static int __cdecl GroupSortProc(const void* p1, const void* p2) { ClcContact **contact1 = (ClcContact**)p1, **contact2 = (ClcContact**)p2; - return lstrcmpi(contact1[0]->szText, contact2[0]->szText); + return mir_tstrcmpi(contact1[0]->szText, contact2[0]->szText); } static int __cdecl ContactSortProc(const void* p1, const void* p2) diff --git a/src/modules/clist/clcutils.cpp b/src/modules/clist/clcutils.cpp index 3e7b82b370..1f6b07e04c 100644 --- a/src/modules/clist/clcutils.cpp +++ b/src/modules/clist/clcutils.cpp @@ -372,7 +372,7 @@ int fnFindRowByText(HWND hwnd, struct ClcData *dat, const TCHAR *text, int prefi TCHAR *lowered_text = CharLowerW(NEWTSTR_ALLOCA(text)); show = _tcsstr(lowered_szText, lowered_text) != NULL; } - else show = ((prefixOk && !_tcsnicmp(text, group->cl.items[group->scanIndex]->szText, testlen)) || (!prefixOk && !lstrcmpi(text, group->cl.items[group->scanIndex]->szText))); + else show = ((prefixOk && !_tcsnicmp(text, group->cl.items[group->scanIndex]->szText, testlen)) || (!prefixOk && !mir_tstrcmpi(text, group->cl.items[group->scanIndex]->szText))); if (show) { ClcGroup *contactGroup = group; @@ -407,7 +407,7 @@ void fnEndRename(HWND, struct ClcData *dat, int save) ClcContact *contact; if (cli.pfnGetRowByIndex(dat, dat->selection, &contact, NULL) != -1) { - if (lstrcmp(contact->szText, text) && !_tcsstr(text, _T("\\"))) { + if (mir_tstrcmp(contact->szText, text) && !_tcsstr(text, _T("\\"))) { if (contact->type == CLCIT_GROUP) { if (contact->group->parent && contact->group->parent->parent) { TCHAR szFullName[256]; @@ -421,7 +421,7 @@ void fnEndRename(HWND, struct ClcData *dat, int save) else if (contact->type == CLCIT_CONTACT) { cli.pfnInvalidateDisplayNameCacheEntry(contact->hContact); TCHAR* otherName = cli.pfnGetContactDisplayName(contact->hContact, GCDNF_NOMYHANDLE); - if (!text[0] || !lstrcmp(otherName, text)) + if (!text[0] || !mir_tstrcmp(otherName, text)) db_unset(contact->hContact, "CList", "MyHandle"); else db_set_ts(contact->hContact, "CList", "MyHandle", text); diff --git a/src/modules/clist/clistevents.cpp b/src/modules/clist/clistevents.cpp index f8bf6d9143..92397503c9 100644 --- a/src/modules/clist/clistevents.cpp +++ b/src/modules/clist/clistevents.cpp @@ -102,7 +102,7 @@ static void ShowEventsInTray() int j; for (j = 0; j < nTrayProtoCnt; j++) - if (iEventProto && pTrayProtos[j] && !lstrcmpA(pTrayProtos[j], iEventProto)) + if (iEventProto && pTrayProtos[j] && !mir_strcmp(pTrayProtos[j], iEventProto)) break; if (j >= nTrayProtoCnt) // event was not found so assume first icon j = 0; @@ -218,7 +218,7 @@ int fnRemoveEvent(MCONTACT hContact, HANDLE dbEvent) szEventProto = (char *)cli.events.items[i]->cle.lpszProtocol; else szEventProto = NULL; - if (szEventProto && szProto && !lstrcmpA(szEventProto, szProto)) + if (szEventProto && szProto && !mir_strcmp(szEventProto, szProto)) nSameProto++; } diff --git a/src/modules/clist/clistmenus.cpp b/src/modules/clist/clistmenus.cpp index 0a522dc9d2..0313c030bb 100644 --- a/src/modules/clist/clistmenus.cpp +++ b/src/modules/clist/clistmenus.cpp @@ -242,7 +242,7 @@ INT_PTR MainMenuExecService(WPARAM wParam, LPARAM lParam) lpMainMenuExecParam mmep = (lpMainMenuExecParam)wParam; if (mmep != NULL) { // bug in help.c, it used wparam as parent window handle without reason. - if (!lstrcmpA(mmep->szServiceName, "Help/AboutCommand")) + if (!mir_strcmp(mmep->szServiceName, "Help/AboutCommand")) mmep->Param1 = 0; CallService(mmep->szServiceName, mmep->Param1, lParam); @@ -796,7 +796,7 @@ int fnGetProtoIndexByPos(PROTOCOLDESCRIPTOR **proto, int protoCnt, int Pos) DBVARIANT dbv; if (!db_get_s(NULL, "Protocols", buf, &dbv)) { for (int p=0; p < protoCnt; p++) { - if (lstrcmpA(proto[p]->szName, dbv.pszVal) == 0) { + if (mir_strcmp(proto[p]->szName, dbv.pszVal) == 0) { db_free(&dbv); return p; } @@ -1078,7 +1078,7 @@ static int MenuProtoAck(WPARAM, LPARAM lParam) } for (int i=0; i < accounts.getCount(); i++) { - if (!lstrcmpA(accounts[i]->szModuleName, ack->szModule)) { + if (!mir_strcmp(accounts[i]->szModuleName, ack->szModule)) { if (((int)ack->hProcess >= ID_STATUS_OFFLINE || (int)ack->hProcess == 0) && (int)ack->hProcess < ID_STATUS_OFFLINE + SIZEOF(statusModeList)) { int pos = statustopos((int)ack->hProcess); if (pos == -1) @@ -1131,11 +1131,11 @@ int fnConvertMenu(CLISTMENUITEM* mi, TMO_MenuItem* pmi) static MenuProto* FindProtocolMenu(const char* proto) { for (int i=0; i < cli.menuProtoCount; i++) - if (cli.menuProtos[i].pMenu && !lstrcmpiA(cli.menuProtos[i].szProto, proto)) + if (cli.menuProtos[i].pMenu && !mir_strcmpi(cli.menuProtos[i].szProto, proto)) return &cli.menuProtos[i]; if (cli.menuProtoCount == 1) - if (!lstrcmpiA(cli.menuProtos[0].szProto, proto)) + if (!mir_strcmpi(cli.menuProtos[0].szProto, proto)) return &cli.menuProtos[0]; return NULL; diff --git a/src/modules/clist/clisttray.cpp b/src/modules/clist/clisttray.cpp index 4edff9c697..2bfbb8906d 100644 --- a/src/modules/clist/clisttray.cpp +++ b/src/modules/clist/clisttray.cpp @@ -200,7 +200,7 @@ void fnTrayIconRemove(HWND hwnd, const char *szProto) mir_cslock lck(trayLockCS); for (int i = 0; i < cli.trayIconCount; i++) { struct trayIconInfo_t* pii = &cli.trayIcon[i]; - if (pii->id != 0 && !lstrcmpA(szProto, pii->szProto)) { + if (pii->id != 0 && !mir_strcmp(szProto, pii->szProto)) { NOTIFYICONDATA nid = { SIZEOFNID }; nid.hWnd = hwnd; nid.uID = pii->id; @@ -334,7 +334,7 @@ int fnTrayIconUpdate(HICON hNewIcon, const TCHAR *szNewTip, const char *szPrefer for (i = 0; i < cli.trayIconCount; i++) { if (cli.trayIcon[i].id == 0) continue; - if (lstrcmpA(cli.trayIcon[i].szProto, szPreferredProto)) + if (mir_strcmp(cli.trayIcon[i].szProto, szPreferredProto)) continue; nid.uID = cli.trayIcon[i].id; @@ -402,7 +402,7 @@ LBL_Error: for (int i = 0; i < cli.trayIconCount; i++) { if (cli.trayIcon[i].id == 0) continue; - if (lstrcmpA(cli.trayIcon[i].szProto, szPreferredProto)) + if (mir_strcmp(cli.trayIcon[i].szProto, szPreferredProto)) continue; DestroyIcon(cli.trayIcon[i].hBaseIcon); @@ -473,7 +473,7 @@ void fnTrayIconUpdateBase(const char *szChangedProto) } for (int i = 0; i < accounts.getCount(); i++) - if (!lstrcmpA(szChangedProto, accounts[i]->szModuleName)) + if (!mir_strcmp(szChangedProto, accounts[i]->szModuleName)) cli.cycleStep = i; int changed = cli.pfnTrayCalcChanged(szChangedProto, averageMode, netProtoCount); @@ -540,7 +540,7 @@ void fnTrayIconSetToBase(char *szPreferredProto) for (i = 0; i < cli.trayIconCount; i++) { if (cli.trayIcon[i].id == 0) continue; - if (lstrcmpA(cli.trayIcon[i].szProto, szPreferredProto)) + if (mir_strcmp(cli.trayIcon[i].szProto, szPreferredProto)) continue; cli.pfnTrayIconUpdate(cli.trayIcon[i].hBaseIcon, NULL, szPreferredProto, 1); return; diff --git a/src/modules/clist/clui.cpp b/src/modules/clist/clui.cpp index b3be884dbc..eacb1ec87b 100644 --- a/src/modules/clist/clui.cpp +++ b/src/modules/clist/clui.cpp @@ -90,7 +90,7 @@ static int MenuItem_PreBuild(WPARAM, LPARAM) TCHAR cls[128]; HWND hwndClist = GetFocus(); GetClassName(hwndClist, cls, SIZEOF(cls)); - hwndClist = (!lstrcmp( _T(CLISTCONTROL_CLASS), cls)) ? hwndClist : cli.hwndContactList; + hwndClist = (!mir_tstrcmp( _T(CLISTCONTROL_CLASS), cls)) ? hwndClist : cli.hwndContactList; HANDLE hItem = (HANDLE)SendMessage(hwndClist, CLM_GETSELECTION, 0, 0); Menu_ShowItem(hRenameMenuItem, hItem != 0); return 0; @@ -102,7 +102,7 @@ static INT_PTR MenuItem_RenameContact(WPARAM, LPARAM) HWND hwndClist = GetFocus(); GetClassName(hwndClist, cls, SIZEOF(cls)); // worst case scenario, the rename is sent to the main contact list - hwndClist = (!lstrcmp( _T(CLISTCONTROL_CLASS), cls)) ? hwndClist : cli.hwndContactList; + hwndClist = (!mir_tstrcmp( _T(CLISTCONTROL_CLASS), cls)) ? hwndClist : cli.hwndContactList; HANDLE hItem = (HANDLE)SendMessage(hwndClist, CLM_GETSELECTION, 0, 0); if (hItem) { SetFocus(hwndClist); @@ -413,7 +413,7 @@ LRESULT CALLBACK fnContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM int rc; // wParam = (ATOM)hProfileAtom, lParam = 0 if (GlobalGetAtomName((ATOM) wParam, profile, SIZEOF(profile))) { - rc = lstrcmpi(profile, VARST(_T("%miranda_userdata%\\%miranda_profilename%.dat"))) == 0; + rc = mir_tstrcmpi(profile, VARST(_T("%miranda_userdata%\\%miranda_profilename%.dat"))) == 0; ReplyMessage(rc); if (rc) { ShowWindow(hwnd, SW_RESTORE); diff --git a/src/modules/clist/cluiservices.cpp b/src/modules/clist/cluiservices.cpp index 2579de60bc..8695adcb42 100644 --- a/src/modules/clist/cluiservices.cpp +++ b/src/modules/clist/cluiservices.cpp @@ -44,7 +44,7 @@ static INT_PTR GroupAdded(WPARAM wParam, LPARAM lParam) HWND hwndFocus = GetFocus(); GetClassName(hwndFocus, szFocusClass, SIZEOF(szFocusClass)); - if (!lstrcmp(szFocusClass, _T(CLISTCONTROL_CLASS))) { + if (!mir_tstrcmp(szFocusClass, _T(CLISTCONTROL_CLASS))) { hItem = (HANDLE) SendMessage(hwndFocus, CLM_FINDGROUP, wParam, 0); if (hItem) SendMessage(hwndFocus, CLM_EDITLABEL, (WPARAM) hItem, 0); diff --git a/src/modules/clist/contact.cpp b/src/modules/clist/contact.cpp index c25e997f4a..59426dbbb9 100644 --- a/src/modules/clist/contact.cpp +++ b/src/modules/clist/contact.cpp @@ -105,7 +105,7 @@ int fnCompareContacts(const ClcContact* c1, const ClcContact* c2) } /* both are online, now check protocols */ if (c1->proto != NULL && c2->proto != NULL) { - rc = lstrcmpA(c1->proto, c2->proto); + rc = mir_strcmp(c1->proto, c2->proto); if (rc != 0) return rc; } diff --git a/src/modules/clist/genmenu.cpp b/src/modules/clist/genmenu.cpp index bb5e533ff4..f3ac197a5c 100644 --- a/src/modules/clist/genmenu.cpp +++ b/src/modules/clist/genmenu.cpp @@ -51,7 +51,7 @@ static void DumpMenuItem(TMO_IntMenuItem* pParent, int level = 0) static int CompareMenus(const TIntMenuObject* p1, const TIntMenuObject* p2) { - return lstrcmpA(p1->pszName, p2->pszName); + return mir_strcmp(p1->pszName, p2->pszName); } LIST g_menus(10, CompareMenus); @@ -249,7 +249,7 @@ INT_PTR MO_GetProtoRootMenu(WPARAM wParam, LPARAM lParam) TIntMenuObject* pmo = g_menus[objidx]; for (PMO_IntMenuItem p = pmo->m_items.first; p != NULL; p = p->next) - if (!lstrcmpA(p->UniqName, szProto)) + if (!mir_strcmp(p->UniqName, szProto)) return (INT_PTR)p; return NULL; diff --git a/src/modules/clist/genmenuopt.cpp b/src/modules/clist/genmenuopt.cpp index 79e461b6c4..723bc73878 100644 --- a/src/modules/clist/genmenuopt.cpp +++ b/src/modules/clist/genmenuopt.cpp @@ -108,7 +108,7 @@ static int SaveTree(HWND hwndDlg) mir_snprintf(DBString, SIZEOF(DBString), "%s_name", menuItemName); if (iod->name != NULL && iod->defname != NULL && - lstrcmp(iod->name, iod->defname) != 0) + mir_tstrcmp(iod->name, iod->defname) != 0) db_set_ts(NULL, MenuNameItems, DBString, iod->name); else db_unset(NULL, MenuNameItems, DBString); @@ -718,7 +718,7 @@ static INT_PTR CALLBACK GenMenuOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA if (iod->pimi->submenu.first == NULL && iod->uniqname) SetDlgItemTextA(hwndDlg, IDC_GENMENU_SERVICE, iod->uniqname); - EnableWindow( GetDlgItem(hwndDlg, IDC_GENMENU_DEFAULT), lstrcmp(iod->name, iod->defname) != 0); + EnableWindow( GetDlgItem(hwndDlg, IDC_GENMENU_DEFAULT), mir_tstrcmp(iod->name, iod->defname) != 0); EnableWindow( GetDlgItem(hwndDlg, IDC_GENMENU_SET), TRUE); EnableWindow( GetDlgItem(hwndDlg, IDC_GENMENU_CUSTOMNAME), TRUE); break; diff --git a/src/modules/clist/groups.cpp b/src/modules/clist/groups.cpp index e27699662a..716f9418ac 100644 --- a/src/modules/clist/groups.cpp +++ b/src/modules/clist/groups.cpp @@ -294,7 +294,7 @@ static int RenameGroupWithMove(int groupId, const TCHAR *szName, int move) //must rename setting in all child contacts too for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) { ClcCacheEntry *cache = cli.pfnGetCacheEntry(hContact); - if (!lstrcmp(cache->tszGroup, oldName)) { + if (!mir_tstrcmp(cache->tszGroup, oldName)) { db_set_ts(hContact, "CList", "Group", szName); mir_free(cache->tszGroup); cache->tszGroup = 0; @@ -335,7 +335,7 @@ static int RenameGroupWithMove(int groupId, const TCHAR *szName, int move) _itoa(i, idstr, 10); if (db_get_ts(NULL, "CListGroups", idstr, &dbv)) break; - if (!lstrcmp(dbv.ptszVal + 1, str)) { + if (!mir_tstrcmp(dbv.ptszVal + 1, str)) { if (i < groupId) break; //is OK MoveGroupBefore(groupId + 1, i + 2); @@ -502,7 +502,7 @@ static INT_PTR BuildGroupMenu(WPARAM, LPARAM) mii.cch = SIZEOF(szThisMenuItem); mii.dwTypeData = szThisMenuItem; GetMenuItemInfo(hThisMenu, menuId, TRUE, &mii); - compareResult = lstrcmp(szThisField, szThisMenuItem); + compareResult = mir_tstrcmp(szThisField, szThisMenuItem); if (compareResult == 0) { if (pNextField == NULL) { mii.fMask = MIIM_DATA; -- cgit v1.2.3