From 0f09bc6a33604e79996caaf6ff021226e96e53fd Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Sat, 15 Apr 2023 20:37:26 +0300
Subject: =?UTF-8?q?fixes=20#3458=20(tabSRMM:=20=D0=B4=D0=B2=D0=BE=D1=8F?=
 =?UTF-8?q?=D1=82=D1=81=D1=8F=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/m_chat.h     |  1 +
 include/m_chat_int.h | 27 +++++++++++----------------
 include/m_srmm_int.h |  2 +-
 3 files changed, 13 insertions(+), 17 deletions(-)

(limited to 'include')

diff --git a/include/m_chat.h b/include/m_chat.h
index 92e4e6329b..bd5967dc9f 100644
--- a/include/m_chat.h
+++ b/include/m_chat.h
@@ -381,6 +381,7 @@ struct GCEVENT
 
 	INT_PTR      dwItemData;       // User specified data.
 	uint32_t     time;             // Timestamp of the event
+	MEVENT       hEvent;           // Database event
 };
 
 MIR_APP_DLL(int) Chat_Event(GCEVENT*);
diff --git a/include/m_chat_int.h b/include/m_chat_int.h
index cf0e1b5778..807845380b 100644
--- a/include/m_chat_int.h
+++ b/include/m_chat_int.h
@@ -111,17 +111,17 @@ struct FONTINFO
 
 struct LOGINFO
 {
-	wchar_t *ptszText;
-	wchar_t *ptszNick;
-	wchar_t *ptszUID;
-	wchar_t *ptszStatus;
-	wchar_t *ptszUserInfo;
+	ptrW     ptszText;
+	ptrW     ptszNick;
+	ptrW     ptszUID;
+	ptrW     ptszStatus;
+	ptrW     ptszUserInfo;
 	bool     bIsMe;
 	bool     bIsHighlighted;
 	bool     bSimple;
 	time_t   time;
+	MEVENT   hEvent;
 	int      iType;
-	LOGINFO *next, *prev;
 };
 
 struct STATUSINFO
@@ -153,9 +153,9 @@ struct MIR_APP_EXPORT SESSION_INFO : public MZeroedObject, public MNonCopyable
 	wchar_t*    ptszTopic;
 
 	int         iType;
-	int         iEventCount;
-	int         iStatusCount;
+	int         iStatusCount, iLastEvent;
 	int         iTrayFlags, iPopupFlags;
+	int         currentHovered;
 
 	uint16_t    wStatus;
 	uint16_t    wState;
@@ -163,10 +163,7 @@ struct MIR_APP_EXPORT SESSION_INFO : public MZeroedObject, public MNonCopyable
 	void*       pItemData;
 	time_t      LastTime;
 
-	int         currentHovered;
-
 	CMsgDialog *pDlg;
-	LOGINFO *pLog, *pLogEnd;
 	USERINFO *pMe;
 	STATUSINFO *pStatuses;
 	MODULEINFO *pMI;
@@ -174,6 +171,7 @@ struct MIR_APP_EXPORT SESSION_INFO : public MZeroedObject, public MNonCopyable
 
 	LIST<USERINFO> arKeys;
 	OBJLIST<USERINFO> arUsers;
+	OBJLIST<LOGINFO> arEvents;
 
 	wchar_t pszLogFileName[MAX_PATH];
 
@@ -196,10 +194,9 @@ struct GCLogStreamDataBase
 {
 	char*         buffer;
 	int           bufferOffset, bufferLen;
+	int           iStartEvent;
+	bool          bStripFormat, bRedraw;
 	HWND          hwnd;
-	LOGINFO*      lin;
-	BOOL          bStripFormat;
-	BOOL          bRedraw;
 	SESSION_INFO *si;
 };
 
@@ -301,8 +298,6 @@ struct CHAT_MANAGER
 	wchar_t*      (*UM_FindUserAutoComplete)(SESSION_INFO *si, const wchar_t* pszOriginal, const wchar_t* pszCurrent);
 	BOOL          (*UM_RemoveUser)(SESSION_INFO *si, const wchar_t *pszUID);
 
-	BOOL          (*LM_RemoveAll)(LOGINFO **ppLogListStart, LOGINFO **ppLogListEnd);
-
 	BOOL          (*SetOffline)(MCONTACT hContact, BOOL bHide);
 	BOOL          (*SetAllOffline)(BOOL bHide, const char *pszModule);
 
diff --git a/include/m_srmm_int.h b/include/m_srmm_int.h
index 817558e664..9163536e5c 100644
--- a/include/m_srmm_int.h
+++ b/include/m_srmm_int.h
@@ -128,7 +128,7 @@ public:
 	virtual HWND     GetHwnd() = 0;
 	virtual wchar_t* GetSelection() = 0;
 	virtual void     LogEvents(MEVENT hDbEventFirst, int count, bool bAppend) = 0;
-	virtual void     LogEvents(struct LOGINFO *, bool) = 0;
+	virtual void     LogEvents(struct SESSION_INFO *si, int iStart, bool bAppend) = 0;
 	virtual void     Resize() = 0;
 	virtual void     ScrollToBottom() = 0;
 	virtual void     UpdateOptions() {};
-- 
cgit v1.2.3