From 0f8566dd046d34ea0ff6b747f7383ffb17f6761e Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 14 Jun 2015 21:33:38 +0000 Subject: WindowList_* functions are not services anymore; unneeded helpers removed git-svn-id: http://svn.miranda-ng.org/main/trunk@14168 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/NewAwaySysMod/src/Common.h | 2 +- plugins/NewAwaySysMod/src/ContactList.cpp | 2 +- plugins/NewAwaySysMod/src/MsgTree.cpp | 4 ++-- plugins/NewAwaySysMod/src/ReadAwayMsg.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/NewAwaySysMod/src') diff --git a/plugins/NewAwaySysMod/src/Common.h b/plugins/NewAwaySysMod/src/Common.h index c8a99eef6d..36b036c619 100644 --- a/plugins/NewAwaySysMod/src/Common.h +++ b/plugins/NewAwaySysMod/src/Common.h @@ -294,7 +294,7 @@ TCString VariablesEscape(TCString Str); INT_PTR CALLBACK SetAwayMsgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam); // ReadAwayMsg.cpp -extern HANDLE g_hReadWndList; +extern MWindowList g_hReadWndList; INT_PTR GetContactStatMsg(WPARAM wParam, LPARAM lParam); // AwayOpt.cpp diff --git a/plugins/NewAwaySysMod/src/ContactList.cpp b/plugins/NewAwaySysMod/src/ContactList.cpp index 4d998293d8..8d7784a42e 100644 --- a/plugins/NewAwaySysMod/src/ContactList.cpp +++ b/plugins/NewAwaySysMod/src/ContactList.cpp @@ -23,7 +23,7 @@ #define EXTRAICON_XSTEP (GetSystemMetrics(SM_CXSMICON) + 1) -static HANDLE hCLWindowList; +static MWindowList hCLWindowList; static int CLContactDeleted(WPARAM wParam, LPARAM lParam) { diff --git a/plugins/NewAwaySysMod/src/MsgTree.cpp b/plugins/NewAwaySysMod/src/MsgTree.cpp index 7cc7c12fc8..04163e7dd5 100644 --- a/plugins/NewAwaySysMod/src/MsgTree.cpp +++ b/plugins/NewAwaySysMod/src/MsgTree.cpp @@ -46,12 +46,12 @@ SettingsList[] = { IDS_MESSAGEDLG_DEF_OTL, ID_STATUS_OUTTOLUNCH, IDR_MSGTREEMENU_DEF_OTL }; -static HANDLE hMTWindowList; +static MWindowList hMTWindowList; static WNDPROC g_OrigEditProc; void LoadMsgTreeModule() { - hMTWindowList = (HANDLE)CallService(MS_UTILS_ALLOCWINDOWLIST, 0, 0); + hMTWindowList = WindowList_Create(); } static LRESULT CALLBACK EditSubclassProc(HWND hWnd, UINT Msg, WPARAM wParam, LPARAM lParam) diff --git a/plugins/NewAwaySysMod/src/ReadAwayMsg.cpp b/plugins/NewAwaySysMod/src/ReadAwayMsg.cpp index f394c9bdda..1123ae5fab 100644 --- a/plugins/NewAwaySysMod/src/ReadAwayMsg.cpp +++ b/plugins/NewAwaySysMod/src/ReadAwayMsg.cpp @@ -30,7 +30,7 @@ struct READAWAYMSGDATA #define RAMDLGSIZESETTING "ReadAwayMsgDlg" -HANDLE g_hReadWndList = NULL; +MWindowList g_hReadWndList = NULL; static int ReadAwayMsgDlgResize(HWND hwndDlg, LPARAM lParam, UTILRESIZECONTROL *urc) { -- cgit v1.2.3