CHAT_MANAGER:

- unused function SM_PostMessage removed;
- some minor fixes for switching SRMM plugins on the fly

2 files changed, 77 insertions, 61 deletions

diff --git a/include/m_chat_int.h b/include/m_chat_int.h
index 06c95af4b5..8a4f054b0c 100644
--- a/include/m_chat_int.h
+++ b/include/m_chat_int.h
@@ -279,7 +279,6 @@ struct CHAT_MANAGER
 	SESSION_INFO* (*SM_CreateSession)(void);

 	SESSION_INFO* (*SM_FindSession)(const wchar_t *pszID, const char *pszModule);

 	HICON         (*SM_GetStatusIcon)(SESSION_INFO *si, USERINFO * ui);

-	BOOL          (*SM_PostMessage)(const wchar_t *pszID, const char *pszModule, UINT msg, WPARAM wParam, LPARAM lParam);

 	BOOL          (*SM_BroadcastMessage)(const char *pszModule, UINT msg, WPARAM wParam, LPARAM lParam, BOOL bAsync);

 	void          (*SM_AddCommand)(const wchar_t *pszID, const char *pszModule, const char* lpNewCommand);

 	char*         (*SM_GetPrevCommand)(const wchar_t *pszID, const char *pszModule);

diff --git a/src/mir_app/src/chat_manager.cpp b/src/mir_app/src/chat_manager.cpp
index 4ef7c5f523..b3b70ede3f 100644
--- a/src/mir_app/src/chat_manager.cpp
+++ b/src/mir_app/src/chat_manager.cpp
@@ -907,6 +907,73 @@ static BOOL LM_RemoveAll(LOGINFO **ppLogListStart, LOGINFO **ppLogListEnd)
 	return TRUE;

 }

 

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

+

+static void ResetApi()

+{

+	g_chatApi.SetActiveSession = ::SetActiveSession;

+	g_chatApi.GetActiveSession = ::GetActiveSession;

+	g_chatApi.SM_CreateSession = ::SM_CreateSession;

+	g_chatApi.SM_FindSession = ::SM_FindSession;

+	g_chatApi.SM_GetStatusIcon = ::SM_GetStatusIcon;

+	g_chatApi.SM_BroadcastMessage = ::SM_BroadcastMessage;

+	g_chatApi.SM_AddCommand = ::SM_AddCommand;

+	g_chatApi.SM_GetPrevCommand = ::SM_GetPrevCommand;

+	g_chatApi.SM_GetNextCommand = ::SM_GetNextCommand;

+	g_chatApi.SM_GetCount = ::SM_GetCount;

+	g_chatApi.SM_FindSessionByIndex = ::SM_FindSessionByIndex;

+	g_chatApi.SM_GetUserFromIndex = ::SM_GetUserFromIndex;

+	g_chatApi.SM_InvalidateLogDirectories = ::SM_InvalidateLogDirectories;

+

+	g_chatApi.MM_CreateModule = ::MM_CreateModule;

+	g_chatApi.MM_FontsChanged = ::MM_FontsChanged;

+	g_chatApi.MM_IconsChanged = ::MM_IconsChanged;

+	g_chatApi.MM_RemoveAll = ::MM_RemoveAll;

+

+	g_chatApi.TM_FindStatus = ::TM_FindStatus;

+	g_chatApi.TM_WordToString = ::TM_WordToString;

+	g_chatApi.TM_RemoveAll = ::TM_RemoveAll;

+

+	g_chatApi.UM_AddUser = ::UM_AddUser;

+	g_chatApi.UM_CompareItem = ::UM_CompareItem;

+	g_chatApi.UM_FindUser = ::UM_FindUser;

+	g_chatApi.UM_FindUserFromIndex = ::UM_FindUserFromIndex;

+	g_chatApi.UM_GiveStatus = ::UM_GiveStatus;

+	g_chatApi.UM_SetContactStatus = ::UM_SetContactStatus;

+	g_chatApi.UM_TakeStatus = ::UM_TakeStatus;

+	g_chatApi.UM_FindUserAutoComplete = ::UM_FindUserAutoComplete;

+	g_chatApi.UM_RemoveUser = ::UM_RemoveUser;

+

+	g_chatApi.LM_AddEvent = ::LM_AddEvent;

+	g_chatApi.LM_TrimLog = ::LM_TrimLog;

+	g_chatApi.LM_RemoveAll = ::LM_RemoveAll;

+

+	g_chatApi.SetOffline = ::SetOffline;

+	g_chatApi.SetAllOffline = ::SetAllOffline;

+	g_chatApi.AddEvent = ::AddEvent;

+	g_chatApi.FindRoom = ::FindRoom;

+	g_chatApi.DoRtfToTags = ::DoRtfToTags;

+

+	g_chatApi.Log_CreateRTF = ::Log_CreateRTF;

+	g_chatApi.Log_CreateRtfHeader = ::Log_CreateRtfHeader;

+	g_chatApi.LoadMsgDlgFont = ::LoadMsgDlgFont;

+	g_chatApi.MakeTimeStamp = ::MakeTimeStamp;

+

+	g_chatApi.DoSoundsFlashPopupTrayStuff = ::DoSoundsFlashPopupTrayStuff;

+	g_chatApi.DoTrayIcon = ::DoTrayIcon;

+	g_chatApi.DoPopup = ::DoPopup;

+	g_chatApi.ShowPopup = ::ShowPopup;

+	g_chatApi.LogToFile = ::LogToFile;

+	g_chatApi.GetChatLogsFilename = ::GetChatLogsFilename;

+	g_chatApi.Log_SetStyle = ::Log_SetStyle;

+

+	g_chatApi.IsHighlighted = ::IsHighlighted;

+	g_chatApi.RemoveFormatting = ::RemoveFormatting;

+	g_chatApi.ReloadSettings = ::LoadGlobalSettings;

+}

+

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

+

 MIR_APP_DLL(CHAT_MANAGER*) Chat_CustomizeApi(const CHAT_MANAGER_INITDATA *pInit)

 {

 	if (pInit == nullptr)

@@ -928,6 +995,7 @@ MIR_APP_DLL(CHAT_MANAGER*) Chat_CustomizeApi(const CHAT_MANAGER_INITDATA *pInit)
 		}

 	}

 	if (g_cbModuleInfo) { // reallocate old modules

+		bool bReallocated = false;

 		mir_cslock lck(csChat);

 

 		for (auto &mi : g_arModules) {

@@ -936,8 +1004,13 @@ MIR_APP_DLL(CHAT_MANAGER*) Chat_CustomizeApi(const CHAT_MANAGER_INITDATA *pInit)
 			if (p1 != mi) { // realloc could change a pointer, reinsert a structure

 				g_arModules.remove(mi);

 				g_arModules.insert(p1);

+				bReallocated = true;

 			}

 		}

+	

+		if (bReallocated)

+			for (auto &si : g_arSessions)

+				si->pMI = MM_FindModule(si->pszModule);

 	}

 

 	g_Settings = pInit->pSettings;

@@ -947,6 +1020,8 @@ MIR_APP_DLL(CHAT_MANAGER*) Chat_CustomizeApi(const CHAT_MANAGER_INITDATA *pInit)
 	g_iFontMode = pInit->iFontMode;

 	g_pChatPlugin = pInit->pPlugin;

 

+	ResetApi();

+

 	RegisterFonts();

 	OptionsInit();

 	return &g_chatApi;

@@ -957,67 +1032,9 @@ MIR_APP_DLL(CHAT_MANAGER*) Chat_CustomizeApi(const CHAT_MANAGER_INITDATA *pInit)
 CHAT_MANAGER::CHAT_MANAGER() :

 	arSessions(g_arSessions)

 {

-	SetActiveSession = ::SetActiveSession;

-	GetActiveSession = ::GetActiveSession;

-	SM_CreateSession = ::SM_CreateSession;

-	SM_FindSession = ::SM_FindSession;

-	SM_GetStatusIcon = ::SM_GetStatusIcon;

-	SM_BroadcastMessage = ::SM_BroadcastMessage;

-	SM_AddCommand = ::SM_AddCommand;

-	SM_GetPrevCommand = ::SM_GetPrevCommand;

-	SM_GetNextCommand = ::SM_GetNextCommand;

-	SM_GetCount = ::SM_GetCount;

-	SM_FindSessionByIndex = ::SM_FindSessionByIndex;

-	SM_GetUserFromIndex = ::SM_GetUserFromIndex;

-	SM_InvalidateLogDirectories = ::SM_InvalidateLogDirectories;

-

-	MM_CreateModule = ::MM_CreateModule;

-	MM_FontsChanged = ::MM_FontsChanged;

-	MM_IconsChanged = ::MM_IconsChanged;

-	MM_RemoveAll = ::MM_RemoveAll;

-

-	TM_FindStatus = ::TM_FindStatus;

-	TM_WordToString = ::TM_WordToString;

-	TM_RemoveAll = ::TM_RemoveAll;

-

-	UM_AddUser = ::UM_AddUser;

-	UM_CompareItem = ::UM_CompareItem;

-	UM_FindUser = ::UM_FindUser;

-	UM_FindUserFromIndex = ::UM_FindUserFromIndex;

-	UM_GiveStatus = ::UM_GiveStatus;

-	UM_SetContactStatus = ::UM_SetContactStatus;

-	UM_TakeStatus = ::UM_TakeStatus;

-	UM_FindUserAutoComplete = ::UM_FindUserAutoComplete;

-	UM_RemoveUser = ::UM_RemoveUser;

-

-	LM_AddEvent = ::LM_AddEvent;

-	LM_TrimLog = ::LM_TrimLog;

-	LM_RemoveAll = ::LM_RemoveAll;

-

-	SetOffline = ::SetOffline;

-	SetAllOffline = ::SetAllOffline;

-	AddEvent = ::AddEvent;

-	FindRoom = ::FindRoom;

-	DoRtfToTags = ::DoRtfToTags;

-

-	Log_CreateRTF = ::Log_CreateRTF;

-	Log_CreateRtfHeader = ::Log_CreateRtfHeader;

-	LoadMsgDlgFont = ::LoadMsgDlgFont;

-	MakeTimeStamp = ::MakeTimeStamp;

-

-	DoSoundsFlashPopupTrayStuff = ::DoSoundsFlashPopupTrayStuff;

-	DoTrayIcon = ::DoTrayIcon;

-	DoPopup = ::DoPopup;

-	ShowPopup = ::ShowPopup;

-	LogToFile = ::LogToFile;

-	GetChatLogsFilename = ::GetChatLogsFilename;

-	Log_SetStyle = ::Log_SetStyle;

-

-	IsHighlighted = ::IsHighlighted;

-	RemoveFormatting = ::RemoveFormatting;

-	ReloadSettings = ::LoadGlobalSettings;

-

 	pLogIconBmpBits = ::pLogIconBmpBits;

+

+	ResetApi();

 }

 

 MIR_APP_EXPORT CHAT_MANAGER g_chatApi;