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/IEHistory/src/dlgHandlers.cpp | 12 ++++++------ plugins/IEHistory/src/utils.cpp | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'plugins/IEHistory/src') diff --git a/plugins/IEHistory/src/dlgHandlers.cpp b/plugins/IEHistory/src/dlgHandlers.cpp index 4fcab2bdf9..7d8e8a62da 100644 --- a/plugins/IEHistory/src/dlgHandlers.cpp +++ b/plugins/IEHistory/src/dlgHandlers.cpp @@ -114,7 +114,7 @@ int DestroyIEView(HWND hWnd) return 0; } -void FillIEViewInfo(IEVIEWEVENTDATA *fillData, DBEVENTINFO dbInfo, PBYTE blob) +void FillIEViewInfo(IEVIEWEVENTDATA *fillData, DBEVENTINFO dbInfo, uint8_t *blob) { switch (dbInfo.eventType) { case EVENTTYPE_MESSAGE: @@ -133,7 +133,7 @@ void FillIEViewInfo(IEVIEWEVENTDATA *fillData, DBEVENTINFO dbInfo, PBYTE blob) fillData->dwFlags = (dbInfo.flags & DBEF_SENT) ? IEEDF_SENT : 0; fillData->time = dbInfo.timestamp; size_t len = mir_strlen((char *)blob) + 1; - PBYTE pos; + uint8_t *pos; fillData->szText.a = (char *)blob; if (len < dbInfo.cbBlob) { @@ -154,7 +154,7 @@ DWORD WINAPI WorkerThread(LPVOID lpvData) int cLoad = LOAD_COUNT; int i; IEVIEWEVENTDATA ieData[LOAD_COUNT] = { 0 }; - PBYTE messages[LOAD_COUNT] = {}; + uint8_t *messages[LOAD_COUNT] = {}; MEVENT dbEvent = data->ieEvent.hDbEventFirst; for (i = 0; i < LOAD_COUNT; i++) ieData[i].next = &ieData[i + 1]; //it's a vector, so v[i]'s next element is v[i + 1] @@ -164,7 +164,7 @@ DWORD WINAPI WorkerThread(LPVOID lpvData) ieEvent.iType = IEE_LOG_MEM_EVENTS; ieEvent.eventData = ieData; DBEVENTINFO dbInfo = {}; - PBYTE buffer = nullptr; + uint8_t *buffer = nullptr; int newSize, oldSize = 0; while (count < target) { cLoad = (count + LOAD_COUNT > target) ? target - count : LOAD_COUNT; @@ -173,11 +173,11 @@ DWORD WINAPI WorkerThread(LPVOID lpvData) for (i = 0; i < cLoad; i++) { newSize = db_event_getBlobSize(dbEvent); if (newSize > oldSize) { - buffer = (PBYTE)realloc(buffer, newSize); + buffer = (uint8_t*)realloc(buffer, newSize); dbInfo.pBlob = buffer; oldSize = newSize; } - messages[i] = (PBYTE)realloc(messages[i], newSize); + messages[i] = (uint8_t*)realloc(messages[i], newSize); dbInfo.cbBlob = newSize; if (!db_event_get(dbEvent, &dbInfo)) { memcpy(messages[i], dbInfo.pBlob, newSize); diff --git a/plugins/IEHistory/src/utils.cpp b/plugins/IEHistory/src/utils.cpp index 4497163ab4..8084269bea 100644 --- a/plugins/IEHistory/src/utils.cpp +++ b/plugins/IEHistory/src/utils.cpp @@ -135,7 +135,7 @@ SearchResult SearchHistory(MCONTACT contact, MEVENT hFirstEvent, void *searchDat buffer = (wchar_t *)realloc(buffer, newSize); oldSize = newSize; } - dbEvent.pBlob = (PBYTE)buffer; + dbEvent.pBlob = (uint8_t*)buffer; dbEvent.cbBlob = newSize; if (db_event_get(hEvent, &dbEvent) == 0) { //successful switch (type) { -- cgit v1.2.3