From ef0abe4f9f67eeff4007f4839ba08a503472c74c Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 21 Jan 2014 23:24:02 +0000
Subject: - new typed helper, WindowList_Create, to create a window list - new
 service, WindowList_Destroy, to destroy a window list - internal
 windowlist.cpp implementation rewritten to LIST<>

git-svn-id: http://svn.miranda-ng.org/main/trunk@7823 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/TabSRMM/src/msgs.cpp         | 7 +++++--
 plugins/TabSRMM/src/typingnotify.cpp | 3 ++-
 plugins/TabSRMM/src/utils.cpp        | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'plugins/TabSRMM')

diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp
index bd7d9f9bf1..d7c069a011 100644
--- a/plugins/TabSRMM/src/msgs.cpp
+++ b/plugins/TabSRMM/src/msgs.cpp
@@ -417,6 +417,9 @@ static INT_PTR TypingMessageCommand(WPARAM wParam, LPARAM lParam)
 
 int SplitmsgShutdown(void)
 {
+	WindowList_Destroy(M.m_hMessageWindowList);
+	WindowList_Destroy(PluginConfig.hUserPrefsWindowList);
+
 	DestroyCursor(PluginConfig.hCurSplitNS);
 	DestroyCursor(PluginConfig.hCurHyperlinkHand);
 	DestroyCursor(PluginConfig.hCurSplitWE);
@@ -563,8 +566,8 @@ int LoadSendRecvMessageModule(void)
 	Win7Taskbar->updateMetrics();
 
 	ZeroMemory(&nen_options, sizeof(nen_options));
-	M.m_hMessageWindowList = (HANDLE)CallService(MS_UTILS_ALLOCWINDOWLIST, 0, 0);
-	PluginConfig.hUserPrefsWindowList = (HANDLE)CallService(MS_UTILS_ALLOCWINDOWLIST, 0, 0);
+	M.m_hMessageWindowList = WindowList_Create();
+	PluginConfig.hUserPrefsWindowList = WindowList_Create();
 	sendQueue = new SendQueue;
 	Skin = new CSkin;
 	sendLater = new CSendLater;
diff --git a/plugins/TabSRMM/src/typingnotify.cpp b/plugins/TabSRMM/src/typingnotify.cpp
index 8d0793e9ca..a5ee6aa901 100644
--- a/plugins/TabSRMM/src/typingnotify.cpp
+++ b/plugins/TabSRMM/src/typingnotify.cpp
@@ -520,7 +520,7 @@ int TN_OptionsInitialize(WPARAM wParam, LPARAM lParam)
 
 int TN_ModuleInit()
 {
-	hPopupsList = (HANDLE)CallService(MS_UTILS_ALLOCWINDOWLIST, 0, 0);
+	hPopupsList = WindowList_Create();
 
 	OnePopup = M.GetByte(Module, SET_ONEPOPUP, DEF_ONEPOPUP);
 	ShowMenu = M.GetByte(Module, SET_SHOWDISABLEMENU, DEF_SHOWDISABLEMENU);
@@ -567,6 +567,7 @@ int TN_ModuleInit()
 
 int TN_ModuleDeInit()
 {
+	WindowList_Destroy(hPopupsList);
 	db_set_b(0, Module, SET_DISABLED, (BYTE) (Disabled | StartDisabled | StopDisabled));
 	return 0;
 }
diff --git a/plugins/TabSRMM/src/utils.cpp b/plugins/TabSRMM/src/utils.cpp
index 0a5f314f70..bade430b5a 100644
--- a/plugins/TabSRMM/src/utils.cpp
+++ b/plugins/TabSRMM/src/utils.cpp
@@ -1221,7 +1221,7 @@ LRESULT CWarning::show(const int uId, DWORD dwFlags, const wchar_t* tszTxt)
 	wchar_t*	_s = 0;
 
 	if (0 == hWindowList)
-		hWindowList = reinterpret_cast<HANDLE>(::CallService(MS_UTILS_ALLOCWINDOWLIST, 0, 0));
+		hWindowList = WindowList_Create();
 
 	/*
 	* don't open new warnings when shutdown was initiated (modal ones will otherwise
-- 
cgit v1.2.3