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() --- src/core/stdmsg/src/cmdlist.cpp | 2 +- src/core/stduihist/src/history.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core') diff --git a/src/core/stdmsg/src/cmdlist.cpp b/src/core/stdmsg/src/cmdlist.cpp index 356d7ad6f0..78815ef42b 100644 --- a/src/core/stdmsg/src/cmdlist.cpp +++ b/src/core/stdmsg/src/cmdlist.cpp @@ -95,7 +95,7 @@ void msgQueue_processack(MCONTACT hContact, int id, BOOL success, LPARAM lParam) dbei.szModule = Proto_GetBaseAccountName(hContact); dbei.timestamp = time(0); dbei.cbBlob = (uint32_t)(mir_strlen(p->szMsg) + 1); - dbei.pBlob = (uint8_t*)p->szMsg; + dbei.pBlob = p->szMsg; dbei.szId = (char *)lParam; MessageWindowEvent evt = { id, hContact, &dbei }; diff --git a/src/core/stduihist/src/history.cpp b/src/core/stduihist/src/history.cpp index 2e59abcf9e..c886b4f341 100644 --- a/src/core/stduihist/src/history.cpp +++ b/src/core/stduihist/src/history.cpp @@ -303,7 +303,7 @@ static INT_PTR CALLBACK DlgProcHistory(HWND hwndDlg, UINT msg, WPARAM wParam, LP int newBlobSize = db_event_getBlobSize(hDbEvent); if (newBlobSize > oldBlobSize) { - dbei.pBlob = (uint8_t*)mir_realloc(dbei.pBlob, newBlobSize); + dbei.pBlob = (char *)mir_realloc(dbei.pBlob, newBlobSize); oldBlobSize = newBlobSize; } dbei.cbBlob = oldBlobSize; -- cgit v1.2.3