From fcbb395dc7ff3edab972b6d4b27dbbfb3305f5d7 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 26 Dec 2021 15:58:40 +0300 Subject: PBYTE -> uint8_t* --- plugins/TabSRMM/src/globals.cpp | 2 +- plugins/TabSRMM/src/sendlater.cpp | 6 +++--- plugins/TabSRMM/src/sendqueue.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/TabSRMM') diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp index ca14910848..150faf6c00 100644 --- a/plugins/TabSRMM/src/globals.cpp +++ b/plugins/TabSRMM/src/globals.cpp @@ -529,7 +529,7 @@ void CGlobals::logStatusChange(WPARAM wParam, const CContactCache *c) T2Utf szMsg(text); DBEVENTINFO dbei = {}; - dbei.pBlob = (PBYTE)(char*)szMsg; + dbei.pBlob = (uint8_t*)(char*)szMsg; dbei.cbBlob = (int)mir_strlen(szMsg) + 1; dbei.flags = DBEF_UTF | DBEF_READ; dbei.eventType = EVENTTYPE_STATUSCHANGE; diff --git a/plugins/TabSRMM/src/sendlater.cpp b/plugins/TabSRMM/src/sendlater.cpp index c850592ec7..ed73a491b9 100644 --- a/plugins/TabSRMM/src/sendlater.cpp +++ b/plugins/TabSRMM/src/sendlater.cpp @@ -58,7 +58,7 @@ struct CSendLaterJob : public MZeroedObject time_t created; // job was created at this time (important to kill jobs, that are too old) time_t lastSent; // time at which the delivery was initiated. used to handle timeouts char *sendBuffer; // utf-8 send buffer - PBYTE pBuf; // conventional send buffer (for non-utf8 protocols) + uint8_t *pBuf; // conventional send buffer (for non-utf8 protocols) DWORD dwFlags; int iSendCount; // # of times we tried to send it... bool fSuccess, fFailed; @@ -731,7 +731,7 @@ int SendLater::addJob(const char *szSetting, void *lParam) if (szWchar) required += (mir_wstrlen(szWchar) + 1) * sizeof(wchar_t); - job->pBuf = (PBYTE)mir_calloc(required); + job->pBuf = (uint8_t*)mir_calloc(required); strncpy((char*)job->pBuf, szAnsi, iLen); job->pBuf[iLen] = 0; @@ -793,7 +793,7 @@ HANDLE SendLater::processAck(const ACKDATA *ack) dbei.szModule = Proto_GetBaseAccountName((p->hContact)); dbei.timestamp = time(0); dbei.cbBlob = (int)mir_strlen(p->sendBuffer) + 1; - dbei.pBlob = (PBYTE)(p->sendBuffer); + dbei.pBlob = (uint8_t*)(p->sendBuffer); db_event_add(p->hContact, &dbei); p->cleanDB(); diff --git a/plugins/TabSRMM/src/sendqueue.cpp b/plugins/TabSRMM/src/sendqueue.cpp index d84e158d22..cb52ecc8a8 100644 --- a/plugins/TabSRMM/src/sendqueue.cpp +++ b/plugins/TabSRMM/src/sendqueue.cpp @@ -471,7 +471,7 @@ int SendQueue::ackMessage(CMsgDialog *dat, WPARAM wParam, LPARAM lParam) if (job.dwFlags & PREF_RTL) dbei.flags |= DBEF_RTL; - dbei.pBlob = (PBYTE)job.szSendBuffer; + dbei.pBlob = (uint8_t*)job.szSendBuffer; dbei.szId = (char *)ack->lParam; MessageWindowEvent evt = { job.iSendId, job.hContact, &dbei }; @@ -550,7 +550,7 @@ int SendQueue::doSendLater(int iJobIndex, CMsgDialog *dat, MCONTACT hContact, bo dbei.szModule = Proto_GetBaseAccountName(dat->m_hContact); dbei.timestamp = time(0); dbei.cbBlob = (int)mir_strlen(utfText) + 1; - dbei.pBlob = (PBYTE)(char*)utfText; + dbei.pBlob = (uint8_t*)(char*)utfText; dat->LogEvent(dbei); if (dat->m_hDbEventFirst == 0) -- cgit v1.2.3