From 1ea84dc56d95ceaf85c036127c5045eba0ad50ee Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 13 Aug 2015 17:08:34 +0000 Subject: massive name conflict resolution git-svn-id: http://svn.miranda-ng.org/main/trunk@14941 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/AimOscar/src/chat.cpp | 227 ++++++++++++++++++---------------------- 1 file changed, 100 insertions(+), 127 deletions(-) (limited to 'protocols/AimOscar/src/chat.cpp') diff --git a/protocols/AimOscar/src/chat.cpp b/protocols/AimOscar/src/chat.cpp index 9d43570ab6..3bf8adab9f 100644 --- a/protocols/AimOscar/src/chat.cpp +++ b/protocols/AimOscar/src/chat.cpp @@ -15,9 +15,10 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see . */ + #include "stdafx.h" -static const COLORREF crCols[16] = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15}; +static const COLORREF crCols[16] = { 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 }; void CAimProto::chat_register(void) { @@ -30,12 +31,12 @@ void CAimProto::chat_register(void) CallServiceSync(MS_GC_REGISTER, 0, (LPARAM)&gcr); HookProtoEvent(ME_GC_EVENT, &CAimProto::OnGCEvent); - HookProtoEvent(ME_GC_BUILDMENU, &CAimProto::OnGCMenuHook ); + HookProtoEvent(ME_GC_BUILDMENU, &CAimProto::OnGCMenuHook); } void CAimProto::chat_start(const char* id, unsigned short exchange) { - TCHAR* idt = mir_a2t(id); + TCHAR *idt = mir_a2t(id); GCSESSION gcw = { sizeof(gcw) }; gcw.iType = GCW_CHATROOM; @@ -55,8 +56,8 @@ void CAimProto::chat_start(const char* id, unsigned short exchange) gcd.iType = GC_EVENT_CONTROL; CallServiceSync(MS_GC_EVENT, SESSION_INITDONE, (LPARAM)&gce); - CallServiceSync(MS_GC_EVENT, SESSION_ONLINE, (LPARAM)&gce); - CallServiceSync(MS_GC_EVENT, WINDOW_VISIBLE, (LPARAM)&gce); + CallServiceSync(MS_GC_EVENT, SESSION_ONLINE, (LPARAM)&gce); + CallServiceSync(MS_GC_EVENT, WINDOW_VISIBLE, (LPARAM)&gce); setWord(find_chat_contact(id), "Exchange", exchange); @@ -65,11 +66,11 @@ void CAimProto::chat_start(const char* id, unsigned short exchange) void CAimProto::chat_event(const char* id, const char* sn, int evt, const TCHAR* msg) { - TCHAR* idt = mir_a2t(id); - TCHAR* snt = mir_a2t(sn); + TCHAR *idt = mir_a2t(id); + TCHAR *snt = mir_a2t(sn); MCONTACT hContact = contact_from_sn(sn); - TCHAR* nick = hContact ? (TCHAR*)pcli->pfnGetContactDisplayName( + TCHAR *nick = hContact ? (TCHAR*)pcli->pfnGetContactDisplayName( WPARAM(hContact), 0) : snt; GCDEST gcd = { m_szModuleName, idt, evt }; @@ -78,7 +79,7 @@ void CAimProto::chat_event(const char* id, const char* sn, int evt, const TCHAR* gce.pDest = &gcd; gce.ptszNick = nick; gce.ptszUID = snt; - gce.bIsMe = _stricmp(sn, username) == 0; + gce.bIsMe = _stricmp(sn, m_username) == 0; gce.ptszStatus = gce.bIsMe ? TranslateT("Me") : TranslateT("Others"); gce.ptszText = msg; gce.time = time(NULL); @@ -90,7 +91,7 @@ void CAimProto::chat_event(const char* id, const char* sn, int evt, const TCHAR* void CAimProto::chat_leave(const char* id) { - TCHAR* idt = mir_a2t(id); + TCHAR *idt = mir_a2t(id); GCDEST gcd = { m_szModuleName, idt, GC_EVENT_CONTROL }; GCEVENT gce = { sizeof(gce), &gcd }; @@ -102,97 +103,93 @@ void CAimProto::chat_leave(const char* id) } -int CAimProto::OnGCEvent(WPARAM, LPARAM lParam) +int CAimProto::OnGCEvent(WPARAM, LPARAM lParam) { - GCHOOK *gch = (GCHOOK*) lParam; + GCHOOK *gch = (GCHOOK*)lParam; if (!gch) return 1; if (mir_strcmp(gch->pDest->pszModule, m_szModuleName)) return 0; - char* id = mir_t2a(gch->pDest->ptszID); + char *id = mir_t2a(gch->pDest->ptszID); chat_list_item* item = find_chat_by_id(id); if (item == NULL) return 0; - switch (gch->pDest->iType) - { - case GC_SESSION_TERMINATE: - aim_sendflap(item->hconn,0x04,0,NULL,item->seqno); - Netlib_Shutdown(item->hconn); - break; + switch (gch->pDest->iType) { + case GC_SESSION_TERMINATE: + aim_sendflap(item->hconn, 0x04, 0, NULL, item->seqno); + Netlib_Shutdown(item->hconn); + break; - case GC_USER_MESSAGE: - if (gch->ptszText && mir_tstrlen(gch->ptszText)) - aim_chat_send_message(item->hconn, item->seqno, T2Utf(gch->ptszText)); - break; + case GC_USER_MESSAGE: + if (gch->ptszText && mir_tstrlen(gch->ptszText)) + aim_chat_send_message(item->hconn, item->seqno, T2Utf(gch->ptszText)); + break; + + case GC_USER_CHANMGR: + DialogBoxParam(hInstance, MAKEINTRESOURCE(IDD_CHATROOM_INVITE), NULL, invite_to_chat_dialog, + LPARAM(new invite_chat_param(item->id, this))); + break; + + case GC_USER_PRIVMESS: + { + char* sn = mir_t2a(gch->ptszUID); + MCONTACT hContact = contact_from_sn(sn); + mir_free(sn); + CallService(MS_MSG_SENDMESSAGE, hContact, 0); + } + break; - case GC_USER_CHANMGR: - DialogBoxParam(hInstance, MAKEINTRESOURCE(IDD_CHATROOM_INVITE), NULL, invite_to_chat_dialog, + case GC_USER_LOGMENU: + switch (gch->dwData) { + case 10: + DialogBoxParam(hInstance, MAKEINTRESOURCE(IDD_CHATROOM_INVITE), NULL, invite_to_chat_dialog, LPARAM(new invite_chat_param(item->id, this))); break; - case GC_USER_PRIVMESS: - { - char* sn = mir_t2a(gch->ptszUID); - MCONTACT hContact = contact_from_sn(sn); - mir_free(sn); - CallService(MS_MSG_SENDMESSAGE, hContact, 0); - } + case 20: + chat_leave(id); break; + } + break; + + case GC_USER_NICKLISTMENU: + { + char *sn = mir_t2a(gch->ptszUID); + MCONTACT hContact = contact_from_sn(sn); + mir_free(sn); - case GC_USER_LOGMENU: - switch(gch->dwData) - { + switch (gch->dwData) { case 10: - DialogBoxParam(hInstance, MAKEINTRESOURCE(IDD_CHATROOM_INVITE), NULL, invite_to_chat_dialog, - LPARAM(new invite_chat_param(item->id, this))); + CallService(MS_USERINFO_SHOWDIALOG, hContact, 0); break; case 20: + CallService(MS_HISTORY_SHOWCONTACTHISTORY, hContact, 0); + break; + + case 110: chat_leave(id); break; } - break; - - case GC_USER_NICKLISTMENU: - { - char *sn = mir_t2a(gch->ptszUID); - MCONTACT hContact = contact_from_sn(sn); - mir_free(sn); - - switch (gch->dwData) - { - case 10: - CallService(MS_USERINFO_SHOWDIALOG, hContact, 0); - break; - - case 20: - CallService(MS_HISTORY_SHOWCONTACTHISTORY, hContact, 0); - break; - - case 110: - chat_leave(id); - break; - } - } - break; + } + break; - case GC_USER_TYPNOTIFY: - break; + case GC_USER_TYPNOTIFY: + break; } mir_free(id); return 0; } -int CAimProto::OnGCMenuHook(WPARAM, LPARAM lParam) +int CAimProto::OnGCMenuHook(WPARAM, LPARAM lParam) { - GCMENUITEMS *gcmi= (GCMENUITEMS*)lParam; + GCMENUITEMS *gcmi = (GCMENUITEMS*)lParam; - if ( gcmi == NULL || _stricmp(gcmi->pszModule, m_szModuleName )) return 0; + if (gcmi == NULL || _stricmp(gcmi->pszModule, m_szModuleName)) return 0; - if ( gcmi->Type == MENU_ON_LOG ) - { + if (gcmi->Type == MENU_ON_LOG) { static const struct gc_item Items[] = { { TranslateT("&Invite user..."), 10, MENU_ITEM, FALSE }, { TranslateT("&Leave chat session"), 20, MENU_ITEM, FALSE } @@ -200,11 +197,9 @@ int CAimProto::OnGCMenuHook(WPARAM, LPARAM lParam) gcmi->nItems = _countof(Items); gcmi->Item = (gc_item*)Items; } - else if ( gcmi->Type == MENU_ON_NICKLIST ) - { + else if (gcmi->Type == MENU_ON_NICKLIST) { char* sn = mir_t2a(gcmi->pszUID); - if ( !mir_strcmp(username, sn)) - { + if (!mir_strcmp(m_username, sn)) { static const struct gc_item Items[] = { { TranslateT("User &details"), 10, MENU_ITEM, FALSE }, { TranslateT("User &history"), 20, MENU_ITEM, FALSE }, @@ -221,7 +216,7 @@ int CAimProto::OnGCMenuHook(WPARAM, LPARAM lParam) }; gcmi->nItems = _countof(Items); gcmi->Item = (gc_item*)Items; - } + } mir_free(sn); } @@ -229,69 +224,51 @@ int CAimProto::OnGCMenuHook(WPARAM, LPARAM lParam) } -void __cdecl CAimProto::chatnav_request_thread( void* param ) +void __cdecl CAimProto::chatnav_request_thread(void* param) { - chatnav_param* par = (chatnav_param*)param; + chatnav_param *par = (chatnav_param*)param; - if (wait_conn(hChatNavConn, hChatNavEvent, 0x0d)) - { + if (wait_conn(m_hChatNavConn, m_hChatNavEvent, 0x0d)) { if (par->isroom) - aim_chatnav_create(hChatNavConn, chatnav_seqno, par->id, par->exchange); + aim_chatnav_create(m_hChatNavConn, m_chatnav_seqno, par->id, par->exchange); else - aim_chatnav_room_info(hChatNavConn, chatnav_seqno, par->id, par->exchange, par->instance); + aim_chatnav_room_info(m_hChatNavConn, m_chatnav_seqno, par->id, par->exchange, par->instance); } delete par; } chat_list_item* CAimProto::find_chat_by_cid(unsigned short cid) { - chat_list_item* item = NULL; - for(int i=0; i