From b280d2eae93fb22b4fdb45218d8a06287a97030e Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 22 May 2015 12:49:22 +0000 Subject: replace _tcscmp to mir_tstrcmp git-svn-id: http://svn.miranda-ng.org/main/trunk@13753 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/SkypeClassic/src/alogon.cpp | 8 ++++---- protocols/SkypeClassic/src/contacts.cpp | 2 +- protocols/SkypeClassic/src/gchat.cpp | 12 ++++++------ 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'protocols/SkypeClassic') diff --git a/protocols/SkypeClassic/src/alogon.cpp b/protocols/SkypeClassic/src/alogon.cpp index 9ea57b5db6..3eedadc637 100644 --- a/protocols/SkypeClassic/src/alogon.cpp +++ b/protocols/SkypeClassic/src/alogon.cpp @@ -30,7 +30,7 @@ static HWND findWindow(HWND parent, const TCHAR* childClassName) // Get child window // This window is not combo box or edit box HWND wnd = GetWindow(parent, GW_CHILD); - while (wnd != NULL && _tcscmp(getClassName(wnd), childClassName) != 0) + while (wnd != NULL && mir_tstrcmp(getClassName(wnd), childClassName) != 0) wnd = GetWindow(wnd, GW_HWNDNEXT); return wnd; @@ -42,8 +42,8 @@ static BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam) GetWindowThreadProcessId(hWnd, &dwPID); if (lParam != 0 && dwPID != (DWORD)lParam) return TRUE; const TCHAR *lpszClassName = getClassName(hWnd); - if (_tcscmp(lpszClassName, _T("tSkMainForm.UnicodeClass")) == 0 || - _tcscmp(lpszClassName, _T("TLoginForm.UnicodeClass")) == 0) + if (mir_tstrcmp(lpszClassName, _T("tSkMainForm.UnicodeClass")) == 0 || + mir_tstrcmp(lpszClassName, _T("TLoginForm.UnicodeClass")) == 0) { HWND loginControl = GetWindow(hWnd, GW_CHILD); @@ -55,7 +55,7 @@ static BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam) LOG(("TLoginControl = %S", getClassName(loginControl))); // Check for login control - if (_tcscmp(getClassName(loginControl), _T("TLoginControl")) == 0) + if (mir_tstrcmp(getClassName(loginControl), _T("TLoginControl")) == 0) { // Find user name window HWND userName = findWindow(loginControl, _T("TNavigableTntComboBox.UnicodeClass")); diff --git a/protocols/SkypeClassic/src/contacts.cpp b/protocols/SkypeClassic/src/contacts.cpp index ed10c5d43a..2e00d5750a 100644 --- a/protocols/SkypeClassic/src/contacts.cpp +++ b/protocols/SkypeClassic/src/contacts.cpp @@ -346,7 +346,7 @@ MCONTACT find_contactT(TCHAR *name) if (db_get_b(hContact, SKYPE_PROTONAME, "ChatRoom", 0) == 0) { if (db_get_ts(hContact, SKYPE_PROTONAME, SKYPE_NAME, &dbv)) continue; - tCompareResult = _tcscmp(dbv.ptszVal, name); + tCompareResult = mir_tstrcmp(dbv.ptszVal, name); db_free(&dbv); if (tCompareResult) continue; return hContact; // already there, return handle diff --git a/protocols/SkypeClassic/src/gchat.cpp b/protocols/SkypeClassic/src/gchat.cpp index e59785a5e3..2d29dd6b86 100644 --- a/protocols/SkypeClassic/src/gchat.cpp +++ b/protocols/SkypeClassic/src/gchat.cpp @@ -42,7 +42,7 @@ static CRITICAL_SECTION m_GCMutex; */ gchat_contacts *GetChat(const TCHAR *szChatId) { for (int i=0;imJoinedCount;i++) - if (_tcscmp(gc->mJoinedContacts[i].who, who)==0) + if (mir_tstrcmp(gc->mJoinedContacts[i].who, who)==0) return i; return -1; } @@ -153,7 +153,7 @@ void RemChatContact(gchat_contacts *gc, const TCHAR *who) { if (!gc) return; for (int i=0;imJoinedCount;i++) - if (_tcscmp(gc->mJoinedContacts[i].who, who)==0) { + if (mir_tstrcmp(gc->mJoinedContacts[i].who, who)==0) { if (i<--gc->mJoinedCount) memmove(&gc->mJoinedContacts[i], &gc->mJoinedContacts[i+1], (gc->mJoinedCount-i)*sizeof(gchat_contact)); if (gc->mJoinedCount) gc->mJoinedContacts = (gchat_contact*)realloc(gc->mJoinedContacts, sizeof(gchat_contact)*gc->mJoinedCount); @@ -168,7 +168,7 @@ MCONTACT find_chat(LPCTSTR chatname) { { DBVARIANT dbv; if (!db_get_ts(hContact, SKYPE_PROTONAME, "ChatRoomID", &dbv)) { - int tCompareResult = _tcscmp(dbv.ptszVal, chatname); + int tCompareResult = mir_tstrcmp(dbv.ptszVal, chatname); db_free(&dbv); if (!tCompareResult) return hContact; // already there, return handle @@ -768,7 +768,7 @@ int __cdecl GCMenuHook(WPARAM,LPARAM lParam) { else { TCHAR *szChatRole; if (szChatRole = SkypeGetT ("CHAT", gcmi->pszID, "MYROLE")) { - if (_tcscmp(szChatRole, _T("MASTER")) && _tcscmp(szChatRole, _T("CREATOR"))) + if (mir_tstrcmp(szChatRole, _T("MASTER")) && mir_tstrcmp(szChatRole, _T("CREATOR"))) Item_nicklist[2].bDisabled = TRUE; free (szChatRole); } -- cgit v1.2.3