merge with SrmmLogContainer

23 files changed, 755 insertions, 1339 deletions

diff --git a/plugins/TabSRMM/res/resource.rc b/plugins/TabSRMM/res/resource.rc
index 6ac69add5d..18eac86202 100644
--- a/plugins/TabSRMM/res/resource.rc
+++ b/plugins/TabSRMM/res/resource.rc
@@ -143,31 +143,28 @@ BEGIN
     CONTROL         "",IDC_MSGTABS,"TSTabCtrlClass",0xc048,31,7,5,5

 END

 

-IDD_USERPREFS DIALOGEX 0, 0, 316, 265

+IDD_USERPREFS DIALOGEX 0, 0, 316, 148

 STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_CAPTION

 CAPTION "Dialog"

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

-    GROUPBOX        "Message log view mode (does not affect open windows)",IDC_STATIC,4,5,310,39

-    COMBOBOX        IDC_IEVIEWMODE,8,25,128,46,CBS_DROPDOWNLIST | WS_VSCROLL | WS_GROUP | WS_TABSTOP

-    LTEXT           "Select how to display the message log. This setting can be ignored when one of the listed plugins is not installed.",IDC_STATIC,143,17,164,24

-    GROUPBOX        "Send text formatting method",IDC_STATIC,4,45,310,33

-    COMBOBOX        IDC_TEXTFORMATTING,8,57,128,46,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

-    LTEXT           "You can override the global setting for text formatting here. Use ""Force off"" to never send formatting info for this contact.",IDC_STATIC,143,52,164,24

-    GROUPBOX        "Other options",IDC_STATIC,4,118,310,142

-    LTEXT           "Info panel mode",IDC_STATIC,12,128,128,8

-    COMBOBOX        IDC_INFOPANEL,9,138,130,46,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

-    LTEXT           "Show avatar in message window",IDC_STATIC,12,158,127,8

-    COMBOBOX        IDC_SHOWAVATAR,9,169,130,46,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

+    GROUPBOX        "Send text formatting method",IDC_STATIC,4,0,310,33

+    COMBOBOX        IDC_TEXTFORMATTING,8,12,128,46,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

+    LTEXT           "You can override the global setting for text formatting here. Use ""Force off"" to never send formatting info for this contact.",IDC_STATIC,143,7,164,24

+    GROUPBOX        "Other options",IDC_STATIC,4,34,310,112

+    LTEXT           "Info panel mode",IDC_STATIC,12,44,128,8

+    COMBOBOX        IDC_INFOPANEL,9,54,130,46,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

+    LTEXT           "Show avatar in message window",IDC_STATIC,12,113,127,8

+    COMBOBOX        IDC_SHOWAVATAR,9,85,130,46,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

     CONTROL         "Use private splitter position",IDC_PRIVATESPLITTER,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,187,296,12

-    CONTROL         "Contact is a favorite contact",IDC_ISFAVORITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,199,297,12

-    CONTROL         "Ignore sending timeouts",IDC_IGNORETIMEOUTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,154,164,12

-    CONTROL         "Load only actual history",IDC_LOADONLYACTUAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,166,164,12

-    CONTROL         "Always trim message log to",IDC_ALWAYSTRIM2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,214,163,12

-    EDITTEXT        IDC_TRIM,178,213,33,12,ES_RIGHT | ES_NUMBER | WS_DISABLED

-    CONTROL         "",IDC_TRIMSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK | WS_DISABLED,213,207,10,14

-    LTEXT           "events",IDC_STATIC,215,215,64,8

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,103,296,12

+    CONTROL         "Contact is a favorite contact",IDC_ISFAVORITE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,115,297,12

+    CONTROL         "Ignore sending timeouts",IDC_IGNORETIMEOUTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,70,164,12

+    CONTROL         "Load only actual history",IDC_LOADONLYACTUAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,145,82,164,12

+    CONTROL         "Always trim message log to",IDC_ALWAYSTRIM2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,130,163,12

+    EDITTEXT        IDC_TRIM,178,129,33,12,ES_RIGHT | ES_NUMBER | WS_DISABLED

+    CONTROL         "",IDC_TRIMSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK | WS_DISABLED,207,129,11,14

+    LTEXT           "events",IDC_STATIC,215,131,64,8

 END

 

 IDD_CONTAINEROPTIONS DIALOGEX 0, 0, 428, 258

@@ -277,14 +274,14 @@ EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1

 BEGIN

     GROUPBOX        "Options",IDC_STATIC,3,0,300,106

-    CONTROL         "",IDC_LOGOPTIONS,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,6,9,294,94

-    GROUPBOX        "Indent values",IDC_STMSGLOGGROUP2,3,107,145,29

-    LTEXT           "Left/Right",IDC_STATIC,10,119,48,11

-    EDITTEXT        IDC_INDENTAMOUNT,60,117,29,12,ES_AUTOHSCROLL

-    CONTROL         "",IDC_INDENTSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_HOTTRACK,72,120,10,11

-    EDITTEXT        IDC_RIGHTINDENT,94,117,29,12,ES_AUTOHSCROLL | ES_NUMBER

-    CONTROL         "",IDC_RINDENTSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,113,118,10,11

-    CTEXT           "px",IDC_STATIC,124,119,21,9

+    CONTROL         "",IDC_LOGOPTIONS,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_BORDER | WS_HSCROLL | WS_TABSTOP,6,9,294,94

+    GROUPBOX        "Indent values",IDC_STMSGLOGGROUP2,3,107,300,29

+    LTEXT           "Left/Right",IDC_STATIC,10,119,83,10

+    EDITTEXT        IDC_INDENTAMOUNT,95,118,29,12,ES_AUTOHSCROLL

+    CONTROL         "",IDC_INDENTSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_HOTTRACK,124,118,10,11

+    EDITTEXT        IDC_RIGHTINDENT,146,118,29,12,ES_AUTOHSCROLL | ES_NUMBER

+    CONTROL         "",IDC_RINDENTSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,175,118,10,11

+    LTEXT           "px",IDC_STATIC,193,119,49,9

     GROUPBOX        "Template sets",IDC_STMSGLOGGROUP,3,138,300,26

     PUSHBUTTON      "Standard templates...",IDC_MODIFY,27,147,95,14

     PUSHBUTTON      "RTL templates...",IDC_RTLMODIFY,178,147,95,14

@@ -301,9 +298,6 @@ BEGIN
     CONTROL         "",IDC_TRIMSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK | WS_DISABLED,200,209,10,14

     LTEXT           "events",IDC_STATIC,210,212,82,8

     LTEXT           "minutes old",IDC_STMINSOLD,210,200,83,8,WS_DISABLED

-    GROUPBOX        "Global message log display",IDC_STMSGLOGGROUP3,149,107,147,29

-    COMBOBOX        IDC_MSGLOGDIDSPLAY,155,117,135,46,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

-    LTEXT           "Static",IDC_EXPLAINMSGLOGSETTINGS,31,25,240,59

 END

 

 IDD_OPT_MSGTYPE DIALOGEX 0, 0, 283, 251

@@ -771,8 +765,6 @@ IDR_MENUBAR MENU
 BEGIN

     POPUP "&File"

     BEGIN

-        MENUITEM "Save message log as...",      ID_FILE_SAVEMESSAGELOGAS

-        MENUITEM SEPARATOR

         MENUITEM "Close message session\tCtrl+W", ID_FILE_CLOSEMESSAGESESSION

         MENUITEM "Close container\tAlt+F4",     ID_FILE_CLOSE

     END

diff --git a/plugins/TabSRMM/src/chat.h b/plugins/TabSRMM/src/chat.h
index 8d9910dfed..928aeb6317 100644
--- a/plugins/TabSRMM/src/chat.h
+++ b/plugins/TabSRMM/src/chat.h
@@ -29,6 +29,9 @@
 

 //defines

 

+#define CLICKNICK_BEGIN L"~~++#"

+#define CLICKNICK_END L"#++~~"

+

 enum TChatStatusEx

 {

 	CHAT_STATUS_NORMAL,

diff --git a/plugins/TabSRMM/src/chat_log.cpp b/plugins/TabSRMM/src/chat_log.cpp
index f8e2c4b951..302ff08645 100644
--- a/plugins/TabSRMM/src/chat_log.cpp
+++ b/plugins/TabSRMM/src/chat_log.cpp
@@ -34,296 +34,7 @@
  * the srmm module and then modified to fit the chat module.

  */

 

-static char *szDivider = "\\strike----------------------------------------------------------------------------\\strike0";

-

-/*

- * ieview MUC support - mostly from scriver

- */

-

-/*

-

-static char* u2a(const wchar_t* src, int codepage)

-{

-	int cbLen = WideCharToMultiByte(codepage, 0, src, -1, nullptr, 0, nullptr, nullptr);

-	char* result = (char*)mir_alloc(cbLen + 1);

-	if (result == nullptr)

-		return nullptr;

-

-	WideCharToMultiByte(codepage, 0, src, -1, result, cbLen, nullptr, nullptr);

-	result[cbLen] = 0;

-	return result;

-}

-

-static char* t2acp(const wchar_t* src, int codepage)

-{

-	return u2a(src, codepage);

-}

-

-static wchar_t *a2tcp(const char *text, int cp)

-{

-	if (text != nullptr) {

-		int cbLen = MultiByteToWideChar(cp, 0, text, -1, nullptr, 0);

-		wchar_t* result = (wchar_t*)mir_alloc(sizeof(wchar_t)*(cbLen + 1));

-		if (result == nullptr)

-			return nullptr;

-		MultiByteToWideChar(cp, 0, text, -1, result, cbLen);

-		return result;

-	}

-	return nullptr;

-}

-

-static int Log_AppendIEView(LOGSTREAMDATA* streamData, BOOL simpleMode, wchar_t **buffer, int *cbBufferEnd, int *cbBufferAlloced, const wchar_t *fmt, ...)

-{

-	va_list va;

-	int lineLen, textCharsCount = 0;

-	wchar_t* line = (wchar_t*)_alloca(8001 * sizeof(wchar_t));

-	wchar_t* d;

-	MODULEINFO *mi = streamData->si->pMI;

-

-	va_start(va, fmt);

-	lineLen = mir_vsnwprintf(line, 8000, fmt, va);

-	if (lineLen < 0)

-		return 0;

-	line[lineLen] = 0;

-	va_end(va);

-	lineLen = lineLen * 9 + 8;

-	if (*cbBufferEnd + lineLen > *cbBufferAlloced) {

-		cbBufferAlloced[0] += (lineLen + 1024 - lineLen % 1024);

-		*buffer = (wchar_t*)mir_realloc(*buffer, *cbBufferAlloced * sizeof(wchar_t));

-	}

-

-	d = *buffer + *cbBufferEnd;

-

-	for (; *line; line++, textCharsCount++) {

-		if (*line == '%' && !simpleMode) {

-			wchar_t szTemp[200];

-

-			szTemp[0] = '\0';

-			switch (*++line) {

-			case '\0':

-			case '%':

-				*d++ = '%';

-				break;

-

-			case 'c':

-			case 'f':

-				if (!g_Settings.bStripFormat && !streamData->bStripFormat) {

-					if (line[1] != '\0' && line[2] != '\0') {

-						wchar_t szTemp3[3], c = *line;

-						int col;

-						szTemp3[0] = line[1];

-						szTemp3[1] = line[2];

-						szTemp3[2] = '\0';

-						col = _wtoi(szTemp3);

-						mir_snwprintf(szTemp, L"%%%c#%02X%02X%02X", c, GetRValue(mi->crColors[col]), GetGValue(mi->crColors[col]), GetBValue(mi->crColors[col]));

-					}

-				}

-				line += 2;

-				break;

-			case 'C':

-			case 'F':

-				if (!g_Settings.bStripFormat && !streamData->bStripFormat) {

-					mir_snwprintf(szTemp, L"%%%c", *line);

-				}

-				break;

-			case 'b':

-			case 'u':

-			case 'i':

-			case 'B':

-			case 'U':

-			case 'I':

-			case 'r':

-				if (!streamData->bStripFormat) {

-					mir_snwprintf(szTemp, L"%%%c", *line);

-				}

-				break;

-			}

-

-			if (szTemp[0]) {

-				size_t iLen = mir_wstrlen(szTemp);

-				memcpy(d, szTemp, iLen * sizeof(wchar_t));

-				d += iLen;

-			}

-		}

-		else if (*line == '%') {

-			*d++ = '%';

-			*d++ = (char)*line;

-		}

-		else {

-			*d++ = (wchar_t)*line;

-		}

-	}

-	*d = '\0';

-	*cbBufferEnd = (int)(d - *buffer);

-	return textCharsCount;

-}

-

-static void AddEventTextToBufferIEView(wchar_t **buffer, int *bufferEnd, int *bufferAlloced, LOGSTREAMDATA *streamData)

-{

-	if (streamData->lin->ptszText)

-		Log_AppendIEView(streamData, FALSE, str, L": %s", streamData->lin->ptszText);

-}

-

-static void AddEventToBufferIEView(wchar_t **buffer, int *bufferEnd, int *bufferAlloced, LOGSTREAMDATA *streamData, wchar_t *pszNick)

-{

-

-	if (streamData && streamData->lin) {

-		switch (streamData->lin->iType) {

-		case GC_EVENT_MESSAGE:

-			if (streamData->lin->ptszText) {

-				wchar_t *ptszTemp = nullptr;

-				wchar_t *ptszText = streamData->lin->ptszText;

-				if (streamData->dat->codePage != CP_ACP) {

-					char *aText = t2acp(streamData->lin->ptszText, CP_ACP);

-					ptszText = ptszTemp = a2tcp(aText, streamData->dat->codePage);

-					mir_free(aText);

-				}

-				Log_AppendIEView(streamData, FALSE, str, L"%s", ptszText);

-				mir_free(ptszTemp);

-			}

-			break;

-		case GC_EVENT_ACTION:

-			if (pszNick && streamData->lin->ptszText) {

-				Log_AppendIEView(streamData, TRUE, str, L"%s ", streamData->lin->ptszNick);

-				Log_AppendIEView(streamData, FALSE, str, L"%s", streamData->lin->ptszText);

-			}

-			break;

-		case GC_EVENT_JOIN:

-			if (pszNick) {

-				if (!streamData->lin->bIsMe)

-					Log_AppendIEView(streamData, TRUE, str, TranslateT("%s has joined"), pszNick);

-				else

-					Log_AppendIEView(streamData, TRUE, str, TranslateT("You have joined %s"), streamData->si->ptszName);

-			}

-			break;

-		case GC_EVENT_PART:

-			if (pszNick)

-				Log_AppendIEView(streamData, TRUE, str, TranslateT("%s has left"), pszNick);

-			AddEventTextToBufferIEView(str, streamData);

-			break;

-		case GC_EVENT_QUIT:

-			if (pszNick)

-				Log_AppendIEView(streamData, TRUE, str, TranslateT("%s has disconnected"), pszNick);

-			AddEventTextToBufferIEView(str, streamData);

-			break;

-		case GC_EVENT_NICK:

-			if (pszNick && streamData->lin->ptszText) {

-				if (!streamData->lin->bIsMe)

-					Log_AppendIEView(streamData, TRUE, str, TranslateT("%s is now known as %s"), pszNick, streamData->lin->ptszText);

-				else

-					Log_AppendIEView(streamData, TRUE, str, TranslateT("You are now known as %s"), streamData->lin->ptszText);

-			}

-			break;

-		case GC_EVENT_KICK:

-			if (pszNick && streamData->lin->ptszStatus)

-				Log_AppendIEView(streamData, TRUE, str, TranslateT("%s kicked %s"), streamData->lin->ptszStatus, streamData->lin->ptszNick);

-			AddEventTextToBufferIEView(str, streamData);

-			break;

-		case GC_EVENT_NOTICE:

-			if (pszNick && streamData->lin->ptszText) {

-				Log_AppendIEView(streamData, TRUE, str, TranslateT("Notice from %s"), pszNick);

-				AddEventTextToBufferIEView(str, streamData);

-			}

-			break;

-		case GC_EVENT_TOPIC:

-			if (streamData->lin->ptszText)

-				Log_AppendIEView(streamData, FALSE, str, TranslateT("The topic is '%s%s'"), streamData->lin->ptszText, L"%r");

-			if (pszNick)

-				Log_AppendIEView(streamData, TRUE, str,

-				streamData->lin->ptszUserInfo ? TranslateT(" (set by %s on %s)") : TranslateT(" (set by %s)"),

-				pszNick, streamData->lin->ptszUserInfo);

-			break;

-		case GC_EVENT_INFORMATION:

-			if (streamData->lin->ptszText)

-				Log_AppendIEView(streamData, FALSE, str, (streamData->lin->bIsMe) ? L"--> %s" : L"%s", streamData->lin->ptszText);

-			break;

-		case GC_EVENT_ADDSTATUS:

-			if (pszNick && streamData->lin->ptszText && streamData->lin->ptszStatus)

-				Log_AppendIEView(streamData, TRUE, str, TranslateT("%s enables '%s' status for %s"), streamData->lin->ptszText, streamData->lin->ptszStatus, streamData->lin->ptszNick);

-			break;

-		case GC_EVENT_REMOVESTATUS:

-			if (pszNick && streamData->lin->ptszText && streamData->lin->ptszStatus)

-				Log_AppendIEView(streamData, TRUE, str, TranslateT("%s disables '%s' status for %s"), streamData->lin->ptszText, streamData->lin->ptszStatus, streamData->lin->ptszNick);

-			break;

-		}

-	}

-}

-

-static void LogEventIEView(LOGSTREAMDATA *streamData, wchar_t *ptszNick)

-{

-	wchar_t *buffer = nullptr;

-	int bufferEnd = 0;

-	int bufferAlloced = 0;

-	IEVIEWEVENTDATA ied;

-	IEVIEWEVENT event;

-	memset(&event, 0, sizeof(event));

-	event.cbSize = sizeof(event);

-	event.dwFlags = 0;

-	event.hwnd = streamData->dat->m_hwndIEView ? streamData->dat->m_hwndIEView : streamData->dat->m_hwndHPP;

-	event.hContact = streamData->dat->m_hContact;

-	event.codepage = streamData->dat->codePage;

-	event.pszProto = streamData->si->pszModule;

-	event.iType = IEE_LOG_MEM_EVENTS;

-	event.eventData = &ied;

-	event.count = 1;

-

-	memset(&ied, 0, sizeof(ied));

-	AddEventToBufferIEView(str, streamData, ptszNick);

-	ied.ptszNick = ptszNick;

-	ied.ptszText = buffer;

-	ied.time = streamData->lin->time;

-	ied.bIsMe = streamData->lin->bIsMe;

-

-	switch (streamData->lin->iType) {

-	case GC_EVENT_MESSAGE:

-		ied.iType = IEED_GC_EVENT_MESSAGE;

-		ied.dwData = IEEDD_GC_SHOW_NICK;

-		break;

-	case GC_EVENT_ACTION:

-		ied.iType = IEED_GC_EVENT_ACTION;

-		break;

-	case GC_EVENT_JOIN:

-		ied.iType = IEED_GC_EVENT_JOIN;

-		break;

-	case GC_EVENT_PART:

-		ied.iType = IEED_GC_EVENT_PART;

-		break;

-	case GC_EVENT_QUIT:

-		ied.iType = IEED_GC_EVENT_QUIT;

-		break;

-	case GC_EVENT_NICK:

-		ied.iType = IEED_GC_EVENT_NICK;

-		break;

-	case GC_EVENT_KICK:

-		ied.iType = IEED_GC_EVENT_KICK;

-		break;

-	case GC_EVENT_NOTICE:

-		ied.iType = IEED_GC_EVENT_NOTICE;

-		break;

-	case GC_EVENT_TOPIC:

-		ied.iType = IEED_GC_EVENT_TOPIC;

-		break;

-	case GC_EVENT_INFORMATION:

-		ied.iType = IEED_GC_EVENT_INFORMATION;

-		break;

-	case GC_EVENT_ADDSTATUS:

-		ied.iType = IEED_GC_EVENT_ADDSTATUS;

-		break;

-	case GC_EVENT_REMOVESTATUS:

-		ied.iType = IEED_GC_EVENT_REMOVESTATUS;

-		break;

-	}

-	ied.dwData |= g_Settings.bShowTime ? IEEDD_GC_SHOW_TIME : 0;

-	ied.dwData |= IEEDD_GC_SHOW_ICON;

-	ied.dwFlags = IEEDF_UNICODE_TEXT | IEEDF_UNICODE_NICK | IEEDF_UNICODE_TEXT2;

-	ied.next = nullptr;

-	CallService(streamData->dat->m_hwndIEView ? MS_IEVIEW_EVENT : MS_HPP_EG_EVENT, 0, (LPARAM)&event);

-	mir_free(buffer);

-}

-

-*/

-

-static int EventToIndex(LOGINFO * lin)

+static int EventToIndex(LOGINFO *lin)

 {

 	switch (lin->iType) {

 	case GC_EVENT_MESSAGE:

@@ -387,7 +98,7 @@ static BYTE EventToSymbol(LOGINFO *lin)
 	return 0x73;

 }

 

-static int EventToIcon(LOGINFO * lin)

+static int EventToIcon(LOGINFO *lin)

 {

 	switch (lin->iType) {

 	case GC_EVENT_MESSAGE:

@@ -425,7 +136,7 @@ static int EventToIcon(LOGINFO * lin)
 static void Log_AppendRTF(LOGSTREAMDATA *streamData, BOOL simpleMode, CMStringA &str, const wchar_t *fmt, ...)

 {

 	int textCharsCount = 0;

-	wchar_t *line = (wchar_t*)_alloca(8001 * sizeof(wchar_t));

+	wchar_t *line = (wchar_t *)_alloca(8001 * sizeof(wchar_t));

 

 	va_list va;

 	va_start(va, fmt);

@@ -512,7 +223,7 @@ static void Log_AppendRTF(LOGSTREAMDATA *streamData, BOOL simpleMode, CMStringA
 		else if (*line > 0 && *line < 128) {

 			res.AppendChar((char)*line);

 		}

-		else res.AppendFormat("\\u%u ?", (WORD)* line);

+		else res.AppendFormat("\\u%u ?", (WORD)*line);

 	}

 

 	str += res;

@@ -520,32 +231,24 @@ static void Log_AppendRTF(LOGSTREAMDATA *streamData, BOOL simpleMode, CMStringA
 

 static void AddEventToBuffer(CMStringA &str, LOGSTREAMDATA *streamData)

 {

-	wchar_t szTemp[512], szTemp2[512];

-	wchar_t* pszNick = nullptr;

-

-	if (streamData == nullptr)

-		return;

-

-	if (streamData->lin == nullptr)

+	if (streamData == nullptr || streamData->lin == nullptr)

 		return;

 

+	CMStringW wszNick;

 	if (streamData->lin->ptszNick) {

 		if (g_Settings.bLogLimitNames && mir_wstrlen(streamData->lin->ptszNick) > 20) {

-			wcsncpy_s(szTemp, 20, streamData->lin->ptszNick, _TRUNCATE);

-			wcsncpy_s(szTemp + 20, 4, L"...", _TRUNCATE);

+			wszNick.Append(streamData->lin->ptszNick, 20);

+			wszNick.Append(L"...");

 		}

-		else wcsncpy_s(szTemp, streamData->lin->ptszNick, _TRUNCATE);

+		else wszNick.Append(streamData->lin->ptszNick);

 

-		if (g_Settings.bClickableNicks)

-			mir_snwprintf(szTemp2, L"~~++#%s#++~~", szTemp);

-		else

-			wcsncpy_s(szTemp2, szTemp, _TRUNCATE);

+		if (g_Settings.bClickableNicks) {

+			wszNick.Insert(0, CLICKNICK_BEGIN);

+			wszNick.Append(CLICKNICK_END);

+		}

 

 		if (streamData->lin->ptszUserInfo && streamData->lin->iType != GC_EVENT_TOPIC)

-			mir_snwprintf(szTemp, L"%s (%s)", szTemp2, streamData->lin->ptszUserInfo);

-		else

-			wcsncpy_s(szTemp, szTemp2, _TRUNCATE);

-		pszNick = szTemp;

+			wszNick.AppendFormat(L" (%s)", streamData->lin->ptszUserInfo);

 	}

 

 	switch (streamData->lin->iType) {

@@ -560,64 +263,64 @@ static void AddEventToBuffer(CMStringA &str, LOGSTREAMDATA *streamData)
 		}

 		break;

 	case GC_EVENT_JOIN:

-		if (pszNick) {

+		if (!wszNick.IsEmpty()) {

 			if (!streamData->lin->bIsMe)

 				/* replace nick of a newcomer with a link */

-				Log_AppendRTF(streamData, TRUE, str, TranslateT("%s has joined"), pszNick);

+				Log_AppendRTF(streamData, TRUE, str, TranslateT("%s has joined"), wszNick.c_str());

 			else

 				Log_AppendRTF(streamData, TRUE, str, TranslateT("You have joined %s"), streamData->si->ptszName);

 		}

 		break;

 	case GC_EVENT_PART:

-		if (pszNick)

-			Log_AppendRTF(streamData, TRUE, str, TranslateT("%s has left"), pszNick);

+		if (!wszNick.IsEmpty())

+			Log_AppendRTF(streamData, TRUE, str, TranslateT("%s has left"), wszNick.c_str());

 		if (streamData->lin->ptszText)

 			Log_AppendRTF(streamData, FALSE, str, L": %s", streamData->lin->ptszText);

 		break;

 	case GC_EVENT_QUIT:

-		if (pszNick)

-			Log_AppendRTF(streamData, TRUE, str, TranslateT("%s has disconnected"), pszNick);

+		if (!wszNick.IsEmpty())

+			Log_AppendRTF(streamData, TRUE, str, TranslateT("%s has disconnected"), wszNick.c_str());

 		if (streamData->lin->ptszText)

 			Log_AppendRTF(streamData, FALSE, str, L": %s", streamData->lin->ptszText);

 		break;

 	case GC_EVENT_NICK:

-		if (pszNick && streamData->lin->ptszText) {

+		if (!wszNick.IsEmpty() && streamData->lin->ptszText) {

 			if (!streamData->lin->bIsMe)

-				Log_AppendRTF(streamData, TRUE, str, TranslateT("%s is now known as %s"), pszNick, streamData->lin->ptszText);

+				Log_AppendRTF(streamData, TRUE, str, TranslateT("%s is now known as %s"), wszNick.c_str(), streamData->lin->ptszText);

 			else

 				Log_AppendRTF(streamData, TRUE, str, TranslateT("You are now known as %s"), streamData->lin->ptszText);

 		}

 		break;

 	case GC_EVENT_KICK:

-		if (pszNick && streamData->lin->ptszStatus)

-			Log_AppendRTF(streamData, TRUE, str, TranslateT("%s kicked %s"), streamData->lin->ptszStatus, pszNick);

+		if (!wszNick.IsEmpty() && streamData->lin->ptszStatus)

+			Log_AppendRTF(streamData, TRUE, str, TranslateT("%s kicked %s"), streamData->lin->ptszStatus, wszNick.c_str());

 

 		if (streamData->lin->ptszText)

 			Log_AppendRTF(streamData, FALSE, str, L": %s", streamData->lin->ptszText);

 		break;

 	case GC_EVENT_NOTICE:

-		if (pszNick && streamData->lin->ptszText) {

-			Log_AppendRTF(streamData, TRUE, str, TranslateT("Notice from %s: "), pszNick);

+		if (!wszNick.IsEmpty() && streamData->lin->ptszText) {

+			Log_AppendRTF(streamData, TRUE, str, TranslateT("Notice from %s: "), wszNick.c_str());

 			Log_AppendRTF(streamData, FALSE, str, L"%s", streamData->lin->ptszText);

 		}

 		break;

 	case GC_EVENT_TOPIC:

 		if (streamData->lin->ptszText)

 			Log_AppendRTF(streamData, FALSE, str, TranslateT("The topic is '%s%s'"), streamData->lin->ptszText, L"%r");

-		if (pszNick)

-			Log_AppendRTF(streamData, TRUE, str, (streamData->lin->ptszUserInfo) ? TranslateT(" (set by %s on %s)") : TranslateT(" (set by %s)"), pszNick, streamData->lin->ptszUserInfo);

+		if (!wszNick.IsEmpty())

+			Log_AppendRTF(streamData, TRUE, str, (streamData->lin->ptszUserInfo) ? TranslateT(" (set by %s on %s)") : TranslateT(" (set by %s)"), wszNick.c_str(), streamData->lin->ptszUserInfo);

 		break;

 	case GC_EVENT_INFORMATION:

 		if (streamData->lin->ptszText)

 			Log_AppendRTF(streamData, FALSE, str, (streamData->lin->bIsMe) ? L"--> %s" : L"%s", streamData->lin->ptszText);

 		break;

 	case GC_EVENT_ADDSTATUS:

-		if (pszNick && streamData->lin->ptszText && streamData->lin->ptszStatus)

-			Log_AppendRTF(streamData, TRUE, str, TranslateT("%s enables '%s' status for %s"), streamData->lin->ptszText, streamData->lin->ptszStatus, pszNick);

+		if (!wszNick.IsEmpty() && streamData->lin->ptszText && streamData->lin->ptszStatus)

+			Log_AppendRTF(streamData, TRUE, str, TranslateT("%s enables '%s' status for %s"), streamData->lin->ptszText, streamData->lin->ptszStatus, wszNick.c_str());

 		break;

 	case GC_EVENT_REMOVESTATUS:

-		if (pszNick && streamData->lin->ptszText && streamData->lin->ptszStatus)

-			Log_AppendRTF(streamData, TRUE, str, TranslateT("%s disables '%s' status for %s"), streamData->lin->ptszText, streamData->lin->ptszStatus, pszNick);

+		if (!wszNick.IsEmpty() && streamData->lin->ptszText && streamData->lin->ptszStatus)

+			Log_AppendRTF(streamData, TRUE, str, TranslateT("%s disables '%s' status for %s"), streamData->lin->ptszText, streamData->lin->ptszStatus, wszNick.c_str());

 		break;

 	}

 }

@@ -758,7 +461,7 @@ char* Log_CreateRTF(LOGSTREAMDATA *streamData)
 			if (g_Settings.dwIconFlags)

 				str.Append("\\tab ");

 

-			//insert timestamp

+			// insert timestamp

 			if (g_Settings.bShowTime) {

 				wchar_t szTimeStamp[30], szOldTimeStamp[30];

 

@@ -789,7 +492,7 @@ char* Log_CreateRTF(LOGSTREAMDATA *streamData)
 				pszTemp.Replace(L"%n", L"%s");

 				if (!lin->bIsMe) {

 					if (g_Settings.bClickableNicks)

-						pszTemp.Replace(L"%s", L"~~++#%s#++~~");

+						pszTemp.Replace(L"%s", CLICKNICK_BEGIN L"%s" CLICKNICK_END);

 

 					if (g_Settings.bColorizeNicksInLog && pszIndicator[0])

 						str.AppendFormat("\\cf%u ", OPTIONS_FONTCOUNT + Utils::rtf_clrs.getCount() + streamData->crCount + crNickIndex);

@@ -819,164 +522,3 @@ char* Log_CreateRTF(LOGSTREAMDATA *streamData)
 		str.Append("}");

 	return str.Detach();

 }

-

-void CMsgDialog::StreamInEvents(LOGINFO *lin, bool bRedraw)

-{

-	if (m_hwnd == nullptr || lin == nullptr || m_si == nullptr)

-		return;

-

-	LOGSTREAMDATA streamData;

-	memset(&streamData, 0, sizeof(streamData));

-	streamData.hwnd = m_log.GetHwnd();

-	streamData.si = m_si;

-	streamData.lin = lin;

-	streamData.bStripFormat = FALSE;

-	streamData.dat = this;

-

-	if (!bRedraw && (m_si->iType == GCW_CHATROOM || m_si->iType == GCW_PRIVMESS) && m_bFilterEnabled && (m_iLogFilterFlags & lin->iType) == 0)

-		return;

-

-	bool bFlag = false, fDoReplace;

-

-	EDITSTREAM stream = {};

-	stream.pfnCallback = Srmm_LogStreamCallback;

-	stream.dwCookie = (DWORD_PTR)& streamData;

-

-	SCROLLINFO scroll = {};

-	scroll.cbSize = sizeof(SCROLLINFO);

-	scroll.fMask = SIF_RANGE | SIF_POS | SIF_PAGE;

-	GetScrollInfo(m_log.GetHwnd(), SB_VERT, &scroll);

-

-	POINT point = { 0 };

-	m_log.SendMsg(EM_GETSCROLLPOS, 0, (LPARAM)&point);

-

-	// do not scroll to bottom if there is a selection

-	CHARRANGE oldsel, sel, newsel;

-	m_log.SendMsg(EM_EXGETSEL, 0, (LPARAM)&oldsel);

-	if (oldsel.cpMax != oldsel.cpMin)

-		m_log.SendMsg(WM_SETREDRAW, FALSE, 0);

-

-	// set the insertion point at the bottom

-	sel.cpMin = sel.cpMax = m_log.GetRichTextLength();

-	m_log.SendMsg(EM_EXSETSEL, 0, (LPARAM)&sel);

-

-	// fix for the indent... must be a M$ bug

-	if (sel.cpMax == 0)

-		bRedraw = TRUE;

-

-	// should the event(s) be appended to the current log

-	WPARAM wp = bRedraw ? SF_RTF : SFF_SELECTION | SF_RTF;

-

-	// get the number of pixels per logical inch

-	if (bRedraw) {

-		HDC hdc = GetDC(nullptr);

-		g_chatApi.logPixelSY = GetDeviceCaps(hdc, LOGPIXELSY);

-		g_chatApi.logPixelSX = GetDeviceCaps(hdc, LOGPIXELSX);

-		ReleaseDC(nullptr, hdc);

-		m_log.SendMsg(WM_SETREDRAW, FALSE, 0);

-		bFlag = true;

-	}

-

-	// stream in the event(s)

-	streamData.lin = lin;

-	streamData.bRedraw = bRedraw;

-	m_log.SendMsg(EM_STREAMIN, wp, (LPARAM)&stream);

-

-	// for new added events, only replace in message or action events.

-	// no need to replace smileys or math formulas elsewhere

-	fDoReplace = (bRedraw || (lin->ptszText && (lin->iType == GC_EVENT_MESSAGE || lin->iType == GC_EVENT_ACTION)));

-

-	// replace marked nicknames with hyperlinks to make the nicks clickable

-	if (g_Settings.bClickableNicks) {

-		FINDTEXTEX fi, fi2;

-		fi.chrg.cpMin = bRedraw ? 0 : sel.cpMin;

-		fi.chrg.cpMax = -1;

-		fi.lpstrText = L"~~++#";

-

-		while (m_log.SendMsg(EM_FINDTEXTEX, FR_DOWN, (LPARAM)&fi) > -1) {

-			fi2.chrg.cpMin = fi.chrgText.cpMin;

-			fi2.chrg.cpMax = -1;

-			fi2.lpstrText = L"#++~~";

-

-			if (m_log.SendMsg(EM_FINDTEXTEX, FR_DOWN, (LPARAM)&fi2) > -1) {

-				m_log.SendMsg(EM_EXSETSEL, 0, (LPARAM)&fi.chrgText);

-				m_log.SendMsg(EM_REPLACESEL, TRUE, (LPARAM)L"");

-

-				fi2.chrgText.cpMin -= fi.chrgText.cpMax - fi.chrgText.cpMin;

-				fi2.chrgText.cpMax -= fi.chrgText.cpMax - fi.chrgText.cpMin;

-				m_log.SendMsg(EM_EXSETSEL, 0, (LPARAM)&fi2.chrgText);

-				m_log.SendMsg(EM_REPLACESEL, TRUE, (LPARAM)L"");

-

-				fi2.chrgText.cpMax = fi2.chrgText.cpMin;

-				fi2.chrgText.cpMin = fi.chrgText.cpMin;

-				m_log.SendMsg(EM_EXSETSEL, 0, (LPARAM)&fi2.chrgText);

-

-				CHARFORMAT2 cf2;

-				memset(&cf2, 0, sizeof(CHARFORMAT2));

-				cf2.cbSize = sizeof(cf2);

-				cf2.dwMask = CFM_PROTECTED;

-				cf2.dwEffects = CFE_PROTECTED;

-				m_log.SendMsg(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf2);

-			}

-			fi.chrg.cpMin = fi.chrgText.cpMax;

-		}

-		m_log.SendMsg(EM_SETSEL, -1, -1);

-	}

-

-	// run smileyadd

-	if (PluginConfig.g_SmileyAddAvail && fDoReplace) {

-		newsel.cpMax = -1;

-		newsel.cpMin = sel.cpMin;

-		if (newsel.cpMin < 0)

-			newsel.cpMin = 0;

-

-		SMADD_RICHEDIT3 sm = { sizeof(sm) };

-		sm.hwndRichEditControl = m_log.GetHwnd();

-		sm.Protocolname = m_si->pszModule;

-		sm.rangeToReplace = bRedraw ? nullptr : &newsel;

-		sm.disableRedraw = TRUE;

-		sm.hContact = m_si->hContact;

-		CallService(MS_SMILEYADD_REPLACESMILEYS, 0, (LPARAM)&sm);

-	}

-

-	// trim the message log to the number of most recent events

-	// this uses hidden marks in the rich text to find the events which should be deleted

-	if (m_si->bTrimmed) {

-		wchar_t szPattern[50];

-		mir_snwprintf(szPattern, L"~-+%p+-~", m_si->pLogEnd);

-

-		FINDTEXTEX fi;

-		fi.lpstrText = szPattern;

-		fi.chrg.cpMin = 0;

-		fi.chrg.cpMax = -1;

-		if (m_log.SendMsg(EM_FINDTEXTEX, FR_DOWN, (LPARAM)&fi) != 0) {

-			CHARRANGE rng;

-			rng.cpMin = 0;

-			rng.cpMax = 20;

-			m_log.SendMsg(EM_SETSEL, 0, fi.chrgText.cpMax + 1);

-			m_log.SendMsg(EM_REPLACESEL, TRUE, (LPARAM)L"");

-		}

-		m_si->bTrimmed = false;

-	}

-

-	// scroll log to bottom if the log was previously scrolled to bottom, else restore old position

-	if ((bRedraw || (UINT)scroll.nPos >= (UINT)scroll.nMax - scroll.nPage - 5 || scroll.nMax - scroll.nMin - scroll.nPage < 50))

-		ScrollToBottom();

-	else

-		m_log.SendMsg(EM_SETSCROLLPOS, 0, (LPARAM)&point);

-

-	// do we need to restore the selection

-	if (oldsel.cpMax != oldsel.cpMin) {

-		m_log.SendMsg(EM_EXSETSEL, 0, (LPARAM)&oldsel);

-		m_log.SendMsg(WM_SETREDRAW, TRUE, 0);

-		InvalidateRect(m_log.GetHwnd(), nullptr, TRUE);

-	}

-

-	// need to invalidate the window

-	if (bFlag) {

-		sel.cpMin = sel.cpMax = m_log.GetRichTextLength();

-		m_log.SendMsg(EM_EXSETSEL, 0, (LPARAM)&sel);

-		m_log.SendMsg(WM_SETREDRAW, TRUE, 0);

-		InvalidateRect(m_log.GetHwnd(), nullptr, TRUE);

-	}

-}

diff --git a/plugins/TabSRMM/src/container.cpp b/plugins/TabSRMM/src/container.cpp
index d7dfa45c66..a0e0c7f5ed 100644
--- a/plugins/TabSRMM/src/container.cpp
+++ b/plugins/TabSRMM/src/container.cpp
@@ -1200,11 +1200,6 @@ panel_found:
 				SendMessage(pContainer->m_hwndActive, WM_COMMAND, wParam, lParam);      // pass the IDOK command to the active child - fixes the "enter not working

 				break;

 			

-			case ID_FILE_SAVEMESSAGELOGAS:

-				if (dat)

-					dat->DM_SaveLogAsRTF();

-				break;

-			

 			case ID_FILE_CLOSEMESSAGESESSION:

 				PostMessage(pContainer->m_hwndActive, WM_CLOSE, 0, 1);

 				break;

diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp
index 9e06777e0d..d7087b5911 100644
--- a/plugins/TabSRMM/src/generic_msghandlers.cpp
+++ b/plugins/TabSRMM/src/generic_msghandlers.cpp
@@ -33,6 +33,7 @@
 /////////////////////////////////////////////////////////////////////////////////////////
 // Save message log for given session as RTF document
 
+/*
 void CMsgDialog::DM_SaveLogAsRTF() const
 {
 	if (m_hwndIEView != nullptr) {
@@ -67,10 +68,11 @@ void CMsgDialog::DM_SaveLogAsRTF() const
 			stream.dwCookie = (DWORD_PTR)szFilename;
 			stream.dwError = 0;
 			stream.pfnCallback = Utils::StreamOut;
-			m_log.SendMsg(EM_STREAMOUT, SF_RTF | SF_USECODEPAGE, (LPARAM)&stream);
+			m_rtf.SendMsg(EM_STREAMOUT, SF_RTF | SF_USECODEPAGE, (LPARAM)&stream);
 		}
 	}
 }
+*/
 
 /////////////////////////////////////////////////////////////////////////////////////////
 // checks if the balloon tooltip can be dismissed (usually called by WM_MOUSEMOVE events)
@@ -525,8 +527,6 @@ LRESULT CMsgDialog::DM_MsgWindowCmdHandler(UINT cmd, WPARAM wParam, LPARAM lPara
 void CMsgDialog::DM_InitRichEdit()
 {
 	bool fIsChat = isChat();
-
-	COLORREF colour = fIsChat ? g_Settings.crLogBackground : m_pContainer->m_theme.bg;
 	COLORREF inputcharcolor;
 
 	char *szStreamOut = nullptr;
@@ -534,7 +534,6 @@ void CMsgDialog::DM_InitRichEdit()
 		szStreamOut = m_message.GetRichTextRtf();
 	SetWindowText(m_message.GetHwnd(), L"");
 
-	m_log.SendMsg(EM_SETBKGNDCOLOR, 0, colour);
 	m_message.SendMsg(EM_SETBKGNDCOLOR, 0, m_pContainer->m_theme.inputbg);
 
 	CHARFORMAT2A cf2;
@@ -592,29 +591,12 @@ void CMsgDialog::DM_InitRichEdit()
 		m_message.SendMsg(EM_SETPARAFORMAT, 0, (LPARAM)&pf2);
 	}
 	m_message.SendMsg(EM_SETLANGOPTIONS, 0, (LPARAM)m_message.SendMsg(EM_GETLANGOPTIONS, 0, 0) & ~IMF_AUTOKEYBOARD);
-	pf2.wEffects = PFE_RTLPARA;
-	pf2.dwMask |= PFM_OFFSET;
-	if (m_dwFlags & MWF_INITMODE) {
-		pf2.dwMask |= (PFM_RIGHTINDENT | PFM_OFFSETINDENT);
-		pf2.dxStartIndent = 30;
-		pf2.dxRightIndent = 30;
-	}
-	pf2.dxOffset = m_pContainer->m_theme.left_indent + 30;
-
-	if (!fIsChat) {
-		ClearLog();
-		m_log.SendMsg(EM_SETPARAFORMAT, 0, (LPARAM)&pf2);
-		m_log.SendMsg(EM_SETLANGOPTIONS, 0, (LPARAM)m_log.SendMsg(EM_GETLANGOPTIONS, 0, 0) & ~IMF_AUTOKEYBOARD);
-		// set the scrollbars etc to RTL/LTR (only for manual RTL mode)
-		if (m_dwFlags & MWF_LOG_RTL) {
-			SetWindowLongPtr(m_message.GetHwnd(), GWL_EXSTYLE, GetWindowLongPtr(m_message.GetHwnd(), GWL_EXSTYLE) | WS_EX_RIGHT | WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR);
-			SetWindowLongPtr(m_log.GetHwnd(), GWL_EXSTYLE, GetWindowLongPtr(m_log.GetHwnd(), GWL_EXSTYLE) | WS_EX_RIGHT | WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR);
-		}
-		else {
-			SetWindowLongPtr(m_message.GetHwnd(), GWL_EXSTYLE, GetWindowLongPtr(m_message.GetHwnd(), GWL_EXSTYLE) &~(WS_EX_RIGHT | WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR));
-			SetWindowLongPtr(m_log.GetHwnd(), GWL_EXSTYLE, GetWindowLongPtr(m_log.GetHwnd(), GWL_EXSTYLE) &~(WS_EX_RIGHT | WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR));
-		}
-	}
+
+	if (m_dwFlags & MWF_LOG_RTL)
+		SetWindowLongPtr(m_message.GetHwnd(), GWL_EXSTYLE, GetWindowLongPtr(m_message.GetHwnd(), GWL_EXSTYLE) | WS_EX_RIGHT | WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR);
+	else
+		SetWindowLongPtr(m_message.GetHwnd(), GWL_EXSTYLE, GetWindowLongPtr(m_message.GetHwnd(), GWL_EXSTYLE) & ~(WS_EX_RIGHT | WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR));
+
 	if (szStreamOut != nullptr) {
 		SETTEXTEX stx = { ST_DEFAULT, CP_UTF8 };
 		m_message.SendMsg(EM_SETTEXTEX, (WPARAM)&stx, (LPARAM)szStreamOut);
@@ -686,30 +668,10 @@ void CMsgDialog::DM_ScrollToBottom(WPARAM wParam, LPARAM lParam)
 	if (IsIconic(m_pContainer->m_hwnd))
 		m_dwFlags |= MWF_DEFERREDSCROLL;
 
-	if (m_hwndIEView) {
-		PostMessage(m_hwnd, DM_SCROLLIEVIEW, 0, 0);
-		return;
-	}
-	if (m_hwndHPP) {
-		SendMessage(m_hwnd, DM_SCROLLIEVIEW, 0, 0);
-		return;
-	}
-
-	if (lParam)
-		SendMessage(m_log.GetHwnd(), WM_SIZE, 0, 0);
-
-	if (wParam == 1 && lParam == 1) {
-		int len = GetWindowTextLength(m_log.GetHwnd());
-		SendMessage(m_log.GetHwnd(), EM_SETSEL, len - 1, len - 1);
-	}
-
-	if (wParam)
-		SendMessage(m_log.GetHwnd(), WM_VSCROLL, MAKEWPARAM(SB_BOTTOM, 0), 0);
+	if (m_iLogMode == 0)
+		((CLogWindow *)m_pLog)->ScrollToBottom(wParam != 0, lParam != 0);
 	else
-		PostMessage(m_log.GetHwnd(), WM_VSCROLL, MAKEWPARAM(SB_BOTTOM, 0), 0);
-
-	if (lParam)
-		InvalidateRect(m_log.GetHwnd(), nullptr, FALSE);
+		m_pLog->ScrollToBottom();
 }
 
 void CMsgDialog::DM_RecalcPictureSize()
@@ -819,26 +781,18 @@ LRESULT CMsgDialog::DM_MouseWheelHandler(WPARAM wParam, LPARAM lParam)
 			return 0;
 		}
 	}
-	if (m_hwndIEView)
-		GetWindowRect(m_hwndIEView, &rc);
-	else if (m_hwndHPP)
-		GetWindowRect(m_hwndHPP, &rc);
-	else
-		GetWindowRect(m_log.GetHwnd(), &rc);
+
+	GetWindowRect(m_pLog->GetHwnd(), &rc);
 	if (PtInRect(&rc, pt)) {
-		HWND hwndLog = (m_hwndIEView || m_hwndHPP) ? m_hwndIWebBrowserControl : m_log.GetHwnd();
 		short wDirection = (short)HIWORD(wParam);
 
-		if (hwndLog == nullptr)
-			hwndLog = WindowFromPoint(pt);
-
 		if (LOWORD(wParam) & MK_SHIFT || M.GetByte("fastscroll", 0)) {
 			if (wDirection < 0)
-				SendMessage(hwndLog, WM_VSCROLL, MAKEWPARAM(SB_PAGEDOWN, 0), 0);
+				SendMessage(m_pLog->GetHwnd(), WM_VSCROLL, MAKEWPARAM(SB_PAGEDOWN, 0), 0);
 			else if (wDirection > 0)
-				SendMessage(hwndLog, WM_VSCROLL, MAKEWPARAM(SB_PAGEUP, 0), 0);
+				SendMessage(m_pLog->GetHwnd(), WM_VSCROLL, MAKEWPARAM(SB_PAGEUP, 0), 0);
 		}
-		else SendMessage(hwndLog, WM_MOUSEWHEEL, wParam, lParam);
+		else SendMessage(m_pLog->GetHwnd(), WM_MOUSEWHEEL, wParam, lParam);
 		return 0;
 	}
 
@@ -874,7 +828,9 @@ void CMsgDialog::DM_ThemeChanged()
 	m_hTheme = OpenThemeData(m_hwnd, L"EDIT");
 
 	if (m_hTheme != nullptr || (CSkin::m_skinEnabled && !item_log->IGNORED)) {
-		SetWindowLongPtr(m_log.GetHwnd(), GWL_EXSTYLE, GetWindowLongPtr(m_log.GetHwnd(), GWL_EXSTYLE) & ~WS_EX_STATICEDGE);
+		if (m_iLogMode == 0)
+			LOG()->DisableStaticEdge();
+
 		if (isChat())
 			SetWindowLongPtr(m_nickList.GetHwnd(), GWL_EXSTYLE, GetWindowLongPtr(m_nickList.GetHwnd(), GWL_EXSTYLE) & ~(WS_EX_CLIENTEDGE | WS_EX_STATICEDGE));
 	}
@@ -956,7 +912,6 @@ void CMsgDialog::DM_OptionsApplied(WPARAM, LPARAM lParam)
 	m_pPanel.getVisibility();
 
 	// small inner margins (padding) for the text areas
-	m_log.SendMsg(EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(0, 0));
 	m_message.SendMsg(EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(3, 3));
 
 	GetSendFormat();
@@ -1123,7 +1078,7 @@ int CMsgDialog::DM_SplitterGlobalEvent(WPARAM wParam, LPARAM lParam)
 void CMsgDialog::DM_AddDivider()
 {
 	if (!(m_dwFlags & MWF_DIVIDERSET) && PluginConfig.m_bUseDividers) {
-		if (GetWindowTextLength(m_log.GetHwnd()) > 0)
+		if (GetWindowTextLength(m_pLog->GetHwnd()) > 0)
 			m_dwFlags |= MWF_DIVIDERWANTED | MWF_DIVIDERSET;
 	}
 }
@@ -1181,7 +1136,7 @@ void CMsgDialog::DM_EventAdded(WPARAM hContact, LPARAM lParam)
 
 	if (hDbEvent != m_hDbEventFirst) {
 		if (!(m_dwFlagsEx & MWF_SHOW_SCROLLINGDISABLED))
-			StreamInEvents(hDbEvent, 1, 1, nullptr);
+			m_pLog->LogEvents(hDbEvent, 1, 1);
 		else {
 			if (m_iNextQueuedEvent >= m_iEventQueueSize) {
 				m_hQueuedEvents = (MEVENT*)mir_realloc(m_hQueuedEvents, (m_iEventQueueSize + 10) * sizeof(MEVENT));
diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp
index 5a6cb1c33d..9df35769e1 100644
--- a/plugins/TabSRMM/src/globals.cpp
+++ b/plugins/TabSRMM/src/globals.cpp
@@ -97,17 +97,6 @@ void CGlobals::reloadSystemModulesChanged()
 		HookEvent(ME_SMILEYADD_OPTIONSCHANGED, ::SmileyAddOptionsChanged);

 	}

 

-	// ieView

-	BOOL bIEView = ServiceExists(MS_IEVIEW_WINDOW);

-	if (bIEView) {

-		BOOL bOldIEView = M.GetByte("ieview_installed", 0);

-		if (bOldIEView != bIEView)

-			db_set_b(0, SRMSGMOD_T, "default_ieview", 1);

-		db_set_b(0, SRMSGMOD_T, "ieview_installed", 1);

-		HookEvent(ME_IEVIEW_OPTIONSCHANGED, ::IEViewOptionsChanged);

-	}

-	else db_set_b(0, SRMSGMOD_T, "ieview_installed", 0);

-

 	m_hwndClist = g_clistApi.hwndContactList;

 

 	CMenuItem mi(&g_plugin);

@@ -570,5 +559,5 @@ void CGlobals::logStatusChange(WPARAM wParam, const CContactCache *c)
 	dbei.eventType = EVENTTYPE_STATUSCHANGE;

 	dbei.timestamp = time(0);

 	dbei.szModule = (char*)c->getProto();

-	dat->StreamInEvents(0, 1, 1, &dbei);

+	dat->LogEvent(&dbei);

 }

diff --git a/plugins/TabSRMM/src/globals.h b/plugins/TabSRMM/src/globals.h
index 543bed01d0..579a507603 100644
--- a/plugins/TabSRMM/src/globals.h
+++ b/plugins/TabSRMM/src/globals.h
@@ -68,7 +68,7 @@ public:
 	HICON       g_iconOverlayDisabled, g_iconOverlayEnabled, g_iconClock;

 	HCURSOR     hCurSplitNS, hCurSplitWE, hCurSplitSW, hCurSplitWSE;

 	HBITMAP     g_hbmUnknown;

-	bool        g_SmileyAddAvail, g_WantIEView, g_WantHPP;

+	bool        g_SmileyAddAvail;

 	HIMAGELIST  g_hImageList;

 	HICON       g_IconMsgEvent, g_IconTypingEvent, g_IconFileEvent, g_IconSend;

 	HICON       g_IconMsgEventBig, g_IconTypingEventBig;

diff --git a/plugins/TabSRMM/src/mim.cpp b/plugins/TabSRMM/src/mim.cpp
index 5b3258ea7d..db31ddb128 100644
--- a/plugins/TabSRMM/src/mim.cpp
+++ b/plugins/TabSRMM/src/mim.cpp
@@ -193,6 +193,24 @@ void CMimAPI::InitAPI()
 		}
 	}
 	else m_haveBufferedPaint = false;
+
+	switch (GetByte("default_ieview", -1)) {
+	case 1:
+		db_set_s(0, "SRMM", "Logger", "ieview");
+		__fallthrough;
+
+	case 0:
+		db_unset(0, SRMSGMOD_T, "default_ieview");
+	}
+
+	switch (GetByte("default_hpp", -1)) {
+	case 1:
+		db_set_s(0, "SRMM", "Logger", "hpp");
+		__fallthrough;
+
+	case 0:
+		db_unset(0, SRMSGMOD_T, "default_hpp");
+	}
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index dcff6711e9..6a6867b2d4 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -35,7 +35,6 @@ bool IsStringValidLink(wchar_t *pszText);
 static int g_cLinesPerPage = 0;

 static int g_iWheelCarryover = 0;

 

-static const UINT sendControls[] = { IDC_SRMM_MESSAGE, IDC_SRMM_LOG };

 static const UINT formatControls[] = { IDC_SRMM_BOLD, IDC_SRMM_ITALICS, IDC_SRMM_UNDERLINE, IDC_FONTSTRIKEOUT };

 static const UINT addControls[] = { IDC_ADD, IDC_CANCELADD };

 static const UINT btnControls[] = { IDC_RETRY, IDC_CANCELSEND, IDC_MSGSENDLATER, IDC_ADD, IDC_CANCELADD };

@@ -141,12 +140,7 @@ void CMsgDialog::SetDialogToType()
 

 	Utils::enableDlgControl(m_hwnd, IDC_TIME, true);

 

-	if (m_hwndIEView || m_hwndHPP) {

-		m_log.Hide();

-		m_log.Enable(false);

-		m_message.Show();

-	}

-	else ShowMultipleControls(m_hwnd, sendControls, _countof(sendControls), SW_SHOW);

+	m_message.Show();

 

 	ShowMultipleControls(m_hwnd, errorControls, _countof(errorControls), m_dwFlags & MWF_ERRORSTATE ? SW_SHOW : SW_HIDE);

 

@@ -405,6 +399,8 @@ bool CMsgDialog::OnInitDialog()
 	else

 		m_pWnd = nullptr;

 

+	m_iLogMode = m_pLog->GetType();

+

 	// set up Windows themes

 	DM_ThemeChanged();

 

@@ -504,10 +500,10 @@ bool CMsgDialog::OnInitDialog()
 		LoadLocalFlags();

 

 	DM_InitTip();

-	m_pPanel.getVisibility();

 

 	m_dwFlagsEx |= M.GetByte(m_hContact, "splitoverride", 0) ? MWF_SHOW_SPLITTEROVERRIDE : 0;

-	SetMessageLog();

+

+	m_pPanel.getVisibility();

 	if (m_hContact)

 		m_pPanel.loadHeight();

 

@@ -565,15 +561,6 @@ bool CMsgDialog::OnInitDialog()
 	SetDlgItemText(m_hwnd, IDC_CANCELSEND, TranslateT("Cancel"));

 	SetDlgItemText(m_hwnd, IDC_MSGSENDLATER, TranslateT("Send later"));

 

-	m_log.SendMsg(EM_AUTOURLDETECT, TRUE, 0);

-	m_log.SendMsg(EM_EXLIMITTEXT, 0, 0x7FFFFFFF);

-	m_log.SendMsg(EM_SETUNDOLIMIT, 0, 0);

-	m_log.SendMsg(EM_HIDESELECTION, TRUE, 0);

-	m_log.SendMsg(EM_SETEVENTMASK, 0, ENM_MOUSEEVENTS | ENM_KEYEVENTS | ENM_LINK);

-	m_log.SendMsg(EM_SETEDITSTYLE, SES_EXTENDBACKCOLOR, SES_EXTENDBACKCOLOR);

-	m_log.SendMsg(EM_SETLANGOPTIONS, 0, m_log.SendMsg(EM_GETLANGOPTIONS, 0, 0) & ~IMF_AUTOFONTSIZEADJUST);

-	m_log.SendMsg(EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(3, 3));

-

 	m_message.SendMsg(EM_SETEVENTMASK, 0, ENM_REQUESTRESIZE | ENM_MOUSEEVENTS | ENM_SCROLL | ENM_KEYEVENTS | ENM_CHANGE);

 	m_message.SendMsg(EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(3, 3));

 	m_message.SetReadOnly(false);

@@ -686,8 +673,8 @@ bool CMsgDialog::OnInitDialog()
 	m_dwLastActivity = GetTickCount() - 1000;

 	m_pContainer->m_dwLastActivity = m_dwLastActivity;

 

-	if (m_hwndHPP)

-		mir_subclassWindow(m_hwndHPP, HPPKFSubclassProc);

+	if (m_iLogMode == WANT_HPP_LOG)

+		mir_subclassWindow(m_pLog->GetHwnd(), HPPKFSubclassProc);

 

 	m_dwFlags &= ~MWF_INITMODE;

 	NotifyEvent(MSG_WINDOW_EVT_OPEN);

@@ -796,20 +783,6 @@ void CMsgDialog::OnDestroy()
 

 	NotifyEvent(MSG_WINDOW_EVT_CLOSE);

 

-	// clean up IEView and H++ log windows

-	if (m_hwndIEView != nullptr) {

-		IEVIEWWINDOW ieWindow = {};

-		ieWindow.iType = IEW_DESTROY;

-		ieWindow.hwnd = m_hwndIEView;

-		CallService(MS_IEVIEW_WINDOW, 0, (LPARAM)&ieWindow);

-	}

-	if (m_hwndHPP) {

-		IEVIEWWINDOW ieWindow = {};

-		ieWindow.iType = IEW_DESTROY;

-		ieWindow.hwnd = m_hwndHPP;

-		CallService(MS_HPP_EG_WINDOW, 0, (LPARAM)&ieWindow);

-	}

-

 	CSuper::OnDestroy();

 }

 

@@ -832,7 +805,7 @@ void CMsgDialog::onClick_Ok(CCtrlButton *)
 		fi.chrg.cpMin = 0;

 		fi.chrg.cpMax = -1;

 		fi.lpstrText = L"{";

-		int final_sendformat = m_message.SendMsg(EM_FINDTEXTEX, FR_DOWN, (LPARAM)&fi) == -1 ? m_SendFormat : 0;

+		final_sendformat = m_message.SendMsg(EM_FINDTEXTEX, FR_DOWN, (LPARAM)&fi) == -1 ? m_SendFormat : 0;

 		fi.lpstrText = L"}";

 		final_sendformat = m_message.SendMsg(EM_FINDTEXTEX, FR_DOWN, (LPARAM)&fi) == -1 ? final_sendformat : 0;

 	}

@@ -959,43 +932,25 @@ void CMsgDialog::onClick_Add(CCtrlButton*)
 

 void CMsgDialog::onClick_Quote(CCtrlButton*)

 {

-	CHARRANGE sel;

 	SETTEXTEX stx = { ST_SELECTION, 1200 };

 

-	MEVENT hDBEvent = m_hDbEventLast;

-	if (m_hwndIEView || m_hwndHPP) { // IEView quoting support..

-		IEVIEWEVENT event = { sizeof(event) };

-		event.hContact = m_hContact;

-		event.dwFlags = 0;

-		event.iType = IEE_GET_SELECTION;

-

-		wchar_t *selected;

-		if (m_hwndIEView) {

-			event.hwnd = m_hwndIEView;

-			selected = (wchar_t*)CallService(MS_IEVIEW_EVENT, 0, (LPARAM)&event);

-		}

-		else {

-			event.hwnd = m_hwndHPP;

-			selected = (wchar_t*)CallService(MS_HPP_EG_EVENT, 0, (LPARAM)&event);

-		}

-

-		if (selected != nullptr) {

-			ptrW szQuoted(QuoteText(selected));

-			m_message.SendMsg(EM_SETTEXTEX, (WPARAM)&stx, (LPARAM)szQuoted);

-			return;

-		}

-

-		hDBEvent = db_event_last(m_hContact);

+	wchar_t *selected = m_pLog->GetSelection();

+	if (selected != nullptr) {

+		ptrW szQuoted(QuoteText(selected));

+		m_message.SendMsg(EM_SETTEXTEX, (WPARAM)&stx, (LPARAM)szQuoted);

+		return;

 	}

 

+	MEVENT hDBEvent = db_event_last(m_hContact);

 	if (hDBEvent == 0)

 		return;

 

-	m_log.SendMsg(EM_EXGETSEL, 0, (LPARAM)&sel);

+	CHARRANGE sel;

+	LOG()->WndProc(EM_EXGETSEL, 0, (LPARAM)&sel);

 	if (sel.cpMin == sel.cpMax) {

 		DBEVENTINFO dbei = {};

 		dbei.cbBlob = db_event_getBlobSize(hDBEvent);

-		wchar_t *szText = (wchar_t*)mir_alloc((dbei.cbBlob + 1) * sizeof(wchar_t));   //URLs are made one char bigger for crlf

+		wchar_t *szText = (wchar_t*)mir_alloc((dbei.cbBlob + 1) * sizeof(wchar_t));   // URLs are made one char bigger for crlf

 		dbei.pBlob = (BYTE*)szText;

 		db_event_get(hDBEvent, &dbei);

 		int iSize = int(mir_strlen((char*)dbei.pBlob)) + 1;

@@ -1027,21 +982,20 @@ void CMsgDialog::onClick_Quote(CCtrlButton*)
 			bNeedsFree = true;

 		}

 		

-		if (szConverted != nullptr) {

-			ptrW szQuoted(QuoteText(szConverted));

-			m_message.SendMsg(EM_SETTEXTEX, (WPARAM)&stx, (LPARAM)szQuoted);

-		}

+		if (szConverted != nullptr)

+			m_message.SendMsg(EM_SETTEXTEX, (WPARAM)&stx, ptrW(QuoteText(szConverted)));

+

 		mir_free(szText);

 		if (bNeedsFree)

 			mir_free(szConverted);

 	}

 	else {

-		ptrA szFromStream(m_log.GetRichTextRtf(true, true));

+		ptrA szFromStream(LOG()->GetRichTextRtf(true, true));

 		ptrW converted(mir_utf8decodeW(szFromStream));

 		Utils::FilterEventMarkers(converted);

-		ptrW szQuoted(QuoteText(converted));

-		m_message.SendMsg(EM_SETTEXTEX, (WPARAM)&stx, (LPARAM)szQuoted);

+		m_message.SendMsg(EM_SETTEXTEX, (WPARAM)&stx, ptrW(QuoteText(converted)));

 	}

+

 	SetFocus(m_message.GetHwnd());

 }

 

@@ -1086,7 +1040,7 @@ void CMsgDialog::onClick_ShowNickList(CCtrlButton *pButton)
 	Resize();

 	if (CSkin::m_skinEnabled)

 		InvalidateRect(m_hwnd, nullptr, TRUE);

-	ScrollToBottom();

+	m_pLog->ScrollToBottom();

 }

 

 void CMsgDialog::onDblClick_List(CCtrlListBox *pList)

@@ -1160,7 +1114,7 @@ int CMsgDialog::Resizer(UTILRESIZECONTROL *urc)
 	int  iSplitterX = m_pContainer->m_pSettings->iSplitterX;

 

 	RECT rc, rcButton;

-	GetClientRect(m_log.GetHwnd(), &rc);

+	GetClientRect(m_pLog->GetHwnd(), &rc);

 	GetClientRect(GetDlgItem(m_hwnd, IDC_PROTOCOL), &rcButton);

 

 	if (m_bIsAutosizingInput)

@@ -1609,7 +1563,7 @@ int CMsgDialog::OnFilter(MSGFILTER *pFilter)
 			return _dlgReturn(m_hwnd, 1);

 		}

 		if (wp == VK_DIVIDE) {

-			SetFocus(m_log.GetHwnd());

+			SetFocus(m_pLog->GetHwnd());

 			return _dlgReturn(m_hwnd, 1);

 		}

 		if (wp == VK_ADD) {

@@ -1653,7 +1607,7 @@ int CMsgDialog::OnFilter(MSGFILTER *pFilter)
 			if (GetSendButtonState(m_hwnd) != PBS_DISABLED && !(m_pContainer->m_dwFlags & CNT_HIDETOOLBAR))

 				SetFocus(GetDlgItem(m_hwnd, IDOK));

 			else

-				SetFocus(m_log.GetHwnd());

+				SetFocus(m_pLog->GetHwnd());

 			return _dlgReturn(m_hwnd, 1);

 		}

 

@@ -1669,14 +1623,14 @@ int CMsgDialog::OnFilter(MSGFILTER *pFilter)
 		POINT pt;

 		GetCursorPos(&pt);

 		RECT rc;

-		GetWindowRect(m_log.GetHwnd(), &rc);

+		GetWindowRect(m_pLog->GetHwnd(), &rc);

 		if (PtInRect(&rc, pt)) {

 			short wDirection = (short)HIWORD(wp);

 			if (LOWORD(wp) & MK_SHIFT) {

 				if (wDirection < 0)

-					m_log.SendMsg(WM_VSCROLL, MAKEWPARAM(SB_PAGEDOWN, 0), 0);

+					LOG()->WndProc(WM_VSCROLL, MAKEWPARAM(SB_PAGEDOWN, 0), 0);

 				else if (wDirection > 0)

-					m_log.SendMsg(WM_VSCROLL, MAKEWPARAM(SB_PAGEUP, 0), 0);

+					LOG()->WndProc(WM_VSCROLL, MAKEWPARAM(SB_PAGEUP, 0), 0);

 				return 0;

 			}

 			return 0;

@@ -1750,13 +1704,13 @@ int CMsgDialog::OnFilter(MSGFILTER *pFilter)
 		// holding ctrl-alt does the same, but pastes formatted text

 		if (pFilter->nmhdr.idFrom == IDC_SRMM_LOG && M.GetByte("autocopy", 1)) {

 			CHARRANGE cr;

-			m_log.SendMsg(EM_EXGETSEL, 0, (LPARAM)&cr);

+			LOG()->WndProc(EM_EXGETSEL, 0, (LPARAM)&cr);

 			if (cr.cpMax == cr.cpMin)

 				break;

 			cr.cpMin = cr.cpMax;

 			if (isCtrl) {

 				SETTEXTEX stx = { ST_KEEPUNDO | ST_SELECTION, CP_UTF8 };

-				ptrA streamOut(m_log.GetRichTextRtf(!isAlt, true));

+				ptrA streamOut(LOG()->GetRichTextRtf(!isAlt, true));

 				if (streamOut) {

 					Utils::FilterEventMarkers(streamOut);

 					m_message.SendMsg(EM_SETTEXTEX, (WPARAM)&stx, (LPARAM)streamOut);

@@ -1764,7 +1718,7 @@ int CMsgDialog::OnFilter(MSGFILTER *pFilter)
 				SetFocus(m_message.GetHwnd());

 			}

 			else if (!isShift) {

-				m_log.SendMsg(WM_COPY, 0, 0);

+				LOG()->WndProc(WM_COPY, 0, 0);

 				SetFocus(m_message.GetHwnd());

 				if (m_pContainer->m_hwndStatus)

 					SendMessage(m_pContainer->m_hwndStatus, SB_SETTEXT, 0, (LPARAM)TranslateT("Selection copied to clipboard"));

@@ -1927,135 +1881,6 @@ INT_PTR CALLBACK CMsgDialog::FilterWndProc(HWND hwndDlg, UINT uMsg, WPARAM wPara
 

 /////////////////////////////////////////////////////////////////////////////////////////

 

-LRESULT CMsgDialog::WndProc_Log(UINT msg, WPARAM wParam, LPARAM lParam)

-{

-	bool isCtrl, isShift, isAlt;

-

-	switch (msg) {

-	case WM_KILLFOCUS:

-		if (wParam != (WPARAM)m_log.GetHwnd() && 0 != wParam) {

-			CHARRANGE cr;

-			m_log.SendMsg(EM_EXGETSEL, 0, (LPARAM)&cr);

-			if (cr.cpMax != cr.cpMin) {

-				cr.cpMin = cr.cpMax;

-				m_log.SendMsg(EM_EXSETSEL, 0, (LPARAM)&cr);

-			}

-		}

-		break;

-

-	case WM_CHAR:

-		KbdState(isShift, isCtrl, isAlt);

-		if (wParam == 0x03 && isCtrl) // Ctrl+C

-			return WMCopyHandler(msg, wParam, lParam);

-		if (wParam == 0x11 && isCtrl) // Ctrl+Q

-			m_btnQuote.Click();

-		break;

-

-	case WM_LBUTTONUP:

-		if (isChat() && g_Settings.bClickableNicks) {

-			POINT pt = { LOWORD(lParam), HIWORD(lParam) };

-			CheckCustomLink(m_log.GetHwnd(), &pt, msg, wParam, lParam, TRUE);

-		}

-		if (M.GetByte("autocopy", 1)) {

-			CHARRANGE sel;

-			SendMessage(m_log.GetHwnd(), EM_EXGETSEL, 0, (LPARAM)& sel);

-			if (sel.cpMin != sel.cpMax) {

-				SendMessage(m_log.GetHwnd(), WM_COPY, 0, 0);

-				sel.cpMin = sel.cpMax;

-				SendMessage(m_log.GetHwnd(), EM_EXSETSEL, 0, (LPARAM)& sel);

-				SetFocus(m_message.GetHwnd());

-			}

-		}

-		break;

-

-	case WM_LBUTTONDOWN:

-	case WM_LBUTTONDBLCLK:

-	case WM_RBUTTONUP:

-	case WM_RBUTTONDOWN:

-	case WM_RBUTTONDBLCLK:

-		if (isChat() && g_Settings.bClickableNicks) {

-			POINT pt = { LOWORD(lParam), HIWORD(lParam) };

-			CheckCustomLink(m_log.GetHwnd(), &pt, msg, wParam, lParam, TRUE);

-		}

-		break;

-

-	case WM_SETCURSOR:

-		if (g_Settings.bClickableNicks && isChat() && (LOWORD(lParam) == HTCLIENT)) {

-			POINT pt;

-			GetCursorPos(&pt);

-			ScreenToClient(m_log.GetHwnd(), &pt);

-			if (CheckCustomLink(m_log.GetHwnd(), &pt, msg, wParam, lParam, FALSE))

-				return TRUE;

-		}

-		break;

-

-	case WM_SYSKEYUP:

-		if (wParam == VK_MENU) {

-			ProcessHotkeysByMsgFilter(m_log, msg, wParam, lParam);

-			return 0;

-		}

-		break;

-

-	case WM_SYSKEYDOWN:

-		m_bkeyProcessed = false;

-		if (ProcessHotkeysByMsgFilter(m_log, msg, wParam, lParam)) {

-			m_bkeyProcessed = true;

-			return 0;

-		}

-		break;

-

-	case WM_SYSCHAR:

-		if (m_bkeyProcessed) {

-			m_bkeyProcessed = false;

-			return 0;

-		}

-		break;

-

-	case WM_KEYDOWN:

-		KbdState(isShift, isCtrl, isAlt);

-		if (wParam == VK_INSERT && isCtrl)

-			return WMCopyHandler(msg, wParam, lParam);

-

-		if (wParam == 0x57 && isCtrl) { // ctrl-w (close window)

-			PostMessage(m_hwnd, WM_CLOSE, 0, 1);

-			return TRUE;

-		}

-

-		break;

-

-	case WM_COPY:

-		return WMCopyHandler(msg, wParam, lParam);

-

-	case WM_NCCALCSIZE:

-		return CSkin::NcCalcRichEditFrame(m_log.GetHwnd(), this, ID_EXTBKHISTORY, msg, wParam, lParam, stubLogProc);

-

-	case WM_NCPAINT:

-		return CSkin::DrawRichEditFrame(m_log.GetHwnd(), this, ID_EXTBKHISTORY, msg, wParam, lParam, stubLogProc);

-

-	case WM_CONTEXTMENU:

-		if (!isChat()) {

-			POINT pt;

-			if (lParam == 0xFFFFFFFF) {

-				CHARRANGE sel;

-				m_log.SendMsg(EM_EXGETSEL, 0, (LPARAM)& sel);

-				m_log.SendMsg(EM_POSFROMCHAR, (WPARAM)& pt, (LPARAM)sel.cpMax);

-				ClientToScreen(m_log.GetHwnd(), &pt);

-			}

-			else {

-				pt.x = GET_X_LPARAM(lParam);

-				pt.y = GET_Y_LPARAM(lParam);

-			}

-

-			ShowPopupMenu(m_log, pt);

-			return TRUE;

-		}

-	}

-

-	return CSuper::WndProc_Log(msg, wParam, lParam);

-}

-

-/////////////////////////////////////////////////////////////////////////////////////////

-

 LRESULT CMsgDialog::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	bool isCtrl, isShift, isAlt;

@@ -2161,7 +1986,7 @@ LRESULT CMsgDialog::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam)
 				if ((GetSendButtonState(GetHwnd()) != PBS_DISABLED))

 					SetFocus(m_btnOk.GetHwnd());

 				else

-					SetFocus(m_log.GetHwnd());

+					SetFocus(m_pLog->GetHwnd());

 			}

 			return 0;

 		}

@@ -2242,10 +2067,7 @@ LRESULT CMsgDialog::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam)
 				else if (wParam == VK_DOWN)

 					wp = MAKEWPARAM(SB_LINEDOWN, 0);

 

-				if (m_hwndIEView == nullptr && m_hwndHPP == nullptr)

-					m_log.SendMsg(WM_VSCROLL, wp, 0);

-				else

-					SendMessage(m_hwndIWebBrowserControl, WM_VSCROLL, wp, 0);

+				LOG()->WndProc(WM_VSCROLL, wp, 0);

 				return 0;

 			}

 		}

@@ -2603,7 +2425,7 @@ INT_PTR CMsgDialog::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 

 	case WM_SIZE:

 		if (wParam == SIZE_MAXIMIZED)

-			ScrollToBottom();

+			m_pLog->ScrollToBottom();

 

 		if (!IsIconic(m_hwnd)) {

 			if (m_ipFieldHeight == 0)

@@ -2684,7 +2506,7 @@ INT_PTR CMsgDialog::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 			if (GetDlgItem(m_hwnd, IDC_CLIST) != nullptr) {

 				RECT rcLog;

 				GetClientRect(m_hwnd, &rcClient);

-				GetClientRect(m_log.GetHwnd(), &rcLog);

+				GetClientRect(m_pLog->GetHwnd(), &rcLog);

 				rc.top = 0;

 				rc.right = rcClient.right;

 				rc.left = rcClient.right - m_iMultiSplit;

@@ -2694,8 +2516,7 @@ INT_PTR CMsgDialog::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 				MoveWindow(GetDlgItem(m_hwnd, IDC_CLIST), rc.left, rc.top, rc.right - rc.left, rcLog.bottom - rcLog.top, FALSE);

 			}

 

-			if (m_hwndIEView || m_hwndHPP)

-				ResizeIeView();

+			m_pLog->Resize();

 

 			DetermineMinHeight();

 		}

@@ -2920,22 +2741,7 @@ INT_PTR CMsgDialog::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 			RemakeLog();

 		}

 		else if (m_hContact == wParam && db_mc_isSub(wParam) && db_event_getContact(lParam) != wParam)

-			StreamInEvents(lParam, 1, 1, nullptr);

-		return 0;

-

-	case DM_SCROLLIEVIEW:

-		{

-			IEVIEWWINDOW iew = { sizeof(iew) };

-			iew.iType = IEW_SCROLLBOTTOM;

-			if (m_hwndIEView) {

-				iew.hwnd = m_hwndIEView;

-				CallService(MS_IEVIEW_WINDOW, 0, (LPARAM)&iew);

-			}

-			else if (m_hwndHPP) {

-				iew.hwnd = m_hwndHPP;

-				CallService(MS_HPP_EG_WINDOW, 0, (LPARAM)&iew);

-			}

-		}

+			m_pLog->LogEvents(lParam, 1, 1);

 		return 0;

 

 	case HM_DBEVENTADDED:

@@ -3019,7 +2825,7 @@ INT_PTR CMsgDialog::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 			Resize();

 			PostMessage(m_hwnd, DM_UPDATEPICLAYOUT, 0, 0);

 

-			if (m_hwndIEView != nullptr)

+			if (m_iLogMode != WANT_IEVIEW_LOG)

 				SetFocus(m_message.GetHwnd());

 			if (m_pContainer->m_dwFlags & CNT_SIDEBAR)

 				m_pContainer->m_pSideBar->Layout();

@@ -3263,8 +3069,7 @@ INT_PTR CMsgDialog::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 		break;

 

 	case DM_IEVIEWOPTIONSCHANGED:

-		if (m_hwndIEView)

-			RemakeLog();

+		RemakeLog();

 		break;

 

 	case DM_SMILEYOPTIONSCHANGED:

diff --git a/plugins/TabSRMM/src/msgdlgother.cpp b/plugins/TabSRMM/src/msgdlgother.cpp
index 5d9ed3f914..e6ebb9eb48 100644
--- a/plugins/TabSRMM/src/msgdlgother.cpp
+++ b/plugins/TabSRMM/src/msgdlgother.cpp
@@ -1219,7 +1219,7 @@ void CMsgDialog::RemakeLog()
 	m_szMicroLf[0] = 0;
 	m_lastEventTime = 0;
 	m_iLastEventType = -1;
-	StreamInEvents(m_hDbEventFirst, -1, 0, nullptr);
+	m_pLog->LogEvents(m_hDbEventFirst, -1, 0);
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
@@ -1228,7 +1228,7 @@ void CMsgDialog::ReplayQueue()
 {
 	for (int i = 0; i < m_iNextQueuedEvent; i++)
 		if (m_hQueuedEvents[i] != 0)
-			StreamInEvents(m_hQueuedEvents[i], 1, 1, nullptr);
+			m_pLog->LogEvents(m_hQueuedEvents[i], 1, 1);
 
 	m_iNextQueuedEvent = 0;
 	SetDlgItemText(m_hwnd, IDC_LOGFROZENTEXT, m_bNotOnList ? TranslateT("Contact not on list. You may add it...") :
@@ -1236,28 +1236,6 @@ void CMsgDialog::ReplayQueue()
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
-
-void CMsgDialog::ResizeIeView()
-{
-	RECT rcRichEdit;
-	GetWindowRect(m_log.GetHwnd(), &rcRichEdit);
-
-	POINT pt = { rcRichEdit.left, rcRichEdit.top };
-	ScreenToClient(m_hwnd, &pt);
-
-	IEVIEWWINDOW ieWindow = { sizeof(ieWindow) };
-	ieWindow.iType = IEW_SETPOS;
-	ieWindow.parent = m_hwnd;
-	ieWindow.hwnd = m_hwndIEView ? m_hwndIEView : m_hwndHPP;
-	ieWindow.x = pt.x;
-	ieWindow.y = pt.y;
-	ieWindow.cx = rcRichEdit.right - rcRichEdit.left;
-	ieWindow.cy = rcRichEdit.bottom - rcRichEdit.top;
-	if (ieWindow.cx != 0 && ieWindow.cy != 0)
-		CallService(m_hwndIEView ? MS_IEVIEW_WINDOW : MS_HPP_EG_WINDOW, 0, (LPARAM)& ieWindow);
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
 // saves a contact picture to disk
 // takes hbm (bitmap handle) and bool isOwnPic (1 == save the picture as your own avatar)
 // requires AVS service (Miranda 0.7+)
@@ -1347,13 +1325,6 @@ void CMsgDialog::SaveSplitter()
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
-
-void CMsgDialog::ScrollToBottom()
-{
-	DM_ScrollToBottom(0, 0);
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
 // send a pasted bitmap by file transfer.
 
 static LIST<wchar_t> vTempFilenames(5);
@@ -1468,41 +1439,6 @@ void TSAPI CleanTempFiles()
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
-
-void CMsgDialog::SetMessageLog()
-{
-	if (isChat())
-		return;
-
-	unsigned int iLogMode = GetIEViewMode(m_hContact);
-
-	if (iLogMode == WANT_IEVIEW_LOG && m_hwndIEView == nullptr) {
-		IEVIEWWINDOW ieWindow = {};
-		ieWindow.iType = IEW_CREATE;
-		ieWindow.dwMode = IEWM_TABSRMM;
-		ieWindow.parent = m_hwnd;
-		ieWindow.cx = 200;
-		ieWindow.cy = 200;
-		CallService(MS_IEVIEW_WINDOW, 0, (LPARAM)& ieWindow);
-		m_hwndIEView = ieWindow.hwnd;
-		m_log.Hide();
-		m_log.Enable(false);
-	}
-	else if (iLogMode == WANT_HPP_LOG && m_hwndHPP == nullptr) {
-		IEVIEWWINDOW ieWindow = {};
-		ieWindow.iType = IEW_CREATE;
-		ieWindow.dwMode = IEWM_TABSRMM;
-		ieWindow.parent = m_hwnd;
-		ieWindow.cx = 10;
-		ieWindow.cy = 10;
-		CallService(MS_HPP_EG_WINDOW, 0, (LPARAM)& ieWindow);
-		m_hwndHPP = ieWindow.hwnd;
-		m_log.Hide();
-		m_log.Enable(false);
-	}
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////
 // Sets a status bar text for a contact
 
 void CMsgDialog::SetStatusText(const wchar_t *wszText, HICON hIcon)
@@ -1530,7 +1466,7 @@ void CMsgDialog::ShowFilterMenu()
 
 	RECT rcFilter, rcLog;
 	GetClientRect(m_hwndFilter, &rcFilter);
-	GetWindowRect(m_log.GetHwnd(), &rcLog);
+	GetWindowRect(m_pLog->GetHwnd(), &rcLog);
 
 	POINT pt;
 	pt.x = rcLog.right; pt.y = rcLog.bottom;
@@ -1744,7 +1680,7 @@ void CMsgDialog::SplitterMoved(int coord, HWND hwnd)
 		break;
 
 	case IDC_PANELSPLITTER:
-		GetClientRect(m_log.GetHwnd(), &rc);
+		GetClientRect(m_pLog->GetHwnd(), &rc);
 
 		POINT	pnt = { 0, coord };
 		ScreenToClient(m_hwnd, &pnt);
@@ -1853,37 +1789,14 @@ LBL_SkipEnd:
 void CMsgDialog::tabClearLog()
 {
 	if (isChat()) {
-		SESSION_INFO *s = g_chatApi.SM_FindSession(m_si->ptszID, m_si->pszModule);
-		if (s) {
-			ClearLog();
-			g_chatApi.LM_RemoveAll(&s->pLog, &s->pLogEnd);
-			s->iEventCount = 0;
-			s->LastTime = 0;
-			m_si->iEventCount = 0;
-			m_si->LastTime = 0;
-			m_si->pLog = s->pLog;
-			m_si->pLogEnd = s->pLogEnd;
-			PostMessage(m_hwnd, WM_MOUSEACTIVATE, 0, 0);
-		}
-	}
-	else {
-		if (m_hwndIEView || m_hwndHPP) {
-			IEVIEWEVENT event = {};
-			event.iType = IEE_CLEAR_LOG;
-			event.dwFlags = (m_dwFlags & MWF_LOG_RTL) ? IEEF_RTL : 0;
-			event.hContact = m_hContact;
-			if (m_hwndIEView) {
-				event.hwnd = m_hwndIEView;
-				CallService(MS_IEVIEW_EVENT, 0, (LPARAM) & event);
-			}
-			else {
-				event.hwnd = m_hwndHPP;
-				CallService(MS_HPP_EG_EVENT, 0, (LPARAM) & event);
-			}
-		}
-		m_log.SetText(L"");
-		m_hDbEventFirst = 0;
+		g_chatApi.LM_RemoveAll(&m_si->pLog, &m_si->pLogEnd);
+		m_si->iEventCount = 0;
+		m_si->LastTime = 0;
+		PostMessage(m_hwnd, WM_MOUSEACTIVATE, 0, 0);
 	}
+
+	m_pLog->Clear();
+	m_hDbEventFirst = 0;
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
@@ -1944,7 +1857,7 @@ void CMsgDialog::UpdateNickList()
 
 void CMsgDialog::UpdateOptions()
 {
-	m_log.SendMsg(EM_SETBKGNDCOLOR, 0, db_get_dw(0, FONTMODULE, SRMSGSET_BKGCOLOUR, SRMSGDEFSET_BKGCOLOUR));
+	m_pLog->UpdateOptions();
 
 	DM_InitRichEdit();
 	m_btnOk.SendMsg(BUTTONSETASNORMAL, TRUE, 0);
@@ -2380,28 +2293,28 @@ void CMsgDialog::UpdateWindowState(UINT msg)
 
 		m_pPanel.Invalidate();
 
-		if (m_dwFlags & MWF_DEFERREDSCROLL && m_hwndIEView == nullptr && m_hwndHPP == nullptr) {
+		if (m_dwFlags & MWF_DEFERREDSCROLL) {
 			m_dwFlags &= ~MWF_DEFERREDSCROLL;
 			DM_ScrollToBottom(0, 1);
 		}
 
-		if (m_hwndIEView) {
-			RECT rcRTF;
-			POINT pt;
+		if (m_iLogMode == WANT_IEVIEW_LOG) {
+			HWND hwndLog = m_pLog->GetHwnd();
 
-			GetWindowRect(m_log.GetHwnd(), &rcRTF);
+			RECT rcRTF;
+			GetWindowRect(hwndLog, &rcRTF);
 			rcRTF.left += 20;
 			rcRTF.top += 20;
+
+			POINT pt;
 			pt.x = rcRTF.left;
 			pt.y = rcRTF.top;
-			if (m_hwndIEView) {
-				if (M.GetByte("subclassIEView", 0)) {
-					mir_subclassWindow(m_hwndIEView, IEViewSubclassProc);
-					SetWindowPos(m_hwndIEView, nullptr, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_DRAWFRAME);
-					RedrawWindow(m_hwndIEView, nullptr, nullptr, RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW);
-				}
+
+			if (M.GetByte("subclassIEView", 0)) {
+				mir_subclassWindow(hwndLog, IEViewSubclassProc);
+				SetWindowPos(hwndLog, nullptr, 0, 0, 0, 0, SWP_FRAMECHANGED | SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_DRAWFRAME);
+				RedrawWindow(hwndLog, nullptr, nullptr, RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW);
 			}
-			m_hwndIWebBrowserControl = WindowFromPoint(pt);
 		}
 
 		if (m_dwFlagsEx & MWF_EX_AVATARCHANGED) {
@@ -2437,14 +2350,14 @@ void CMsgDialog::UpdateWindowState(UINT msg)
 
 LRESULT CMsgDialog::WMCopyHandler(UINT msg, WPARAM wParam, LPARAM lParam)
 {
-	LRESULT result = mir_callNextSubclass(m_log.GetHwnd(), stubLogProc, msg, wParam, lParam);
+	LRESULT result = mir_callNextSubclass(m_pLog->GetHwnd(), stubLogProc, msg, wParam, lParam);
 
-	ptrA szFromStream(m_log.GetRichTextRtf(true, true));
+	ptrA szFromStream(LOG()->GetRichTextRtf(true, true));
 	if (szFromStream != nullptr) {
 		ptrW converted(mir_utf8decodeW(szFromStream));
 		if (converted != nullptr) {
 			Utils::FilterEventMarkers(converted);
-			Utils::CopyToClipBoard(converted, m_log.GetHwnd());
+			Utils::CopyToClipBoard(converted, m_pLog->GetHwnd());
 		}
 	}
 
diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp
index 147250a16d..65041b78e9 100644
--- a/plugins/TabSRMM/src/msgdlgutils.cpp
+++ b/plugins/TabSRMM/src/msgdlgutils.cpp
@@ -322,33 +322,6 @@ wchar_t* TSAPI QuoteText(const wchar_t *text)
 

 /////////////////////////////////////////////////////////////////////////////////////////

 

-static int g_IEViewAvail = -1;

-static int g_HPPAvail = -1;

-

-UINT TSAPI GetIEViewMode(MCONTACT hContact)

-{

-	int iWantIEView = 0, iWantHPP = 0;

-

-	if (g_IEViewAvail == -1)

-		g_IEViewAvail = ServiceExists(MS_IEVIEW_WINDOW);

-

-	if (g_HPPAvail == -1)

-		g_HPPAvail = ServiceExists(MS_HPP_GETVERSION);

-

-	PluginConfig.g_WantIEView = g_IEViewAvail && M.GetByte("default_ieview", 0);

-	PluginConfig.g_WantHPP = g_HPPAvail && M.GetByte("default_hpp", 0);

-

-	iWantIEView = (PluginConfig.g_WantIEView) || (M.GetByte(hContact, "ieview", 0) == 1 && g_IEViewAvail);

-	iWantIEView = (M.GetByte(hContact, "ieview", 0) == (BYTE)-1) ? 0 : iWantIEView;

-

-	iWantHPP = (PluginConfig.g_WantHPP) || (M.GetByte(hContact, "hpplog", 0) == 1 && g_HPPAvail);

-	iWantHPP = (M.GetByte(hContact, "hpplog", 0) == (BYTE)-1) ? 0 : iWantHPP;

-

-	return iWantHPP ? WANT_HPP_LOG : (iWantIEView ? WANT_IEVIEW_LOG : 0);

-}

-

-/////////////////////////////////////////////////////////////////////////////////////////

-

 bool IsStringValidLink(wchar_t *pszText)

 {

 	if (pszText == nullptr)

diff --git a/plugins/TabSRMM/src/msgdlgutils.h b/plugins/TabSRMM/src/msgdlgutils.h
index e8ff8805b3..d434ee48ad 100644
--- a/plugins/TabSRMM/src/msgdlgutils.h
+++ b/plugins/TabSRMM/src/msgdlgutils.h
@@ -34,7 +34,6 @@ void     TSAPI ProcessAvatarChange(HWND hwnd, LPARAM lParam);
 BOOL     TSAPI CheckCustomLink(HWND hwndRich, POINT *ptClient, UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL bUrlNeeded);

 int      TSAPI CheckValidSmileyPack(const char *szProto, MCONTACT hContact);

 wchar_t* TSAPI QuoteText(const wchar_t *text);

-UINT     TSAPI GetIEViewMode(MCONTACT hContact);

 int      TSAPI CutContactName(const wchar_t *szold, wchar_t *sznew, size_t size);

 LRESULT  TSAPI GetSendButtonState(HWND hwnd);

 void     TSAPI RearrangeTab(HWND hwndDlg, const CMsgDialog *dat, int iMode, BOOL bSavePos);

diff --git a/plugins/TabSRMM/src/msglog.cpp b/plugins/TabSRMM/src/msglog.cpp
index a709216efd..faf830e942 100644
--- a/plugins/TabSRMM/src/msglog.cpp
+++ b/plugins/TabSRMM/src/msglog.cpp
@@ -1054,7 +1054,431 @@ static DWORD CALLBACK LogStreamInEvents(DWORD_PTR dwCookie, LPBYTE pbBuff, LONG
 	return 0;

 }

 

-void CMsgDialog::ReplaceIcons(LONG startAt, int fAppend, BOOL isSent)

+/////////////////////////////////////////////////////////////////////////////////////////

+

+INT_PTR CLogWindow::WndProc(UINT msg, WPARAM wParam, LPARAM lParam)

+{

+	bool isCtrl, isShift, isAlt;

+

+	switch (msg) {

+	case WM_KILLFOCUS:

+		if (wParam != (WPARAM)m_rtf.GetHwnd() && 0 != wParam) {

+			CHARRANGE cr;

+			m_rtf.SendMsg(EM_EXGETSEL, 0, (LPARAM)&cr);

+			if (cr.cpMax != cr.cpMin) {

+				cr.cpMin = cr.cpMax;

+				m_rtf.SendMsg(EM_EXSETSEL, 0, (LPARAM)&cr);

+			}

+		}

+		break;

+

+	case WM_CHAR:

+		m_pDlg.KbdState(isShift, isCtrl, isAlt);

+		if (wParam == 0x03 && isCtrl) // Ctrl+C

+			return m_pDlg.WMCopyHandler(msg, wParam, lParam);

+		if (wParam == 0x11 && isCtrl) // Ctrl+Q

+			m_pDlg.m_btnQuote.Click();

+		break;

+

+	case WM_LBUTTONUP:

+		if (m_pDlg.isChat() && g_Settings.bClickableNicks) {

+			POINT pt = { LOWORD(lParam), HIWORD(lParam) };

+			CheckCustomLink(m_rtf.GetHwnd(), &pt, msg, wParam, lParam, TRUE);

+		}

+		if (M.GetByte("autocopy", 1)) {

+			CHARRANGE sel;

+			SendMessage(m_rtf.GetHwnd(), EM_EXGETSEL, 0, (LPARAM)&sel);

+			if (sel.cpMin != sel.cpMax) {

+				SendMessage(m_rtf.GetHwnd(), WM_COPY, 0, 0);

+				sel.cpMin = sel.cpMax;

+				SendMessage(m_rtf.GetHwnd(), EM_EXSETSEL, 0, (LPARAM)&sel);

+				SetFocus(m_pDlg.m_message.GetHwnd());

+			}

+		}

+		break;

+

+	case WM_LBUTTONDOWN:

+	case WM_LBUTTONDBLCLK:

+	case WM_RBUTTONUP:

+	case WM_RBUTTONDOWN:

+	case WM_RBUTTONDBLCLK:

+		if (m_pDlg.isChat() && g_Settings.bClickableNicks) {

+			POINT pt = { LOWORD(lParam), HIWORD(lParam) };

+			CheckCustomLink(m_rtf.GetHwnd(), &pt, msg, wParam, lParam, TRUE);

+		}

+		break;

+

+	case WM_SETCURSOR:

+		if (g_Settings.bClickableNicks && m_pDlg.isChat() && (LOWORD(lParam) == HTCLIENT)) {

+			POINT pt;

+			GetCursorPos(&pt);

+			ScreenToClient(m_rtf.GetHwnd(), &pt);

+			if (CheckCustomLink(m_rtf.GetHwnd(), &pt, msg, wParam, lParam, FALSE))

+				return TRUE;

+		}

+		break;

+

+	case WM_SYSKEYUP:

+		if (wParam == VK_MENU) {

+			ProcessHotkeysByMsgFilter(m_rtf, msg, wParam, lParam);

+			return 0;

+		}

+		break;

+

+	case WM_SYSKEYDOWN:

+		m_pDlg.m_bkeyProcessed = false;

+		if (ProcessHotkeysByMsgFilter(m_rtf, msg, wParam, lParam)) {

+			m_pDlg.m_bkeyProcessed = true;

+			return 0;

+		}

+		break;

+

+	case WM_SYSCHAR:

+		if (m_pDlg.m_bkeyProcessed) {

+			m_pDlg.m_bkeyProcessed = false;

+			return 0;

+		}

+		break;

+

+	case WM_KEYDOWN:

+		m_pDlg.KbdState(isShift, isCtrl, isAlt);

+		if (wParam == VK_INSERT && isCtrl)

+			return m_pDlg.WMCopyHandler(msg, wParam, lParam);

+

+		if (wParam == 0x57 && isCtrl) { // ctrl-w (close window)

+			PostMessage(m_pDlg.m_hwnd, WM_CLOSE, 0, 1);

+			return TRUE;

+		}

+

+		break;

+

+	case WM_COPY:

+		return m_pDlg.WMCopyHandler(msg, wParam, lParam);

+

+	case WM_NCCALCSIZE:

+		return CSkin::NcCalcRichEditFrame(m_rtf.GetHwnd(), &m_pDlg, ID_EXTBKHISTORY, msg, wParam, lParam, stubLogProc);

+

+	case WM_NCPAINT:

+		return CSkin::DrawRichEditFrame(m_rtf.GetHwnd(), &m_pDlg, ID_EXTBKHISTORY, msg, wParam, lParam, stubLogProc);

+

+	case WM_CONTEXTMENU:

+		if (!m_pDlg.isChat()) {

+			POINT pt;

+			if (lParam == 0xFFFFFFFF) {

+				CHARRANGE sel;

+				m_rtf.SendMsg(EM_EXGETSEL, 0, (LPARAM)&sel);

+				m_rtf.SendMsg(EM_POSFROMCHAR, (WPARAM)&pt, (LPARAM)sel.cpMax);

+				ClientToScreen(m_rtf.GetHwnd(), &pt);

+			}

+			else {

+				pt.x = GET_X_LPARAM(lParam);

+				pt.y = GET_Y_LPARAM(lParam);

+			}

+

+			m_pDlg.ShowPopupMenu(m_rtf, pt);

+			return TRUE;

+		}

+	}

+

+	return CSuper::WndProc(msg, wParam, lParam);

+}

+

+/////////////////////////////////////////////////////////////////////////////////////////

+

+void CLogWindow::Attach()

+{

+	CSuper::Attach();

+

+	m_rtf.SendMsg(EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(0, 0));

+	m_rtf.SendMsg(EM_AUTOURLDETECT, TRUE, 0);

+	m_rtf.SendMsg(EM_EXLIMITTEXT, 0, 0x7FFFFFFF);

+	m_rtf.SendMsg(EM_SETUNDOLIMIT, 0, 0);

+	m_rtf.SendMsg(EM_HIDESELECTION, TRUE, 0);

+	m_rtf.SendMsg(EM_SETEVENTMASK, 0, ENM_MOUSEEVENTS | ENM_KEYEVENTS | ENM_LINK);

+	m_rtf.SendMsg(EM_SETEDITSTYLE, SES_EXTENDBACKCOLOR, SES_EXTENDBACKCOLOR);

+	m_rtf.SendMsg(EM_SETLANGOPTIONS, 0, m_rtf.SendMsg(EM_GETLANGOPTIONS, 0, 0) & ~IMF_AUTOFONTSIZEADJUST);

+	m_rtf.SendMsg(EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(3, 3));

+}

+

+void CLogWindow::LogEvents(MEVENT hDbEventFirst, int count, bool fAppend)

+{

+	LogEvents(hDbEventFirst, count, fAppend, nullptr);

+}

+

+void CLogWindow::LogEvents(DBEVENTINFO *dbei, bool bAppend)

+{

+	LogEvents(0, 1, bAppend, dbei);

+}

+

+void CLogWindow::LogEvents(MEVENT hDbEventFirst, int count, bool fAppend, DBEVENTINFO *dbei_s)

+{

+	CHARRANGE oldSel, sel;

+

+	// calc time limit for grouping

+	rtfFonts = m_pDlg.m_pContainer->m_theme.rtfFonts ? m_pDlg.m_pContainer->m_theme.rtfFonts : &(rtfFontsGlobal[0][0]);

+	time_t now = time(0);

+

+	struct tm tm_now = *localtime(&now);

+	struct tm tm_today = tm_now;

+	tm_today.tm_hour = tm_today.tm_min = tm_today.tm_sec = 0;

+	today = mktime(&tm_today);

+

+	m_pDlg.DM_ScrollToBottom(0, 0);

+	if (fAppend && hDbEventFirst)

+		m_pDlg.m_hDbEventLast = hDbEventFirst;

+	else

+		m_pDlg.m_hDbEventLast = db_event_last(m_pDlg.m_hContact);

+

+	// separator strings used for grid lines, message separation and so on...

+	m_pDlg.m_bClrAdded = false;

+

+	if (m_pDlg.m_szMicroLf[0] == 0) {

+		if (m_pDlg.m_hHistoryEvents)

+			strncpy_s(m_pDlg.m_szMicroLf, "\\v\\cf%d \\ ~-+%d+-~\\v0 ", _TRUNCATE);

+		else

+			mir_snprintf(m_pDlg.m_szMicroLf, "%s\\par\\ltrpar\\sl-1%s ", GetRTFFont(MSGDLGFONTCOUNT), GetRTFFont(MSGDLGFONTCOUNT));

+	}

+	

+	szYourName = const_cast<wchar_t *>(m_pDlg.m_cache->getNick());

+	szMyName = m_pDlg.m_wszMyNickname;

+

+	m_rtf.SendMsg(EM_HIDESELECTION, TRUE, 0);

+	m_rtf.SendMsg(EM_EXGETSEL, 0, (LPARAM)&oldSel);

+

+	LogStreamData streamData = { 0 };

+	streamData.hContact = m_pDlg.m_hContact;

+	streamData.hDbEvent = hDbEventFirst;

+	streamData.dlgDat = &m_pDlg;

+	streamData.eventsToInsert = count;

+	streamData.isEmpty = fAppend ? GetWindowTextLength(m_rtf.GetHwnd()) == 0 : 1;

+	streamData.dbei = dbei_s;

+	streamData.isAppend = fAppend;

+

+	EDITSTREAM stream = { 0 };

+	stream.pfnCallback = LogStreamInEvents;

+	stream.dwCookie = (DWORD_PTR)&streamData;

+

+	LONG startAt;

+	if (fAppend) {

+		GETTEXTLENGTHEX gtxl = { 0 };

+		gtxl.codepage = 1200;

+		gtxl.flags = GTL_DEFAULT | GTL_PRECISE | GTL_NUMCHARS;

+		startAt = m_rtf.SendMsg(EM_GETTEXTLENGTHEX, (WPARAM)&gtxl, 0);

+		sel.cpMin = sel.cpMax = GetWindowTextLength(m_rtf.GetHwnd());

+		m_rtf.SendMsg(EM_EXSETSEL, 0, (LPARAM)&sel);

+	}

+	else {

+		SetWindowText(m_rtf.GetHwnd(), L"");

+		sel.cpMin = 0;

+		sel.cpMax = GetWindowTextLength(m_rtf.GetHwnd());

+		m_rtf.SendMsg(EM_EXSETSEL, 0, (LPARAM)&sel);

+		startAt = 0;

+		m_pDlg.m_isAutoRTL = 0;

+	}

+

+	// begin to draw

+	m_rtf.SendMsg(WM_SETREDRAW, FALSE, 0);

+

+	m_rtf.SendMsg(EM_STREAMIN, fAppend ? SFF_SELECTION | SF_RTF : SFF_SELECTION | SF_RTF, (LPARAM)&stream);

+	m_rtf.SendMsg(EM_EXSETSEL, 0, (LPARAM)&oldSel);

+	m_rtf.SendMsg(EM_HIDESELECTION, FALSE, 0);

+	m_pDlg.m_hDbEventLast = streamData.hDbEventLast;

+

+	if (m_pDlg.m_isAutoRTL & 1)

+		m_rtf.SendMsg(EM_SETBKGNDCOLOR, 0, (LOWORD(m_pDlg.m_iLastEventType) & DBEF_SENT)

+			? (fAppend ? m_pDlg.m_pContainer->m_theme.outbg : m_pDlg.m_pContainer->m_theme.oldoutbg)

+			: (fAppend ? m_pDlg.m_pContainer->m_theme.inbg : m_pDlg.m_pContainer->m_theme.oldinbg));

+

+	if (!(m_pDlg.m_isAutoRTL & 1)) {

+		GETTEXTLENGTHEX gtxl = { 0 };

+		gtxl.codepage = 1200;

+		gtxl.flags = GTL_DEFAULT | GTL_PRECISE | GTL_NUMCHARS;

+

+		sel.cpMax = m_rtf.SendMsg(EM_GETTEXTLENGTHEX, (WPARAM)&gtxl, 0);

+		sel.cpMin = sel.cpMax - 1;

+		m_rtf.SendMsg(EM_EXSETSEL, 0, (LPARAM)&sel);

+		m_rtf.SendMsg(EM_REPLACESEL, FALSE, (LPARAM)L"");

+		m_pDlg.m_isAutoRTL |= 2;

+	}

+

+	BOOL isSent;

+	if (streamData.dbei != nullptr)

+		isSent = (streamData.dbei->flags & DBEF_SENT) != 0;

+	else {

+		DBEVENTINFO dbei = {};

+		db_event_get(hDbEventFirst, &dbei);

+		isSent = (dbei.flags & DBEF_SENT) != 0;

+	}

+

+	ReplaceIcons(startAt, fAppend, isSent);

+	m_pDlg.m_bClrAdded = false;

+

+	int len = GetWindowTextLength(m_rtf.GetHwnd())-1;

+	m_rtf.SendMsg(EM_SETSEL, len, len);

+

+	m_pDlg.DM_ScrollToBottom(0, 0);

+

+	m_rtf.SendMsg(WM_SETREDRAW, TRUE, 0);

+	InvalidateRect(m_rtf.GetHwnd(), nullptr, FALSE);

+	EnableWindow(GetDlgItem(m_pDlg.m_hwnd, IDC_QUOTE), m_pDlg.m_hDbEventLast != 0);

+	mir_free(streamData.buffer);

+}

+

+void CLogWindow::LogEvents(LOGINFO *lin, bool bRedraw)

+{

+	auto *si = m_pDlg.m_si;

+	if (m_rtf.GetHwnd() == nullptr || lin == nullptr || si == nullptr)

+		return;

+

+	if (!bRedraw && (si->iType == GCW_CHATROOM || si->iType == GCW_PRIVMESS) && m_pDlg.m_bFilterEnabled && (m_pDlg.m_iLogFilterFlags & lin->iType) == 0)

+		return;

+

+	bool bFlag = false, bDoReplace, bAtBottom = AtBottom();

+

+	LOGSTREAMDATA streamData;

+	memset(&streamData, 0, sizeof(streamData));

+	streamData.hwnd = m_rtf.GetHwnd();

+	streamData.si = si;

+	streamData.lin = lin;

+	streamData.bStripFormat = FALSE;

+	streamData.dat = &m_pDlg;

+

+	EDITSTREAM stream = {};

+	stream.pfnCallback = Srmm_LogStreamCallback;

+	stream.dwCookie = (DWORD_PTR)&streamData;

+

+	POINT point = { 0 };

+	m_rtf.SendMsg(EM_GETSCROLLPOS, 0, (LPARAM)&point);

+

+	// do not scroll to bottom if there is a selection

+	CHARRANGE oldsel, sel, newsel;

+	m_rtf.SendMsg(EM_EXGETSEL, 0, (LPARAM)&oldsel);

+	if (oldsel.cpMax != oldsel.cpMin)

+		m_rtf.SendMsg(WM_SETREDRAW, FALSE, 0);

+

+	// set the insertion point at the bottom

+	sel.cpMin = sel.cpMax = m_rtf.GetRichTextLength();

+	m_rtf.SendMsg(EM_EXSETSEL, 0, (LPARAM)&sel);

+

+	// fix for the indent... must be a M$ bug

+	if (sel.cpMax == 0)

+		bRedraw = TRUE;

+

+	// should the event(s) be appended to the current log

+	WPARAM wp = bRedraw ? SF_RTF : SFF_SELECTION | SF_RTF;

+

+	// get the number of pixels per logical inch

+	if (bRedraw) {

+		HDC hdc = GetDC(nullptr);

+		g_chatApi.logPixelSY = GetDeviceCaps(hdc, LOGPIXELSY);

+		g_chatApi.logPixelSX = GetDeviceCaps(hdc, LOGPIXELSX);

+		ReleaseDC(nullptr, hdc);

+		m_rtf.SendMsg(WM_SETREDRAW, FALSE, 0);

+		bFlag = true;

+	}

+

+	// stream in the event(s)

+	streamData.lin = lin;

+	streamData.bRedraw = bRedraw;

+	m_rtf.SendMsg(EM_STREAMIN, wp, (LPARAM)&stream);

+

+	// for new added events, only replace in message or action events.

+	// no need to replace smileys or math formulas elsewhere

+	bDoReplace = (bRedraw || (lin->ptszText && (lin->iType == GC_EVENT_MESSAGE || lin->iType == GC_EVENT_ACTION)));

+

+	// replace marked nicknames with hyperlinks to make the nicks clickable

+	if (g_Settings.bClickableNicks) {

+		FINDTEXTEX fi, fi2;

+		fi.chrg.cpMin = bRedraw ? 0 : sel.cpMin;

+		fi.chrg.cpMax = -1;

+		fi.lpstrText = CLICKNICK_BEGIN;

+

+		while (m_rtf.SendMsg(EM_FINDTEXTEX, FR_DOWN, (LPARAM)&fi) > -1) {

+			fi2.chrg.cpMin = fi.chrgText.cpMin;

+			fi2.chrg.cpMax = -1;

+			fi2.lpstrText = CLICKNICK_END;

+

+			if (m_rtf.SendMsg(EM_FINDTEXTEX, FR_DOWN, (LPARAM)&fi2) > -1) {

+				m_rtf.SendMsg(EM_EXSETSEL, 0, (LPARAM)&fi.chrgText);

+				m_rtf.SendMsg(EM_REPLACESEL, TRUE, (LPARAM)L"");

+

+				fi2.chrgText.cpMin -= fi.chrgText.cpMax - fi.chrgText.cpMin;

+				fi2.chrgText.cpMax -= fi.chrgText.cpMax - fi.chrgText.cpMin;

+				m_rtf.SendMsg(EM_EXSETSEL, 0, (LPARAM)&fi2.chrgText);

+				m_rtf.SendMsg(EM_REPLACESEL, TRUE, (LPARAM)L"");

+

+				fi2.chrgText.cpMax = fi2.chrgText.cpMin;

+				fi2.chrgText.cpMin = fi.chrgText.cpMin;

+				m_rtf.SendMsg(EM_EXSETSEL, 0, (LPARAM)&fi2.chrgText);

+

+				CHARFORMAT2 cf2;

+				memset(&cf2, 0, sizeof(CHARFORMAT2));

+				cf2.cbSize = sizeof(cf2);

+				cf2.dwMask = CFM_PROTECTED;

+				cf2.dwEffects = CFE_PROTECTED;

+				m_rtf.SendMsg(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf2);

+			}

+			fi.chrg.cpMin = fi.chrgText.cpMax;

+		}

+		m_rtf.SendMsg(EM_SETSEL, -1, -1);

+	}

+

+	// run smileyadd

+	if (PluginConfig.g_SmileyAddAvail && bDoReplace) {

+		newsel.cpMax = -1;

+		newsel.cpMin = sel.cpMin;

+		if (newsel.cpMin < 0)

+			newsel.cpMin = 0;

+

+		SMADD_RICHEDIT3 sm = { sizeof(sm) };

+		sm.hwndRichEditControl = m_rtf.GetHwnd();

+		sm.Protocolname = si->pszModule;

+		sm.rangeToReplace = bRedraw ? nullptr : &newsel;

+		sm.disableRedraw = TRUE;

+		sm.hContact = si->hContact;

+		CallService(MS_SMILEYADD_REPLACESMILEYS, 0, (LPARAM)&sm);

+	}

+

+	// trim the message log to the number of most recent events

+	// this uses hidden marks in the rich text to find the events which should be deleted

+	if (si->bTrimmed) {

+		wchar_t szPattern[50];

+		mir_snwprintf(szPattern, L"~-+%p+-~", si->pLogEnd);

+

+		FINDTEXTEX fi;

+		fi.lpstrText = szPattern;

+		fi.chrg.cpMin = 0;

+		fi.chrg.cpMax = -1;

+		if (m_rtf.SendMsg(EM_FINDTEXTEX, FR_DOWN, (LPARAM)&fi) != 0) {

+			m_rtf.SendMsg(EM_SETSEL, 0, fi.chrgText.cpMax + 1);

+			m_rtf.SendMsg(EM_REPLACESEL, TRUE, (LPARAM)L"");

+		}

+		si->bTrimmed = false;

+	}

+

+	// scroll log to bottom if the log was previously scrolled to bottom, else restore old position

+	if (bRedraw || bAtBottom)

+		ScrollToBottom(false, false);

+	else

+		m_rtf.SendMsg(EM_SETSCROLLPOS, 0, (LPARAM)&point);

+

+	// do we need to restore the selection

+	if (oldsel.cpMax != oldsel.cpMin) {

+		m_rtf.SendMsg(EM_EXSETSEL, 0, (LPARAM)&oldsel);

+		m_rtf.SendMsg(WM_SETREDRAW, TRUE, 0);

+		InvalidateRect(m_rtf.GetHwnd(), nullptr, TRUE);

+	}

+

+	// need to invalidate the window

+	if (bFlag) {

+		sel.cpMin = sel.cpMax = m_rtf.GetRichTextLength();

+		m_rtf.SendMsg(EM_EXSETSEL, 0, (LPARAM)&sel);

+		m_rtf.SendMsg(WM_SETREDRAW, TRUE, 0);

+		InvalidateRect(m_rtf.GetHwnd(), nullptr, TRUE);

+	}

+}

+

+void CLogWindow::ReplaceIcons(LONG startAt, int fAppend, BOOL isSent)

 {

 	wchar_t trbuffer[40];

 	TEXTRANGE tr;

@@ -1062,39 +1486,39 @@ void CMsgDialog::ReplaceIcons(LONG startAt, int fAppend, BOOL isSent)
 

 	FINDTEXTEX fi;

 	fi.chrg.cpMin = startAt;

-	if (m_bClrAdded) {

+	if (m_pDlg.m_bClrAdded) {

 		fi.lpstrText = L"##col##";

 		fi.chrg.cpMax = -1;

 		CHARFORMAT2 cf2;

 		memset(&cf2, 0, sizeof(cf2));

 		cf2.cbSize = sizeof(cf2);

 		cf2.dwMask = CFM_COLOR;

-		while (m_log.SendMsg(EM_FINDTEXTEX, FR_DOWN, (LPARAM)&fi) > -1) {

+		while (m_rtf.SendMsg(EM_FINDTEXTEX, FR_DOWN, (LPARAM)&fi) > -1) {

 			tr.chrg.cpMin = fi.chrgText.cpMin;

 			tr.chrg.cpMax = tr.chrg.cpMin + 18;

 			trbuffer[0] = 0;

-			m_log.SendMsg(EM_GETTEXTRANGE, 0, (LPARAM)&tr);

+			m_rtf.SendMsg(EM_GETTEXTRANGE, 0, (LPARAM)&tr);

 			trbuffer[18] = 0;

 

 			CHARRANGE cr;

 			cr.cpMin = fi.chrgText.cpMin;

 			cr.cpMax = cr.cpMin + 18;

-			m_log.SendMsg(EM_EXSETSEL, 0, (LPARAM)&cr);

-			m_log.SendMsg(EM_REPLACESEL, FALSE, (LPARAM)L"");

+			m_rtf.SendMsg(EM_EXSETSEL, 0, (LPARAM)&cr);

+			m_rtf.SendMsg(EM_REPLACESEL, FALSE, (LPARAM)L"");

 			UINT length = (unsigned int)_wtol(&trbuffer[7]);

 			int index = _wtol(&trbuffer[14]);

 			if (length > 0 && length < 20000 && index >= RTF_CTABLE_DEFSIZE && index < Utils::rtf_clrs.getCount()) {

 				cf2.crTextColor = Utils::rtf_clrs[index].clr;

 				cr.cpMin = fi.chrgText.cpMin;

 				cr.cpMax = cr.cpMin + length;

-				m_log.SendMsg(EM_EXSETSEL, 0, (LPARAM)&cr);

-				m_log.SendMsg(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf2);

+				m_rtf.SendMsg(EM_EXSETSEL, 0, (LPARAM)&cr);

+				m_rtf.SendMsg(EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf2);

 			}

 		}

 	}

 

 	fi.chrg.cpMin = startAt;

-	if (m_dwFlags & MWF_LOG_SHOWICONS) {

+	if (m_pDlg.m_dwFlags & MWF_LOG_SHOWICONS) {

 		fi.lpstrText = L"#~#";

 		fi.chrg.cpMax = -1;

 

@@ -1104,17 +1528,17 @@ void CMsgDialog::ReplaceIcons(LONG startAt, int fAppend, BOOL isSent)
 		cf2.dwMask = CFM_BACKCOLOR;

 

 		CComPtr<IRichEditOle> ole;

-		m_log.SendMsg(EM_GETOLEINTERFACE, 0, (LPARAM)&ole);

+		m_rtf.SendMsg(EM_GETOLEINTERFACE, 0, (LPARAM)&ole);

 		if (ole != nullptr) {

-			while (m_log.SendMsg(EM_FINDTEXTEX, FR_DOWN, (LPARAM)&fi) > -1) {

+			while (m_rtf.SendMsg(EM_FINDTEXTEX, FR_DOWN, (LPARAM)&fi) > -1) {

 				CHARRANGE cr;

 				cr.cpMin = fi.chrgText.cpMin;

 				cr.cpMax = fi.chrgText.cpMax + 2;

-				m_log.SendMsg(EM_EXSETSEL, 0, (LPARAM)&cr);

+				m_rtf.SendMsg(EM_EXSETSEL, 0, (LPARAM)&cr);

 

 				tr.chrg.cpMin = fi.chrgText.cpMin + 3;

 				tr.chrg.cpMax = fi.chrgText.cpMin + 5;

-				m_log.SendMsg(EM_GETTEXTRANGE, 0, (LPARAM)&tr);

+				m_rtf.SendMsg(EM_GETTEXTRANGE, 0, (LPARAM)&tr);

 

 				int bIconIndex = trbuffer[0] - '0';

 				if (bIconIndex >= NR_LOGICONS) {

@@ -1123,14 +1547,14 @@ void CMsgDialog::ReplaceIcons(LONG startAt, int fAppend, BOOL isSent)
 				}

 

 				char bDirection = trbuffer[1];

-				m_log.SendMsg(EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf2);

+				m_rtf.SendMsg(EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&cf2);

 				COLORREF crDefault;

 				if (cf2.crBackColor != 0)

 					crDefault = cf2.crBackColor;

 				else if (bDirection == '>')

-					crDefault = (fAppend) ? m_pContainer->m_theme.outbg : m_pContainer->m_theme.oldoutbg;

+					crDefault = (fAppend) ? m_pDlg.m_pContainer->m_theme.outbg : m_pDlg.m_pContainer->m_theme.oldoutbg;

 				else

-					crDefault = (fAppend) ? m_pContainer->m_theme.inbg : m_pContainer->m_theme.oldinbg;

+					crDefault = (fAppend) ? m_pDlg.m_pContainer->m_theme.inbg : m_pDlg.m_pContainer->m_theme.oldinbg;

 

 				TLogIcon theIcon(Logicons[bIconIndex], crDefault);

 				CImageDataObject::InsertBitmap(ole, theIcon.m_hBmp);

@@ -1146,9 +1570,9 @@ void CMsgDialog::ReplaceIcons(LONG startAt, int fAppend, BOOL isSent)
 		sel.cpMax = -1;

 

 		SMADD_RICHEDIT3 smadd = { sizeof(smadd) };

-		smadd.hwndRichEditControl = m_log.GetHwnd();

-		smadd.Protocolname = const_cast<char *>(m_cache->getActiveProto());

-		smadd.hContact = m_cache->getActiveContact();

+		smadd.hwndRichEditControl = m_rtf.GetHwnd();

+		smadd.Protocolname = const_cast<char *>(m_pDlg.m_cache->getActiveProto());

+		smadd.hContact = m_pDlg.m_cache->getActiveContact();

 		smadd.flags = isSent ? SAFLRE_OUTGOING : 0;

 		if (startAt > 0)

 			smadd.rangeToReplace = &sel;

@@ -1158,190 +1582,76 @@ void CMsgDialog::ReplaceIcons(LONG startAt, int fAppend, BOOL isSent)
 		CallService(MS_SMILEYADD_REPLACESMILEYS, 0, (LPARAM)&smadd);

 	}

 

-	if (m_hHistoryEvents && m_curHistory == m_maxHistory) {

+	if (m_pDlg.m_hHistoryEvents && m_pDlg.m_curHistory == m_pDlg.m_maxHistory) {

 		wchar_t szPattern[50];

-		mir_snwprintf(szPattern, L"~-+%d+-~", m_hHistoryEvents[0]);

+		mir_snwprintf(szPattern, L"~-+%d+-~", m_pDlg.m_hHistoryEvents[0]);

 

 		FINDTEXTEX ft;

 		ft.lpstrText = szPattern;

 		ft.chrg.cpMin = 0;

 		ft.chrg.cpMax = -1;

-		if (m_log.SendMsg(EM_FINDTEXTEX, FR_DOWN, (LPARAM)&ft) != 0) {

+		if (m_rtf.SendMsg(EM_FINDTEXTEX, FR_DOWN, (LPARAM)&ft) != 0) {

 			CHARRANGE sel;

 			sel.cpMin = 0;

 			sel.cpMax = 20;

-			m_log.SendMsg(EM_SETSEL, 0, ft.chrgText.cpMax + 1);

-			m_log.SendMsg(EM_REPLACESEL, TRUE, (LPARAM)L"");

+			m_rtf.SendMsg(EM_SETSEL, 0, ft.chrgText.cpMax + 1);

+			m_rtf.SendMsg(EM_REPLACESEL, TRUE, (LPARAM)L"");

 		}

 	}

 }

 

-void CMsgDialog::StreamInEvents(MEVENT hDbEventFirst, int count, int fAppend, DBEVENTINFO *dbei_s)

+void CLogWindow::ScrollToBottom()

 {

-	CHARRANGE oldSel, sel;

-

-	// calc time limit for grouping

-	HWND hwndrtf = m_hwndIEView ? m_hwndIWebBrowserControl : m_log.GetHwnd();

-

-	rtfFonts = m_pContainer->m_theme.rtfFonts ? m_pContainer->m_theme.rtfFonts : &(rtfFontsGlobal[0][0]);

-	time_t now = time(0);

+	ScrollToBottom(false, false);

+}

 

-	struct tm tm_now = *localtime(&now);

-	struct tm tm_today = tm_now;

-	tm_today.tm_hour = tm_today.tm_min = tm_today.tm_sec = 0;

-	today = mktime(&tm_today);

+void CLogWindow::ScrollToBottom(bool bImmediate, bool bRedraw)

+{

+	if (bRedraw)

+		SendMessage(m_rtf.GetHwnd(), WM_SIZE, 0, 0);

 

-	if (m_hwndIEView != nullptr || m_hwndHPP != nullptr) {

-		const char *pszService;

-		IEVIEWEVENT event = {};

-		event.hContact = m_hContact;

-		if (m_hwndIEView != nullptr) {

-			event.pszProto = m_szProto;

-			event.hwnd = m_hwndIEView;

-			pszService = MS_IEVIEW_EVENT;

-		}

-		else {

-			event.hwnd = m_hwndHPP;

-			pszService = MS_HPP_EG_EVENT;

-		}

+	if (bImmediate && bRedraw) {

+		int len = GetWindowTextLength(m_rtf.GetHwnd());

+		SendMessage(m_rtf.GetHwnd(), EM_SETSEL, len - 1, len - 1);

+	}

 

-		if (m_dwFlags & MWF_LOG_RTL)

-			event.dwFlags = IEEF_RTL;

+	if (bImmediate)

+		SendMessage(m_rtf.GetHwnd(), WM_VSCROLL, MAKEWPARAM(SB_BOTTOM, 0), 0);

+	else

+		PostMessage(m_rtf.GetHwnd(), WM_VSCROLL, MAKEWPARAM(SB_BOTTOM, 0), 0);

 

-		if (!fAppend) {

-			event.iType = IEE_CLEAR_LOG;

-			CallService(pszService, 0, (LPARAM)&event);

-		}

+	if (bRedraw)

+		InvalidateRect(m_rtf.GetHwnd(), nullptr, FALSE);

+}

 

-		IEVIEWEVENTDATA evData = { 0 };

-		if (dbei_s != nullptr && hDbEventFirst == 0) {

-			event.iType = IEE_LOG_MEM_EVENTS;

-			if (dbei_s->flags & DBEF_SENT) {

-				evData.dwFlags = IEEDF_SENT;

-				evData.bIsMe = true;

-			}

-			else {

-				evData.dwFlags = IEEDF_UNICODE_NICK;

-				evData.szNick.w = Clist_GetContactDisplayName(m_hContact);

-			}

-			switch (dbei_s->eventType) {

-				case EVENTTYPE_STATUSCHANGE: evData.iType = IEED_EVENT_STATUSCHANGE; break;

-				case EVENTTYPE_FILE: evData.iType = IEED_EVENT_FILE; break;

-				case EVENTTYPE_ERRMSG: evData.iType = IEED_EVENT_ERRMSG; break;

-				default: evData.iType = IEED_EVENT_MESSAGE; break;

-			}

-			evData.szText.a = (char*)dbei_s->pBlob;

-			evData.time = dbei_s->timestamp;

-			event.eventData = &evData;

-			event.codepage = CP_UTF8;

-		}

-		else {

-			event.iType = IEE_LOG_DB_EVENTS;

-			event.hDbEventFirst = hDbEventFirst;

+void CLogWindow::UpdateOptions()

+{

+	COLORREF colour = m_pDlg.isChat() ? g_Settings.crLogBackground : db_get_dw(0, FONTMODULE, SRMSGSET_BKGCOLOUR, SRMSGDEFSET_BKGCOLOUR);

+	m_rtf.SendMsg(EM_SETBKGNDCOLOR, 0, colour);

+

+	if (!m_pDlg.isChat()) {

+		PARAFORMAT2 pf2;

+		pf2.wEffects = PFE_RTLPARA;

+		pf2.dwMask |= PFM_OFFSET;

+		if (m_pDlg.m_dwFlags & MWF_INITMODE) {

+			pf2.dwMask |= (PFM_RIGHTINDENT | PFM_OFFSETINDENT);

+			pf2.dxStartIndent = 30;

+			pf2.dxRightIndent = 30;

 		}

-		event.count = count;

-		CallService(pszService, 0, (LPARAM)&event);

-		DM_ScrollToBottom(0, 0);

-		if (fAppend && hDbEventFirst)

-			m_hDbEventLast = hDbEventFirst;

-		else

-			m_hDbEventLast = db_event_last(m_hContact);

-		return;

-	}

-

-	// separator strings used for grid lines, message separation and so on...

-	m_bClrAdded = false;

-

-	if (m_szMicroLf[0] == 0) {

-		if (m_hHistoryEvents)

-			strncpy_s(m_szMicroLf, "\\v\\cf%d \\ ~-+%d+-~\\v0 ", _TRUNCATE);

+		pf2.dxOffset = m_pDlg.m_pContainer->m_theme.left_indent + 30;

+		m_rtf.SendMsg(EM_SETPARAFORMAT, 0, (LPARAM)&pf2);

+

+		m_rtf.SendMsg(EM_SETLANGOPTIONS, 0, (LPARAM)m_rtf.SendMsg(EM_GETLANGOPTIONS, 0, 0) & ~IMF_AUTOKEYBOARD);

+		

+		// set the scrollbars etc to RTL/LTR (only for manual RTL mode)

+		if (m_pDlg.m_dwFlags & MWF_LOG_RTL)

+			SetWindowLongPtr(m_rtf.GetHwnd(), GWL_EXSTYLE, GetWindowLongPtr(m_rtf.GetHwnd(), GWL_EXSTYLE) | WS_EX_RIGHT | WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR);

 		else

-			mir_snprintf(m_szMicroLf, "%s\\par\\ltrpar\\sl-1%s ", GetRTFFont(MSGDLGFONTCOUNT), GetRTFFont(MSGDLGFONTCOUNT));

-	}

-	

-	szYourName = const_cast<wchar_t *>(m_cache->getNick());

-	szMyName = m_wszMyNickname;

-

-	m_log.SendMsg(EM_HIDESELECTION, TRUE, 0);

-	m_log.SendMsg(EM_EXGETSEL, 0, (LPARAM)&oldSel);

-

-	LogStreamData streamData = { 0 };

-	streamData.hContact = m_hContact;

-	streamData.hDbEvent = hDbEventFirst;

-	streamData.dlgDat = this;

-	streamData.eventsToInsert = count;

-	streamData.isEmpty = fAppend ? GetWindowTextLength(hwndrtf) == 0 : 1;

-	streamData.dbei = dbei_s;

-	streamData.isAppend = fAppend;

-

-	EDITSTREAM stream = { 0 };

-	stream.pfnCallback = LogStreamInEvents;

-	stream.dwCookie = (DWORD_PTR)&streamData;

-

-	LONG startAt;

-	if (fAppend) {

-		GETTEXTLENGTHEX gtxl = { 0 };

-		gtxl.codepage = 1200;

-		gtxl.flags = GTL_DEFAULT | GTL_PRECISE | GTL_NUMCHARS;

-		startAt = m_log.SendMsg(EM_GETTEXTLENGTHEX, (WPARAM)&gtxl, 0);

-		sel.cpMin = sel.cpMax = GetWindowTextLength(hwndrtf);

-		m_log.SendMsg(EM_EXSETSEL, 0, (LPARAM)&sel);

-	}

-	else {

-		SetWindowText(hwndrtf, L"");

-		sel.cpMin = 0;

-		sel.cpMax = GetWindowTextLength(hwndrtf);

-		m_log.SendMsg(EM_EXSETSEL, 0, (LPARAM)&sel);

-		startAt = 0;

-		m_isAutoRTL = 0;

+			SetWindowLongPtr(m_rtf.GetHwnd(), GWL_EXSTYLE, GetWindowLongPtr(m_rtf.GetHwnd(), GWL_EXSTYLE) & ~(WS_EX_RIGHT | WS_EX_RTLREADING | WS_EX_LEFTSCROLLBAR));

 	}

+}

 

-	// begin to draw

-	m_log.SendMsg(WM_SETREDRAW, FALSE, 0);

-

-	m_log.SendMsg(EM_STREAMIN, fAppend ? SFF_SELECTION | SF_RTF : SFF_SELECTION | SF_RTF, (LPARAM)&stream);

-	m_log.SendMsg(EM_EXSETSEL, 0, (LPARAM)&oldSel);

-	m_log.SendMsg(EM_HIDESELECTION, FALSE, 0);

-	m_hDbEventLast = streamData.hDbEventLast;

-

-	if (m_isAutoRTL & 1)

-		m_log.SendMsg(EM_SETBKGNDCOLOR, 0, (LOWORD(m_iLastEventType) & DBEF_SENT)

-			? (fAppend ? m_pContainer->m_theme.outbg : m_pContainer->m_theme.oldoutbg)

-			: (fAppend ? m_pContainer->m_theme.inbg : m_pContainer->m_theme.oldinbg));

-

-	if (!(m_isAutoRTL & 1)) {

-		GETTEXTLENGTHEX gtxl = { 0 };

-		gtxl.codepage = 1200;

-		gtxl.flags = GTL_DEFAULT | GTL_PRECISE | GTL_NUMCHARS;

-

-		sel.cpMax = m_log.SendMsg(EM_GETTEXTLENGTHEX, (WPARAM)&gtxl, 0);

-		sel.cpMin = sel.cpMax - 1;

-		m_log.SendMsg(EM_EXSETSEL, 0, (LPARAM)&sel);

-		m_log.SendMsg(EM_REPLACESEL, FALSE, (LPARAM)L"");

-		m_isAutoRTL |= 2;

-	}

-

-	BOOL isSent;

-	if (streamData.dbei != nullptr)

-		isSent = (streamData.dbei->flags & DBEF_SENT) != 0;

-	else {

-		DBEVENTINFO dbei = {};

-		db_event_get(hDbEventFirst, &dbei);

-		isSent = (dbei.flags & DBEF_SENT) != 0;

-	}

-

-	ReplaceIcons(startAt, fAppend, isSent);

-	m_bClrAdded = false;

-

-	if (m_hwndIEView == nullptr && m_hwndHPP == nullptr) {

-		int len = GetWindowTextLength(hwndrtf)-1;

-		m_log.SendMsg(EM_SETSEL, len, len);

-	}

-

-	DM_ScrollToBottom(0, 0);

-

-	m_log.SendMsg(WM_SETREDRAW, TRUE, 0);

-	InvalidateRect(hwndrtf, nullptr, FALSE);

-	EnableWindow(GetDlgItem(m_hwnd, IDC_QUOTE), m_hDbEventLast != 0);

-	mir_free(streamData.buffer);

+CSrmmLogWindow *logBuilder(CMsgDialog &pDlg)

+{

+	return new CLogWindow(pDlg);

 }

diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp
index ab2cb125fa..2f8418ed32 100644
--- a/plugins/TabSRMM/src/msgoptions.cpp
+++ b/plugins/TabSRMM/src/msgoptions.cpp
@@ -604,27 +604,14 @@ class COptLogDlg : public CDlgBase
 {

 	CCtrlSpin spnLeft, spnRight, spnLoadCount, spnLoadTime, spnTrim;

 	CCtrlCheck chkAlwaysTrim, chkLoadUnread, chkLoadCount, chkLoadTime;

-	CCtrlCombo cmbLogDisplay;

 	CCtrlButton btnModify, btnRtlModify;

 	CCtrlTreeView logOpts;

 

-	bool have_ieview, have_hpp;

-

 	// configure the option page - hide most of the settings here when either IEView

 	// or H++ is set as the global message log viewer. Showing these options may confuse

 	// the user, because they are not working and the user needs to configure the 3rd

 	// party plugin.

 

-	void ShowHide()

-	{

-		LRESULT r = cmbLogDisplay.GetCurSel();

-		Utils::showDlgControl(m_hwnd, IDC_EXPLAINMSGLOGSETTINGS, r == 0 ? SW_HIDE : SW_SHOW);

-		logOpts.Show(r == 0);

-

-		for (auto &it : __ctrls)

-			Utils::enableDlgControl(m_hwnd, it, r == 0);

-	}

-

 public:

 	COptLogDlg() :

 		CDlgBase(g_plugin, IDD_OPT_MSGLOG),

@@ -639,19 +626,13 @@ public:
 		chkLoadTime(this, IDC_LOADTIME),

 		chkLoadCount(this, IDC_LOADCOUNT),

 		chkAlwaysTrim(this, IDC_ALWAYSTRIM),

-		chkLoadUnread(this, IDC_LOADUNREAD),

-		cmbLogDisplay(this, IDC_MSGLOGDIDSPLAY)

+		chkLoadUnread(this, IDC_LOADUNREAD)

 	{

 		btnModify.OnClick = Callback(this, &COptLogDlg::onClick_Modify);

 		btnRtlModify.OnClick = Callback(this, &COptLogDlg::onClick_RtlModify);

 

-		cmbLogDisplay.OnChange = Callback(this, &COptLogDlg::onChange_Combo);

-

 		chkAlwaysTrim.OnChange = Callback(this, &COptLogDlg::onChange_Trim);

 		chkLoadTime.OnChange = chkLoadCount.OnChange = chkLoadUnread.OnChange = Callback(this, &COptLogDlg::onChange_Load);

-

-		have_ieview = ServiceExists(MS_IEVIEW_WINDOW) != 0;

-		have_hpp = ServiceExists(MS_HPP_GETVERSION) != 0;

 	}

 

 	bool OnInitDialog() override

@@ -687,33 +668,11 @@ public:
 		spnTrim.Enable(maxhist != 0);

 		Utils::enableDlgControl(m_hwnd, IDC_TRIM, maxhist != 0);

 		chkAlwaysTrim.SetState(maxhist != 0);

-

-		cmbLogDisplay.AddString(TranslateT("Internal message log"));

-		cmbLogDisplay.SetCurSel(0);

-		if (have_ieview || have_hpp) {

-			if (have_ieview) {

-				cmbLogDisplay.AddString(TranslateT("IEView plugin"));

-				if (M.GetByte("default_ieview", 0))

-					cmbLogDisplay.SetCurSel(1);

-			}

-			if (have_hpp) {

-				cmbLogDisplay.AddString(TranslateT("History++ plugin"));

-				if (M.GetByte("default_ieview", 0))

-					cmbLogDisplay.SetCurSel(1);

-				else if (M.GetByte("default_hpp", 0))

-					cmbLogDisplay.SetCurSel(have_ieview ? 2 : 1);

-			}

-		}

-		else cmbLogDisplay.Disable();

-

-		SetDlgItemText(m_hwnd, IDC_EXPLAINMSGLOGSETTINGS, TranslateT("You have chosen to use an external plugin for displaying the message history in the chat window. Most of the settings on this page are for the standard message log viewer only and will have no effect. To change the appearance of the message log, you must configure either IEView or History++."));

-		ShowHide();

 		return true;

 	}

 

 	bool OnApply() override

 	{

-		LRESULT msglogmode = cmbLogDisplay.GetCurSel();

 		DWORD dwFlags = M.GetDword("mwflags", MWF_LOG_DEFAULT);

 

 		dwFlags &= ~(MWF_LOG_ALL);

@@ -730,22 +689,6 @@ public:
 		db_set_dw(0, SRMSGMOD_T, "IndentAmount", spnLeft.GetPosition());

 		db_set_dw(0, SRMSGMOD_T, "RightIndent", spnRight.GetPosition());

 

-		db_set_b(0, SRMSGMOD_T, "default_ieview", 0);

-		db_set_b(0, SRMSGMOD_T, "default_hpp", 0);

-		switch (msglogmode) {

-		case 0:

-			break;

-		case 1:

-			if (have_ieview)

-				db_set_b(0, SRMSGMOD_T, "default_ieview", 1);

-			else

-				db_set_b(0, SRMSGMOD_T, "default_hpp", 1);

-			break;

-		case 2:

-			db_set_b(0, SRMSGMOD_T, "default_hpp", 1);

-			break;

-		}

-

 		// scan the tree view and obtain the options...

 		TreeViewToDB(logOpts, lvItemsLog, SRMSGMOD_T, &dwFlags);

 		db_set_dw(0, SRMSGMOD_T, "mwflags", dwFlags);

@@ -788,11 +731,6 @@ public:
 		CTemplateEditDlg *pDlg = new CTemplateEditDlg(TRUE, m_hwnd);

 		pDlg->Show();

 	}

-

-	void onChange_Combo(CCtrlCombo*)

-	{

-		ShowHide();

-	}

 };

 

 /////////////////////////////////////////////////////////////////////////////////////////

diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h
index 9d299951ad..a5663202cc 100644
--- a/plugins/TabSRMM/src/msgs.h
+++ b/plugins/TabSRMM/src/msgs.h
@@ -248,10 +248,52 @@ struct TContainerData : public MZeroedObject
 	}

 };

 

+/////////////////////////////////////////////////////////////////////////////////////////

+// CLogWindow - built-in log window

+

+class CLogWindow : public CRtfLogWindow

+{

+	typedef CRtfLogWindow CSuper;

+

+public:

+	CLogWindow(CMsgDialog &pDlg) :

+		CSuper(pDlg)

+	{

+	}

+

+	void Attach() override;

+	void LogEvents(MEVENT hDbEventFirst, int count, bool bAppend) override;

+	void LogEvents(DBEVENTINFO *dbei, bool bAppend) override;

+	void LogEvents(struct LOGINFO *, bool) override;

+	void ScrollToBottom() override;

+	void UpdateOptions() override;

+

+	void DisableStaticEdge()

+	{

+		SetWindowLongPtr(m_rtf.GetHwnd(), GWL_EXSTYLE, GetWindowLongPtr(m_rtf.GetHwnd(), GWL_EXSTYLE) & ~WS_EX_STATICEDGE);

+	}

+

+	char* GetRichTextRtf(bool bText, bool bSelection)

+	{

+		return m_rtf.GetRichTextRtf(bText, bSelection);

+	}

+

+	void  LogEvents(MEVENT hDbEventFirst, int count, bool bAppend, DBEVENTINFO *dbei);

+	void  ReplaceIcons(LONG startAt, int fAppend, BOOL isSent);

+	void  ScrollToBottom(bool, bool);

+

+	INT_PTR WndProc(UINT msg, WPARAM wParam, LPARAM lParam) override;

+};

+

+/////////////////////////////////////////////////////////////////////////////////////////

+// CMsgDialog - SRMM window class

+

 class CMsgDialog : public CSrmmBaseDialog

 {

 	typedef CSrmmBaseDialog CSuper;

 	friend class CInfoPanel;

+	friend class CLogWindow;

+	friend class CProxyWindow;

 

 	void    BB_InitDlgButtons(void);

 	void    BB_RefreshTheme(void);

@@ -298,12 +340,9 @@ class CMsgDialog : public CSrmmBaseDialog
 	void    LoadOwnAvatar(void);

 	void    LoadSplitter(void);

 	void    PlayIncomingSound(void) const;

-	void    ReplaceIcons(LONG startAt, int fAppend, BOOL isSent);

 	void    ReplayQueue(void);

-	void    ResizeIeView(void);

 	void    SaveAvatarToFile(HBITMAP hbm, int isOwnPic);

 	void 	  SendHBitmapAsFile(HBITMAP hbmp) const;

-	void    SetMessageLog(void);

 	void    ShowPopupMenu(const CCtrlBase&, POINT pt);

 	void    UpdateWindowIcon(void);

 	void    UpdateWindowState(UINT msg);

@@ -322,6 +361,7 @@ class CMsgDialog : public CSrmmBaseDialog
 	int     m_originalSplitterY;

 	SIZE    m_minEditBoxSize;

 	int     m_nTypeMode;

+	int     m_iLogMode;

 	DWORD   m_nLastTyping;

 	DWORD   m_lastMessage;

 	DWORD   m_dwTickLastEvent;

@@ -382,7 +422,6 @@ public:
 	DWORD   m_dwFlags = MWF_INITMODE, m_dwFlagsEx;

 	DWORD   m_dwUnread;

 	HANDLE  m_hTheme, m_hThemeIP, m_hThemeToolbar;

-	HWND    m_hwndIEView, m_hwndIWebBrowserControl, m_hwndHPP;

 	HICON   m_hXStatusIcon, m_hTabStatusIcon, m_hTabIcon, m_iFlashIcon, m_hTaskbarIcon, m_hClientIcon;

 	MEVENT  m_hDbEventFirst, m_hDbEventLast;

 	HANDLE  m_hTimeZone;

@@ -452,17 +491,14 @@ public:
 	int Resizer(UTILRESIZECONTROL *urc) override;

 

 	INT_PTR DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) override;

-	LRESULT WndProc_Log(UINT msg, WPARAM wParam, LPARAM lParam) override;

 	LRESULT WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam) override;

 	LRESULT WndProc_Nicklist(UINT msg, WPARAM wParam, LPARAM lParam) override;

 

 	void AddLog() override;

 	void CloseTab() override;

 	void LoadSettings() override;

-	void ScrollToBottom() override;

 	void SetStatusText(const wchar_t *, HICON) override;

 	void ShowFilterMenu() override;

-	void StreamInEvents(LOGINFO *lin, bool bRedraw) override;

 	void UpdateNickList() override;

 	void UpdateOptions() override;

 	void UpdateStatusBar() override;

@@ -476,6 +512,14 @@ public:
 

 	__forceinline CCtrlRichEdit& GetEntry() { return m_message; }

 

+	__forceinline CLogWindow* LOG() {

+		return ((CLogWindow *)m_pLog);

+	}

+

+	__forceinline void LogEvent(DBEVENTINFO *dbei) {

+		m_pLog->LogEvents(dbei, 1);

+	}

+

 	bool IsActive() const override

 	{

 		return m_pContainer->IsActive() && m_pContainer->m_hwndActive == m_hwnd;

@@ -483,7 +527,6 @@ public:
 

 	void  DM_OptionsApplied(WPARAM wParam, LPARAM lParam);

 	void  DM_RecalcPictureSize(void);

-	void  DM_SaveLogAsRTF(void) const;

 	void  DM_ScrollToBottom(WPARAM wParam, LPARAM lParam);

 

 	void  ActivateTooltip(int iCtrlId, const wchar_t *pwszMessage);

@@ -508,7 +551,6 @@ public:
 	void  SetDialogToType(void);

 	void  ShowPicture(bool showNewPic);

 	void  SplitterMoved(int x, HWND hwnd);

-	void  StreamInEvents(MEVENT hDbEventFirst, int count, int fAppend, DBEVENTINFO *dbei_s);

 	void  UpdateReadChars(void) const;

 	void  UpdateSaveAndSendButton(void);

 

@@ -733,7 +775,6 @@ struct TIconDescW
 #define DM_SC_BUILDLIST          (TM_USER+100)

 #define DM_SC_INITDIALOG         (TM_USER+101)

 #define DM_SC_CONFIG             (TM_USER+104)

-#define DM_SCROLLIEVIEW          (TM_USER+102)

 #define DM_UPDATEUIN             (TM_USER+103)

 

 #define MINSPLITTERX         60

@@ -1058,6 +1099,9 @@ struct SKINDESC
 

 struct CMPlugin : public PLUGIN<CMPlugin>

 {

+	HANDLE hLogger;

+	void InitLogger();

+

 	CMPlugin();

 

 	int Load() override;

diff --git a/plugins/TabSRMM/src/resource.h b/plugins/TabSRMM/src/resource.h
index 3c1ca3f16e..53f6768ff5 100644
--- a/plugins/TabSRMM/src/resource.h
+++ b/plugins/TabSRMM/src/resource.h
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}

 // Microsoft Visual C++ generated include file.

-// Used by ..\..\res\resource.rc

+// Used by w:\miranda-ng\plugins\TabSRMM\res\resource.rc

 //

 #define IDD_TEMPLATEEDIT                1

 #define IDD_USERPREFS                   2

@@ -187,7 +187,6 @@
 #define IDC_STMSGLOGGROUP               1139

 #define IDC_PROTOCOL                    1140

 #define IDC_STMSGLOGGROUP2              1140

-#define IDC_STMSGLOGGROUP3              1141

 #define IDC_PROTOMENU                   1141

 #define IDC_TYPING                      1143

 #define IDC_TOGGLETOOLBAR               1144

@@ -315,7 +314,6 @@
 #define IDC_SINGLEROWTAB                1263

 #define IDC_STREAMTHREADING             1264

 #define IDC_TABBORDEROUTERBOTTOM        1264

-#define IDC_IEVIEWMODE                  1265

 #define IDC_TABBORDERSPINOUTERBOTTOM    1265

 #define IDC_TEXTFORMATTING              1266

 #define IDC_AVATARMODE                  1267

@@ -439,7 +437,6 @@
 #define IDC_TITLEBOX                    1402

 #define IDC_DESC                        1404

 #define IDC_LABEL_PRIVATETHEME          1405

-#define IDC_MSGLOGDIDSPLAY              1407

 #define IDC_BOTTOMTOOLBAR               1414

 #define IDC_BUTTON1                     1415

 #define IDC_PLUS_REVERT                 1415

@@ -472,7 +469,6 @@
 #define IDC_GROUP_OTHER                 1435

 #define IDC_SIZE_TIP                    1436

 #define IDC_IPCONFIG_PRIVATECONTAINER   1437

-#define IDC_EXPLAINMSGLOGSETTINGS       1437

 #define IDC_PANELPICTUREVIS             1438

 #define IDC_SKINNAME                    1438

 #define IDC_SKINROOTFOLDER              1439

@@ -621,7 +617,6 @@
 #define ID_WINDOWFLASHING_USEDEFAULTVALUES 40106

 #define ID_WINDOWFLASHING_FLASHUNTILFOCUSED 40107

 #define ID_WINDOWFLASHING_DISABLEFLASHING 40108

-#define ID_FILE_SAVEMESSAGELOGAS        40109

 #define ID_EVENTPOPUPS_SHOWPOPUPSIFWINDOWISMINIMIZED 40110

 #define ID_EVENTPOPUPS_SHOWPOPUPSIFWINDOWISUNFOCUSED 40111

 #define ID_EVENTPOPUPS_SHOWPOPUPSFORALLINACTIVESESSIONS 40112

@@ -720,3 +715,14 @@
 #define ID_QUEUEMANAGER_RESUMESELECTED  40259

 #define ID_QUEUEMANAGER_CANCELALLMULTISENDJOBS 40260

 #define ID_QUEUEMANAGER_COPYMESSAGETOCLIPBOARD 40261

+

+// Next default values for new objects

+// 

+#ifdef APSTUDIO_INVOKED

+#ifndef APSTUDIO_READONLY_SYMBOLS

+#define _APS_NEXT_RESOURCE_VALUE        102

+#define _APS_NEXT_COMMAND_VALUE         40001

+#define _APS_NEXT_CONTROL_VALUE         1000

+#define _APS_NEXT_SYMED_VALUE           101

+#endif

+#endif

diff --git a/plugins/TabSRMM/src/sendqueue.cpp b/plugins/TabSRMM/src/sendqueue.cpp
index 78744e7138..d71d647ef6 100644
--- a/plugins/TabSRMM/src/sendqueue.cpp
+++ b/plugins/TabSRMM/src/sendqueue.cpp
@@ -361,7 +361,7 @@ void SendQueue::logError(CMsgDialog *dat, int iSendJobIndex, const wchar_t *szEr
 	dbei.cbBlob = (int)iMsgLen;
 	dbei.timestamp = time(0);
 	dbei.szModule = (char *)szErrMsg;
-	dat->StreamInEvents(0, 1, 1, &dbei);
+	dat->LogEvent(&dbei);
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
@@ -557,7 +557,8 @@ int SendQueue::doSendLater(int iJobIndex, CMsgDialog *dat, MCONTACT hContact, bo
 		dbei.timestamp = time(0);
 		dbei.cbBlob = (int)mir_strlen(utfText) + 1;
 		dbei.pBlob = (PBYTE)(char*)utfText;
-		dat->StreamInEvents(0, 1, 1, &dbei);
+		dat->LogEvent(&dbei);
+
 		if (dat->m_hDbEventFirst == 0)
 			dat->RemakeLog();
 		dat->m_cache->saveHistory();
diff --git a/plugins/TabSRMM/src/srmm.cpp b/plugins/TabSRMM/src/srmm.cpp
index 608d6b919f..00f154fd81 100644
--- a/plugins/TabSRMM/src/srmm.cpp
+++ b/plugins/TabSRMM/src/srmm.cpp
@@ -70,6 +70,8 @@ int CMPlugin::Load()
 
 	SystemParametersInfo(SPI_GETICONTITLELOGFONT, sizeof(lfDefault), &lfDefault, FALSE);
 
+	hLogger = RegisterSrmmLog("built-in", L"tabSRMM internal log", &logBuilder);
+
 	Chat_Load();
 
 	return LoadSendRecvMessageModule();
@@ -79,6 +81,7 @@ int CMPlugin::Load()
 
 int CMPlugin::Unload()
 {
+	UnregisterSrmmLog(hLogger);
 	FreeLogFonts();
 	Chat_Unload();
 	int iRet = SplitmsgShutdown();
diff --git a/plugins/TabSRMM/src/stdafx.h b/plugins/TabSRMM/src/stdafx.h
index 97cd4a1989..61714812ac 100644
--- a/plugins/TabSRMM/src/stdafx.h
+++ b/plugins/TabSRMM/src/stdafx.h
@@ -247,6 +247,8 @@ void TreeViewToDB(CCtrlTreeView&, TOptionListItem *lvItems, const char *DBPath,
 

 INT_PTR CALLBACK DlgProcSetupStatusModes(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);

 

+CSrmmLogWindow *logBuilder(CMsgDialog &pDlg);

+

 int TSAPI TBStateConvert2Flat(int state);

 int TSAPI RBStateConvert2Flat(int state);

 void TSAPI FillTabBackground(const HDC hdc, int iStateId, const CMsgDialog *dat, RECT* rc);

diff --git a/plugins/TabSRMM/src/taskbar.cpp b/plugins/TabSRMM/src/taskbar.cpp
index 6def0b6f2f..b4a8257695 100644
--- a/plugins/TabSRMM/src/taskbar.cpp
+++ b/plugins/TabSRMM/src/taskbar.cpp
@@ -275,13 +275,11 @@ void CProxyWindow::sendPreview()
 	HDC hdc, dc;

 	int twips = (int)(15.0f / PluginConfig.m_DPIscaleY);

 	bool fIsChat = m_dat->isChat();

-	HWND 	hwndRich = ::GetDlgItem(m_dat->GetHwnd(), IDC_SRMM_LOG);

-	LONG 	cx, cy;

+	HWND hwndRich = m_dat->m_pLog->GetHwnd();

 	POINT	ptOrigin = { 0 }, ptBottom;

 

 	if (m_dat->m_dwFlags & MWF_NEEDCHECKSIZE) {

 		RECT	rcClient;

-

 		::SendMessage(m_dat->m_pContainer->m_hwnd, DM_QUERYCLIENTAREA, 0, (LPARAM)&rcClient);

 		::MoveWindow(m_dat->GetHwnd(), rcClient.left, rcClient.top, (rcClient.right - rcClient.left), (rcClient.bottom - rcClient.top), FALSE);

 		::SendMessage(m_dat->GetHwnd(), WM_SIZE, 0, 0);

@@ -308,8 +306,8 @@ void CProxyWindow::sendPreview()
 	ptBottom.y = rcTemp.bottom;

 	::ScreenToClient(m_dat->m_pContainer->m_hwnd, &ptBottom);

 

-	cx = rcLog.right - rcLog.left;

-	cy = rcLog.bottom - rcLog.top;

+	int cx = rcLog.right - rcLog.left;

+	int cy = rcLog.bottom - rcLog.top;

 	rcRich.left = 0;

 	rcRich.top = 0;

 	rcRich.right = cx;

@@ -337,9 +335,9 @@ void CProxyWindow::sendPreview()
 	::FillRect(hdcRich, &rcRich, br);

 	::DeleteObject(br);

 

-	if (m_dat->m_hwndIEView)

-		::SendMessage(m_dat->m_hwndIEView, WM_PRINT, reinterpret_cast<WPARAM>(hdcRich), PRF_CLIENT | PRF_NONCLIENT);

-	else if (m_dat->m_hwndHPP) {

+	if (m_dat->m_iLogMode == WANT_IEVIEW_LOG)

+		::SendMessage(hwndRich, WM_PRINT, reinterpret_cast<WPARAM>(hdcRich), PRF_CLIENT | PRF_NONCLIENT);

+	else if (m_dat->m_iLogMode == WANT_HPP_LOG) {

 		CSkin::RenderText(hdcRich, m_dat->m_hTheme, TranslateT("Previews not available when using History++ plugin for message log display."),

 			&rcRich, DT_VCENTER | DT_CENTER | DT_WORDBREAK, 10, m_dat->m_pContainer->m_theme.fontColors[MSGFONTID_MYMSG], false);

 	}

@@ -353,7 +351,6 @@ void CProxyWindow::sendPreview()
 		fr.rcPage = rcRich;

 		fr.chrg.cpMax = -1;

 		fr.chrg.cpMin = first;

-

 		::SendMessage(hwndRich, EM_FORMATRANGE, 1, LPARAM(&fr));

 	}

 

diff --git a/plugins/TabSRMM/src/templates.cpp b/plugins/TabSRMM/src/templates.cpp
index f03ba9ceab..0c40f44129 100644
--- a/plugins/TabSRMM/src/templates.cpp
+++ b/plugins/TabSRMM/src/templates.cpp
@@ -125,6 +125,8 @@ CTemplateEditDlg::CTemplateEditDlg(BOOL _rtl, HWND hwndParent) :
 {
 	SetParent(hwndParent);
 
+	m_pLog = new CLogWindow(*this);
+
 	m_pContainer = new TContainerData();
 	m_pContainer->LoadOverrideTheme();
 	tSet = rtl ? m_pContainer->m_rtl_templates : m_pContainer->m_ltr_templates;
@@ -143,10 +145,6 @@ CTemplateEditDlg::CTemplateEditDlg(BOOL _rtl, HWND hwndParent) :
 
 bool CTemplateEditDlg::OnInitDialog()
 {
-	m_log.SendMsg(EM_SETEVENTMASK, 0, ENM_MOUSEEVENTS | ENM_LINK);
-	m_log.SendMsg(EM_SETEDITSTYLE, SES_EXTENDBACKCOLOR, SES_EXTENDBACKCOLOR);
-	m_log.SendMsg(EM_EXLIMITTEXT, 0, 0x80000000);
-
 	// set hContact to the first found contact so that we can use the Preview window properly
 	// also, set other parameters needed by the streaming function to display events
 	m_hContact = db_find_first();
@@ -250,13 +248,12 @@ void CTemplateEditDlg::onClick_Preview(CCtrlButton*)
 	dbei.flags |= (rtl ? DBEF_RTL : 0);
 	m_lastEventTime = (iIndex == 4 || iIndex == 5) ? time(0) - 1 : 0;
 	m_iLastEventType = MAKELONG(dbei.flags, dbei.eventType);
-	m_log.SetText(L"");
 	m_dwFlags = MWF_LOG_ALL;
 	m_dwFlags = (rtl ? m_dwFlags | MWF_LOG_RTL : m_dwFlags & ~MWF_LOG_RTL);
 	m_dwFlags = (iIndex == 0 || iIndex == 1) ? m_dwFlags & ~MWF_LOG_GROUPMODE : m_dwFlags | MWF_LOG_GROUPMODE;
 	mir_snwprintf(m_wszMyNickname, L"My Nickname");
-	StreamInEvents(0, 1, 0, &dbei);
-	m_log.SendMsg(EM_SETSEL, -1, -1);
+	m_pLog->Clear();
+	LogEvent(&dbei);
 	if (changed)
 		memcpy(tSet->szTemplates[inEdit], szTemp, TEMPLATE_LENGTH * sizeof(wchar_t));
 }
diff --git a/plugins/TabSRMM/src/themes.cpp b/plugins/TabSRMM/src/themes.cpp
index a1b2368a04..64bd4d7a18 100644
--- a/plugins/TabSRMM/src/themes.cpp
+++ b/plugins/TabSRMM/src/themes.cpp
@@ -2155,7 +2155,7 @@ void CMsgDialog::RenderToolbarBG(HDC hdc, const RECT &rcWindow) const
 	POINT	pt;

 

 	if (!(m_pContainer->m_dwFlags & CNT_BOTTOMTOOLBAR)) {

-		::GetWindowRect(m_log.GetHwnd(), &rc);

+		::GetWindowRect(m_pLog->GetHwnd(), &rc);

 		pt.y = rc.bottom + 0;

 		::ScreenToClient(m_hwnd, &pt);

 		rcToolbar.top = pt.y;

@@ -2404,7 +2404,7 @@ void CSkin::extractSkinsAndLogo(bool fForceOverwrite) const
 void CMsgDialog::UpdateToolbarBG()

 {

 	RECT rcUpdate, rcTmp;

-	::GetWindowRect(m_log.GetHwnd(), &rcTmp);

+	::GetWindowRect(m_pLog->GetHwnd(), &rcTmp);

 

 	POINT	pt;

 	pt.x = rcTmp.left;

diff --git a/plugins/TabSRMM/src/userprefs.cpp b/plugins/TabSRMM/src/userprefs.cpp
index 7c259f6cff..1bb65f45f6 100644
--- a/plugins/TabSRMM/src/userprefs.cpp
+++ b/plugins/TabSRMM/src/userprefs.cpp
@@ -35,8 +35,6 @@
 #define UPREF_ACTION_REMAKELOG 2

 #define UPREF_ACTION_SWITCHLOGVIEWER 4

 

-static int have_ieview = 0, have_hpp = 0;

-

 static INT_PTR CALLBACK DlgProcUserPrefs(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	MCONTACT hContact = (MCONTACT)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);

@@ -47,16 +45,11 @@ static INT_PTR CALLBACK DlgProcUserPrefs(HWND hwndDlg, UINT msg, WPARAM wParam,
 		{

 			hContact = lParam;

 			DWORD maxhist = M.GetDword(hContact, "maxhist", 0);

-			BYTE bIEView = M.GetByte(hContact, "ieview", 0);

-			BYTE bHPP = M.GetByte(hContact, "hpplog", 0);

 			int iLocalFormat = M.GetDword(hContact, "sendformat", 0);

 			BYTE bSplit = M.GetByte(hContact, "splitoverride", 0);

 			BYTE bInfoPanel = M.GetByte(hContact, "infopanel", 0);

 			BYTE bAvatarVisible = M.GetByte(hContact, "hideavatar", -1);

 

-			have_ieview = ServiceExists(MS_IEVIEW_WINDOW);

-			have_hpp = ServiceExists(MS_HPP_GETVERSION);

-

 			SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)lParam);

 

 			SendDlgItemMessage(hwndDlg, IDC_INFOPANEL, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Use global setting"));

@@ -69,33 +62,6 @@ static INT_PTR CALLBACK DlgProcUserPrefs(HWND hwndDlg, UINT msg, WPARAM wParam,
 			SendDlgItemMessage(hwndDlg, IDC_SHOWAVATAR, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Never show it at all"));

 			SendDlgItemMessage(hwndDlg, IDC_SHOWAVATAR, CB_SETCURSEL, bAvatarVisible == 0xff ? 0 : (bAvatarVisible == 1 ? 1 : 2), 0);

 

-			SendDlgItemMessage(hwndDlg, IDC_IEVIEWMODE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Use global setting"));

-			SendDlgItemMessage(hwndDlg, IDC_IEVIEWMODE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Force default message log"));

-

-			SendDlgItemMessage(hwndDlg, IDC_IEVIEWMODE, CB_SETITEMDATA, 0, 0);

-			SendDlgItemMessage(hwndDlg, IDC_IEVIEWMODE, CB_SETITEMDATA, 1, 1);

-

-			if (have_hpp) {

-				SendDlgItemMessage(hwndDlg, IDC_IEVIEWMODE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Force History++"));

-				SendDlgItemMessage(hwndDlg, IDC_IEVIEWMODE, CB_SETITEMDATA, 2, 2);

-			}

-

-			if (have_ieview) {

-				SendDlgItemMessage(hwndDlg, IDC_IEVIEWMODE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Force IEView"));

-				SendDlgItemMessage(hwndDlg, IDC_IEVIEWMODE, CB_SETITEMDATA, have_hpp ? 3 : 2, 3);

-			}

-

-			if (bIEView == 0 && bHPP == 0)

-				SendDlgItemMessage(hwndDlg, IDC_IEVIEWMODE, CB_SETCURSEL, 0, 0);

-			else if (bIEView == 0xff && bHPP == 0xff)

-				SendDlgItemMessage(hwndDlg, IDC_IEVIEWMODE, CB_SETCURSEL, 1, 0);

-			else {

-				if (bHPP == 1)

-					SendDlgItemMessage(hwndDlg, IDC_IEVIEWMODE, CB_SETCURSEL, have_hpp ? 2 : 0, 0);

-				if (bIEView == 1)

-					SendDlgItemMessage(hwndDlg, IDC_IEVIEWMODE, CB_SETCURSEL, (have_hpp && have_ieview) ? 3 : (have_ieview ? 2 : 0), 0);

-			}

-

 			SendDlgItemMessage(hwndDlg, IDC_TEXTFORMATTING, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Use global setting"));

 			SendDlgItemMessage(hwndDlg, IDC_TEXTFORMATTING, CB_INSERTSTRING, -1, (LPARAM)TranslateT("BBCode"));

 			SendDlgItemMessage(hwndDlg, IDC_TEXTFORMATTING, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Force off"));

@@ -134,46 +100,14 @@ static INT_PTR CALLBACK DlgProcUserPrefs(HWND hwndDlg, UINT msg, WPARAM wParam,
 		case WM_USER + 100:

 			CMsgDialog *dat = nullptr;

 			DWORD	*pdwActionToTake = (DWORD *)lParam;

-			unsigned int iOldIEView = 0;

 			HWND	hWnd = Srmm_FindWindow(hContact);

 			BYTE	bOldInfoPanel = M.GetByte(hContact, "infopanel", 0);

 

-			if (hWnd) {

+			if (hWnd)

 				dat = (CMsgDialog*)GetWindowLongPtr(hWnd, GWLP_USERDATA);

-				if (dat)

-					iOldIEView = GetIEViewMode(dat->m_hContact);

-			}

-			int iIndex = SendDlgItemMessage(hwndDlg, IDC_IEVIEWMODE, CB_GETCURSEL, 0, 0);

-			int iMode = SendDlgItemMessage(hwndDlg, IDC_IEVIEWMODE, CB_GETITEMDATA, iIndex, 0);

-

-			if (iIndex != CB_ERR && (iMode >= 0 && iMode <= 3)) {

-				switch (iMode) {

-				case 0:

-					db_set_b(hContact, SRMSGMOD_T, "ieview", 0);

-					db_set_b(hContact, SRMSGMOD_T, "hpplog", 0);

-					break;

-				case 1:

-					db_set_b(hContact, SRMSGMOD_T, "ieview", -1);

-					db_set_b(hContact, SRMSGMOD_T, "hpplog", -1);

-					break;

-				case 2:

-					db_set_b(hContact, SRMSGMOD_T, "ieview", -1);

-					db_set_b(hContact, SRMSGMOD_T, "hpplog", 1);

-					break;

-				case 3:

-					db_set_b(hContact, SRMSGMOD_T, "ieview", 1);

-					db_set_b(hContact, SRMSGMOD_T, "hpplog", -1);

-					break;

-				}

-				if (hWnd && dat) {

-					unsigned int iNewIEView = GetIEViewMode(dat->m_hContact);

-					if (iNewIEView != iOldIEView) {

-						if (pdwActionToTake)

-							*pdwActionToTake |= UPREF_ACTION_SWITCHLOGVIEWER;

-					}

-				}

-			}

-			if ((iIndex = SendDlgItemMessage(hwndDlg, IDC_TEXTFORMATTING, CB_GETCURSEL, 0, 0)) != CB_ERR) {

+

+			int iIndex = SendDlgItemMessage(hwndDlg, IDC_TEXTFORMATTING, CB_GETCURSEL, 0, 0);

+			if (iIndex != CB_ERR) {

 				if (iIndex == 0)

 					db_unset(hContact, SRMSGMOD_T, "sendformat");

 				else