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/IEView/src/ChatHTMLBuilder.cpp | 8 ++--- plugins/IEView/src/HTMLBuilder.cpp | 49 +++++++++++++----------------- plugins/IEView/src/HistoryHTMLBuilder.cpp | 8 ++--- plugins/IEView/src/IEView.cpp | 10 ++---- plugins/IEView/src/MUCCHTMLBuilder.cpp | 16 +++++----- plugins/IEView/src/ScriverHTMLBuilder.cpp | 8 ++--- plugins/IEView/src/TabSRMMHTMLBuilder.cpp | 8 ++--- plugins/IEView/src/TemplateHTMLBuilder.cpp | 12 ++++---- 8 files changed, 54 insertions(+), 65 deletions(-) (limited to 'plugins/IEView/src') diff --git a/plugins/IEView/src/ChatHTMLBuilder.cpp b/plugins/IEView/src/ChatHTMLBuilder.cpp index 9e8b8cc5a7..33f0f9e1f1 100644 --- a/plugins/IEView/src/ChatHTMLBuilder.cpp +++ b/plugins/IEView/src/ChatHTMLBuilder.cpp @@ -170,14 +170,14 @@ void ChatHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event) ptrA szName, szText; if (eventData->dwFlags & IEEDF_UNICODE_TEXT) - szText = encodeUTF8(NULL, event->pszProto, eventData->pszTextW, ENF_ALL | ENF_CHAT_FORMATTING, isSent); + szText = encodeUTF8(NULL, event->pszProto, eventData->szText.w, ENF_ALL | ENF_CHAT_FORMATTING, isSent); else - szText = encodeUTF8(NULL, event->pszProto, (char *)eventData->pszText, ENF_ALL | ENF_CHAT_FORMATTING, isSent); + szText = encodeUTF8(NULL, event->pszProto, eventData->szText.a, ENF_ALL | ENF_CHAT_FORMATTING, isSent); if (eventData->dwFlags & IEEDF_UNICODE_NICK) - szName = encodeUTF8(NULL, event->pszProto, eventData->pszNickW, ENF_NAMESMILEYS, true); + szName = encodeUTF8(NULL, event->pszProto, eventData->szNick.w, ENF_NAMESMILEYS, true); else - szName = encodeUTF8(NULL, event->pszProto, (char *)eventData->pszNick, ENF_NAMESMILEYS, true); + szName = encodeUTF8(NULL, event->pszProto, eventData->szNick.a, ENF_NAMESMILEYS, true); if (eventData->iType == IEED_GC_EVENT_MESSAGE) { iconFile = isSent ? "message_out_chat.gif" : "message_in_chat.gif"; diff --git a/plugins/IEView/src/HTMLBuilder.cpp b/plugins/IEView/src/HTMLBuilder.cpp index e8aaaf2119..5995a342b3 100644 --- a/plugins/IEView/src/HTMLBuilder.cpp +++ b/plugins/IEView/src/HTMLBuilder.cpp @@ -25,7 +25,6 @@ int HTMLBuilder::mimFlags = 0; HTMLBuilder::HTMLBuilder() { - lastIEViewEvent.cbSize = sizeof(IEVIEWEVENT); lastIEViewEvent.iType = IEE_LOG_MEM_EVENTS; lastIEViewEvent.codepage = CP_ACP; lastIEViewEvent.pszProto = nullptr; @@ -228,7 +227,7 @@ void HTMLBuilder::appendEventOld(IEView *view, IEVIEWEVENT *event) event->hDbEventFirst = NULL; ptrA szProto; - if (event->cbSize >= IEVIEWEVENT_SIZE_V3 && event->pszProto != nullptr) + if (event->pszProto != nullptr) szProto = mir_strdup(event->pszProto); else szProto = getProto(event->hContact); @@ -236,8 +235,7 @@ void HTMLBuilder::appendEventOld(IEView *view, IEVIEWEVENT *event) IEVIEWEVENT newEvent = { sizeof(IEVIEWEVENT) }; newEvent.iType = IEE_LOG_MEM_EVENTS; newEvent.codepage = CP_ACP; - if (event->cbSize >= IEVIEWEVENT_SIZE_V2) - newEvent.codepage = event->codepage; + newEvent.codepage = event->codepage; newEvent.pszProto = szProto; newEvent.count = 0; newEvent.dwFlags = event->dwFlags; @@ -263,55 +261,53 @@ void HTMLBuilder::appendEventOld(IEView *view, IEVIEWEVENT *event) hDbEvent = db_event_next(event->hContact, hDbEvent); continue; } + IEVIEWEVENTDATA *eventData = new IEVIEWEVENTDATA; - eventData->cbSize = sizeof(IEVIEWEVENTDATA); eventData->dwFlags = IEEDF_UNICODE_TEXT | IEEDF_UNICODE_NICK | IEEDF_UNICODE_TEXT2 | (dbei.flags & DBEF_READ ? IEEDF_READ : 0) | (dbei.flags & DBEF_SENT ? IEEDF_SENT : 0) | (dbei.flags & DBEF_RTL ? IEEDF_RTL : 0); if (event->dwFlags & IEEF_RTL) eventData->dwFlags |= IEEDF_RTL; eventData->time = dbei.timestamp; - eventData->pszNickW = nullptr; - eventData->pszTextW = nullptr; - eventData->pszText2W = nullptr; + eventData->szNick.a = eventData->szText.a = eventData->szText2.a = nullptr; if (dbei.flags & DBEF_SENT) { - eventData->pszNickW = getContactName(NULL, szProto); + eventData->szNick.w = getContactName(NULL, szProto); eventData->bIsMe = TRUE; } else { - eventData->pszNickW = getContactName(event->hContact, szProto); + eventData->szNick.w = getContactName(event->hContact, szProto); eventData->bIsMe = FALSE; } if (dbei.eventType == EVENTTYPE_MESSAGE || Utils::DbEventIsForMsgWindow(&dbei)) { - eventData->pszTextW = DbEvent_GetTextW(&dbei, newEvent.codepage); + eventData->szText.w = DbEvent_GetTextW(&dbei, newEvent.codepage); if (dbei.eventType == EVENTTYPE_MESSAGE) eventData->iType = IEED_EVENT_MESSAGE; else eventData->iType = IEED_EVENT_STATUSCHANGE; } else if (dbei.eventType == EVENTTYPE_FILE) { - //blob is: sequenceid(DWORD),filename(ASCIIZ),description(ASCIIZ) + // blob is: sequenceid(DWORD),filename(ASCIIZ),description(ASCIIZ) char* filename = ((char *)dbei.pBlob) + sizeof(DWORD); char* descr = filename + mir_strlen(filename) + 1; - eventData->ptszText = DbEvent_GetString(&dbei, filename); + eventData->szText.w = DbEvent_GetString(&dbei, filename); if (*descr != '\0') - eventData->ptszText2 = DbEvent_GetString(&dbei, descr); + eventData->szText.w = DbEvent_GetString(&dbei, descr); eventData->iType = IEED_EVENT_FILE; } else if (dbei.eventType == EVENTTYPE_AUTHREQUEST) { - //blob is: uin(DWORD), hContact(DWORD), nick(ASCIIZ), first(ASCIIZ), last(ASCIIZ), email(ASCIIZ) - eventData->ptszText = mir_wstrdup(TranslateT(" requested authorization")); - eventData->ptszNick = DbEvent_GetString(&dbei, (char *)dbei.pBlob + 8); + // blob is: uin(DWORD), hContact(DWORD), nick(ASCIIZ), first(ASCIIZ), last(ASCIIZ), email(ASCIIZ) + eventData->szText.w = mir_wstrdup(TranslateT(" requested authorization")); + eventData->szNick.w = DbEvent_GetString(&dbei, (char *)dbei.pBlob + 8); eventData->iType = IEED_EVENT_SYSTEM; } else if (dbei.eventType == EVENTTYPE_ADDED) { //blob is: uin(DWORD), hContact(DWORD), nick(ASCIIZ), first(ASCIIZ), last(ASCIIZ), email(ASCIIZ) - eventData->ptszText = mir_wstrdup(TranslateT(" was added.")); - eventData->ptszNick = DbEvent_GetString(&dbei, (char *)dbei.pBlob + 8); + eventData->szText.w = mir_wstrdup(TranslateT(" was added.")); + eventData->szNick.w = DbEvent_GetString(&dbei, (char *)dbei.pBlob + 8); eventData->iType = IEED_EVENT_SYSTEM; } else { // custom event - eventData->pszTextW = DbEvent_GetTextW(&dbei, newEvent.codepage); + eventData->szText.w = DbEvent_GetTextW(&dbei, newEvent.codepage); eventData->iType = IEED_EVENT_MESSAGE; } free(dbei.pBlob); @@ -329,9 +325,9 @@ void HTMLBuilder::appendEventOld(IEView *view, IEVIEWEVENT *event) appendEventNew(view, &newEvent); for (IEVIEWEVENTDATA* eventData2 = newEvent.eventData; eventData2 != nullptr;) { IEVIEWEVENTDATA *eventData = eventData2->next; - mir_free((void*)eventData2->pszTextW); - mir_free((void*)eventData2->pszText2W); - mir_free((void*)eventData2->pszNickW); + mir_free((void*)eventData2->szText.w); + mir_free((void*)eventData2->szText2.w); + mir_free((void*)eventData2->szNick.w); delete eventData2; eventData2 = eventData; } @@ -384,12 +380,9 @@ ProtocolSettings* HTMLBuilder::getChatProtocolSettings(MCONTACT hContact) void HTMLBuilder::setLastIEViewEvent(IEVIEWEVENT *event) { - lastIEViewEvent.cbSize = sizeof(IEVIEWEVENT); lastIEViewEvent.iType = event->iType; lastIEViewEvent.codepage = CP_ACP; - if (event->cbSize >= IEVIEWEVENT_SIZE_V2) - lastIEViewEvent.codepage = event->codepage; - + lastIEViewEvent.codepage = event->codepage; lastIEViewEvent.count = 0; lastIEViewEvent.dwFlags = event->dwFlags; lastIEViewEvent.hContact = event->hContact; @@ -398,7 +391,7 @@ void HTMLBuilder::setLastIEViewEvent(IEVIEWEVENT *event) if (lastIEViewEvent.pszProto != nullptr) mir_free((void*)lastIEViewEvent.pszProto); - if (event->cbSize >= IEVIEWEVENT_SIZE_V3 && event->pszProto != nullptr) + if (event->pszProto != nullptr) lastIEViewEvent.pszProto = mir_strdup(event->pszProto); else lastIEViewEvent.pszProto = getProto(event->hContact); diff --git a/plugins/IEView/src/HistoryHTMLBuilder.cpp b/plugins/IEView/src/HistoryHTMLBuilder.cpp index e119e4c84a..254da8de27 100644 --- a/plugins/IEView/src/HistoryHTMLBuilder.cpp +++ b/plugins/IEView/src/HistoryHTMLBuilder.cpp @@ -230,14 +230,14 @@ void HistoryHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event { ptrA szName, szText; if (eventData->dwFlags & IEEDF_UNICODE_NICK) - szName = encodeUTF8(event->hContact, szRealProto, eventData->pszNickW, ENF_NAMESMILEYS, true); + szName = encodeUTF8(event->hContact, szRealProto, eventData->szNick.w, ENF_NAMESMILEYS, true); else - szName = encodeUTF8(event->hContact, szRealProto, eventData->pszNick, ENF_NAMESMILEYS, true); + szName = encodeUTF8(event->hContact, szRealProto, eventData->szNick.a, ENF_NAMESMILEYS, true); if (eventData->dwFlags & IEEDF_UNICODE_TEXT) - szText = encodeUTF8(event->hContact, szRealProto, eventData->pszTextW, ENF_ALL, isSent); + szText = encodeUTF8(event->hContact, szRealProto, eventData->szText.w, ENF_ALL, isSent); else - szText = encodeUTF8(event->hContact, szRealProto, eventData->pszText, event->codepage, ENF_ALL, isSent); + szText = encodeUTF8(event->hContact, szRealProto, eventData->szText.a, event->codepage, ENF_ALL, isSent); /* History++-specific formatting */ const char *iconFile = nullptr; diff --git a/plugins/IEView/src/IEView.cpp b/plugins/IEView/src/IEView.cpp index 260b9b007d..fdce55d149 100644 --- a/plugins/IEView/src/IEView.cpp +++ b/plugins/IEView/src/IEView.cpp @@ -979,11 +979,7 @@ void* IEView::getSelection(IEVIEWEVENT *event) return nullptr; if (event->dwFlags & IEEF_NO_UNICODE) { - int cp = CP_ACP; - if (event->cbSize >= IEVIEWEVENT_SIZE_V2) - cp = event->codepage; - - char *str = mir_u2a_cp(selectedText, cp); + char *str = mir_u2a_cp(selectedText, event->codepage); mir_free(selectedText); selectedText = (BSTR)str; } @@ -1131,7 +1127,7 @@ void IEView::saveDocument() void IEView::navigate(IEVIEWNAVIGATE *nav) { if (nav->dwFlags & IENF_UNICODE) - navigate(nav->urlW); + navigate(nav->url.w); else - navigate(nav->url); + navigate(nav->url.a); } \ No newline at end of file diff --git a/plugins/IEView/src/MUCCHTMLBuilder.cpp b/plugins/IEView/src/MUCCHTMLBuilder.cpp index b2bd3968f4..dfe6f525eb 100644 --- a/plugins/IEView/src/MUCCHTMLBuilder.cpp +++ b/plugins/IEView/src/MUCCHTMLBuilder.cpp @@ -188,14 +188,14 @@ void MUCCHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event) ptrA szName, szText; if (eventData->iType == IEED_MUCC_EVENT_MESSAGE) { if (eventData->dwFlags & IEEDF_UNICODE_TEXT) - szText = encodeUTF8(NULL, event->pszProto, eventData->pszTextW, ENF_ALL, isSent); + szText = encodeUTF8(NULL, event->pszProto, eventData->szText.w, ENF_ALL, isSent); else - szText = encodeUTF8(NULL, event->pszProto, eventData->pszText, ENF_ALL, isSent); + szText = encodeUTF8(NULL, event->pszProto, eventData->szText.a, ENF_ALL, isSent); if (eventData->dwFlags & IEEDF_UNICODE_NICK) - szName = encodeUTF8(NULL, event->pszProto, eventData->pszNickW, ENF_NAMESMILEYS, true); + szName = encodeUTF8(NULL, event->pszProto, eventData->szNick.w, ENF_NAMESMILEYS, true); else - szName = encodeUTF8(NULL, event->pszProto, eventData->pszNick, ENF_NAMESMILEYS, true); + szName = encodeUTF8(NULL, event->pszProto, eventData->szNick.a, ENF_NAMESMILEYS, true); str.AppendFormat("
", isSent ? "divOut" : "divIn"); if (dwData & IEEDD_MUCC_SHOW_TIME || dwData & IEEDD_MUCC_SHOW_DATE) @@ -231,19 +231,19 @@ void MUCCHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event) className = "userJoined"; divName = "divUserJoined"; eventText = LPGEN("%s has joined."); - szText = encodeUTF8(NULL, event->pszProto, eventData->pszNick, ENF_NONE, isSent); + szText = encodeUTF8(NULL, event->pszProto, eventData->szNick.a, ENF_NONE, isSent); } else if (eventData->iType == IEED_MUCC_EVENT_LEFT) { className = "userLeft"; divName = "divUserJoined"; eventText = LPGEN("%s has left."); - szText = encodeUTF8(NULL, event->pszProto, eventData->pszNick, ENF_NONE, isSent); + szText = encodeUTF8(NULL, event->pszProto, eventData->szNick.a, ENF_NONE, isSent); } else { className = "topicChange"; divName = "divTopicChange"; eventText = LPGEN("The topic is %s."); - szText = encodeUTF8(NULL, event->pszProto, eventData->pszText, ENF_ALL, isSent); + szText = encodeUTF8(NULL, event->pszProto, eventData->szText.a, ENF_ALL, isSent); } str.AppendFormat("
", divName); if (dwData & IEEDD_MUCC_SHOW_TIME || dwData & IEEDD_MUCC_SHOW_DATE) @@ -256,7 +256,7 @@ void MUCCHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event) } else if (eventData->iType == IEED_MUCC_EVENT_ERROR) { const char *className = "error"; - szText = encodeUTF8(NULL, event->pszProto, eventData->pszText, ENF_NONE, isSent); + szText = encodeUTF8(NULL, event->pszProto, eventData->szText.a, ENF_NONE, isSent); str.AppendFormat("
", "divError"); str.AppendFormat(" %s: %s", className, Translate("Error"), szText.get()); str.Append("
\n"); diff --git a/plugins/IEView/src/ScriverHTMLBuilder.cpp b/plugins/IEView/src/ScriverHTMLBuilder.cpp index 7086f35447..a47915f720 100644 --- a/plugins/IEView/src/ScriverHTMLBuilder.cpp +++ b/plugins/IEView/src/ScriverHTMLBuilder.cpp @@ -290,14 +290,14 @@ void ScriverHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event } ptrA szName, szText; if (eventData->dwFlags & IEEDF_UNICODE_NICK) - szName = encodeUTF8(event->hContact, szRealProto, eventData->pszNickW, ENF_NAMESMILEYS, true); + szName = encodeUTF8(event->hContact, szRealProto, eventData->szNick.w, ENF_NAMESMILEYS, true); else - szName = encodeUTF8(event->hContact, szRealProto, eventData->pszNick, ENF_NAMESMILEYS, true); + szName = encodeUTF8(event->hContact, szRealProto, eventData->szNick.a, ENF_NAMESMILEYS, true); if (eventData->dwFlags & IEEDF_UNICODE_TEXT) - szText = encodeUTF8(event->hContact, szRealProto, eventData->pszTextW, ENF_ALL, isSent); + szText = encodeUTF8(event->hContact, szRealProto, eventData->szText.w, ENF_ALL, isSent); else - szText = encodeUTF8(event->hContact, szRealProto, eventData->pszText, event->codepage, ENF_ALL, isSent); + szText = encodeUTF8(event->hContact, szRealProto, eventData->szText.a, event->codepage, ENF_ALL, isSent); /* Scriver-specific formatting */ if ((dwFlags & SMF_LOG_DRAWLINES) && isGroupBreak && getLastEventType() != -1) { diff --git a/plugins/IEView/src/TabSRMMHTMLBuilder.cpp b/plugins/IEView/src/TabSRMMHTMLBuilder.cpp index 1b51148521..67b32c90f1 100644 --- a/plugins/IEView/src/TabSRMMHTMLBuilder.cpp +++ b/plugins/IEView/src/TabSRMMHTMLBuilder.cpp @@ -316,14 +316,14 @@ void TabSRMMHTMLBuilder::appendEventNonTemplate(IEView *view, IEVIEWEVENT *event ptrA szName, szText; if (eventData->dwFlags & IEEDF_UNICODE_NICK) - szName = encodeUTF8(event->hContact, szRealProto, eventData->pszNickW, ENF_NAMESMILEYS, true); + szName = encodeUTF8(event->hContact, szRealProto, eventData->szNick.w, ENF_NAMESMILEYS, true); else - szName = encodeUTF8(event->hContact, szRealProto, eventData->pszNick, ENF_NAMESMILEYS, true); + szName = encodeUTF8(event->hContact, szRealProto, eventData->szNick.a, ENF_NAMESMILEYS, true); if (eventData->dwFlags & IEEDF_UNICODE_TEXT) - szText = encodeUTF8(event->hContact, szRealProto, eventData->pszTextW, ENF_ALL, isSent); + szText = encodeUTF8(event->hContact, szRealProto, eventData->szText.w, ENF_ALL, isSent); else - szText = encodeUTF8(event->hContact, szRealProto, eventData->pszText, event->codepage, ENF_ALL, isSent); + szText = encodeUTF8(event->hContact, szRealProto, eventData->szText.a, event->codepage, ENF_ALL, isSent); /* TabSRMM-specific formatting */ CMStringA str; diff --git a/plugins/IEView/src/TemplateHTMLBuilder.cpp b/plugins/IEView/src/TemplateHTMLBuilder.cpp index b1c07e4feb..30dc664cc2 100644 --- a/plugins/IEView/src/TemplateHTMLBuilder.cpp +++ b/plugins/IEView/src/TemplateHTMLBuilder.cpp @@ -390,18 +390,18 @@ void TemplateHTMLBuilder::appendEventTemplate(IEView *view, IEVIEWEVENT *event, char *szName = nullptr, *szText = nullptr, *szFileDesc = nullptr; if (event->eventData->dwFlags & IEEDF_UNICODE_NICK) - szName = encodeUTF8(event->hContact, szRealProto, eventData->pszNickW, ENF_NAMESMILEYS, true); + szName = encodeUTF8(event->hContact, szRealProto, eventData->szNick.w, ENF_NAMESMILEYS, true); else - szName = encodeUTF8(event->hContact, szRealProto, eventData->pszNick, ENF_NAMESMILEYS, true); + szName = encodeUTF8(event->hContact, szRealProto, eventData->szNick.a, ENF_NAMESMILEYS, true); if (eventData->dwFlags & IEEDF_UNICODE_TEXT) - szText = encodeUTF8(event->hContact, szRealProto, eventData->pszTextW, ENF_ALL, isSent); + szText = encodeUTF8(event->hContact, szRealProto, eventData->szText.w, ENF_ALL, isSent); else - szText = encodeUTF8(event->hContact, szRealProto, eventData->pszText, event->codepage, ENF_ALL, isSent); + szText = encodeUTF8(event->hContact, szRealProto, eventData->szText.a, event->codepage, ENF_ALL, isSent); if (eventData->dwFlags & IEEDF_UNICODE_TEXT2) - szFileDesc = encodeUTF8(event->hContact, szRealProto, eventData->pszText2W, 0, isSent); + szFileDesc = encodeUTF8(event->hContact, szRealProto, eventData->szText2.w, 0, isSent); else - szFileDesc = encodeUTF8(event->hContact, szRealProto, eventData->pszText2, event->codepage, 0, isSent); + szFileDesc = encodeUTF8(event->hContact, szRealProto, eventData->szText2.a, event->codepage, 0, isSent); if (eventData->iType == IEED_EVENT_MESSAGE) { if (!isRTL) { -- cgit v1.2.3