From 760347687945fcd50e46ebcefc666359258f8579 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 18 Sep 2019 19:39:31 +0300 Subject: m_ieview.h: code cleaning --- plugins/IEHistory/src/dlgHandlers.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'plugins/IEHistory/src') diff --git a/plugins/IEHistory/src/dlgHandlers.cpp b/plugins/IEHistory/src/dlgHandlers.cpp index 441495a4f6..3feef25f7b 100644 --- a/plugins/IEHistory/src/dlgHandlers.cpp +++ b/plugins/IEHistory/src/dlgHandlers.cpp @@ -131,19 +131,17 @@ void FillIEViewInfo(IEVIEWEVENTDATA *fillData, DBEVENTINFO dbInfo, PBYTE blob) break; } - fillData->pszNick = ""; + fillData->szNick.a = ""; fillData->bIsMe = (dbInfo.flags & DBEF_SENT); fillData->dwFlags = (dbInfo.flags & DBEF_SENT) ? IEEDF_SENT : 0; fillData->time = dbInfo.timestamp; size_t len = mir_strlen((char *)blob) + 1; PBYTE pos; - fillData->pszText = (char *)blob; - // fillData.pszText2 = (char *) blob; + fillData->szText.a = (char *)blob; if (len < dbInfo.cbBlob) { pos = blob + len; - fillData->pszTextW = (wchar_t *)pos; - // fillData->pszText2W = (wchar_t *) pos; + fillData->szText.w = (wchar_t *)pos; fillData->dwFlags |= IEEDF_UNICODE_TEXT; } } @@ -161,10 +159,9 @@ DWORD WINAPI WorkerThread(LPVOID lpvData) IEVIEWEVENTDATA ieData[LOAD_COUNT] = { 0 }; PBYTE messages[LOAD_COUNT] = {}; MEVENT dbEvent = data->ieEvent.hDbEventFirst; - for (i = 0; i < LOAD_COUNT; i++) { - ieData[i].cbSize = sizeof(IEVIEWEVENTDATA); //set the cbsize here, no need to do it every time + 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] - } + ieData[LOAD_COUNT - 1].next = nullptr; IEVIEWEVENT ieEvent = data->ieEvent; ieEvent.iType = IEE_LOG_MEM_EVENTS; -- cgit v1.2.3