From e96132b4d5344d2d58d247906bcaefccfb9d5253 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 20 Dec 2023 13:34:45 +0300 Subject: DBEVENTINFO::hContact to be returned inside an event, no need to call db_event_getContact() just after db_event_get() --- protocols/VKontakte/src/misc.cpp | 6 +++--- protocols/VKontakte/src/vk_messages.cpp | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'protocols/VKontakte/src') diff --git a/protocols/VKontakte/src/misc.cpp b/protocols/VKontakte/src/misc.cpp index eed2b096c8..977e215386 100644 --- a/protocols/VKontakte/src/misc.cpp +++ b/protocols/VKontakte/src/misc.cpp @@ -717,10 +717,10 @@ MCONTACT CVkProto::MContactFromDbEvent(MEVENT hDbEvent) if (!hDbEvent || !IsOnline()) return INVALID_CONTACT_ID; - uint32_t body[2]; + char body[2]; DBEVENTINFO dbei = {}; dbei.cbBlob = sizeof(uint32_t) * 2; - dbei.pBlob = (uint8_t*)&body; + dbei.pBlob = body; if (db_event_get(hDbEvent, &dbei)) return INVALID_CONTACT_ID; @@ -1839,7 +1839,7 @@ void CVkProto::AddVkDeactivateEvent(MCONTACT hContact, CMStringW& wszType) dbei.eventType = VK_USER_DEACTIVATE_ACTION; ptrA pszDescription(mir_utf8encode(vkDeactivateEvent[iDEIdx].szDescription)); dbei.cbBlob = (uint32_t)mir_strlen(pszDescription) + 1; - dbei.pBlob = (uint8_t*)mir_strdup(pszDescription); + dbei.pBlob = mir_strdup(pszDescription); dbei.flags = DBEF_UTF | ( ( m_vkOptions.bShowVkDeactivateEvents diff --git a/protocols/VKontakte/src/vk_messages.cpp b/protocols/VKontakte/src/vk_messages.cpp index 0a2f28db83..3549a77a8b 100644 --- a/protocols/VKontakte/src/vk_messages.cpp +++ b/protocols/VKontakte/src/vk_messages.cpp @@ -57,10 +57,8 @@ int CVkProto::ForwardMsg(MCONTACT hContact, std::vector& vForvardEvents, if (!dbei || dbei.eventType != EVENTTYPE_MESSAGE) continue; - MCONTACT hForwardContact = db_event_getContact(mEvnt); - - if (!Proto_IsProtoOnContact(hForwardContact, m_szModuleName)) { - CMStringW wszContactName = (dbei.flags & DBEF_SENT) ? getWStringA(0, "Nick", TranslateT("Me")) : Clist_GetContactDisplayName(hForwardContact); + if (!Proto_IsProtoOnContact(dbei.hContact, m_szModuleName)) { + CMStringW wszContactName = (dbei.flags & DBEF_SENT) ? getWStringA(0, "Nick", TranslateT("Me")) : Clist_GetContactDisplayName(dbei.hContact); wchar_t ttime[64]; time_t tTimestamp(dbei.timestamp); -- cgit v1.2.3