From 0f8566dd046d34ea0ff6b747f7383ffb17f6761e Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
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
---
 src/core/stdaway/src/awaymsg.cpp      | 2 +-
 src/core/stdmsg/src/globals.h         | 2 +-
 src/core/stduihist/src/history.cpp    | 2 +-
 src/core/stdurl/commonheaders.h       | 1 +
 src/core/stdurl/url.cpp               | 2 +-
 src/core/stdurl/urldialogs.cpp        | 2 --
 src/core/stduserinfo/src/userinfo.cpp | 2 +-
 7 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/core')

diff --git a/src/core/stdaway/src/awaymsg.cpp b/src/core/stdaway/src/awaymsg.cpp
index 6d476adcff..80f775ff8f 100644
--- a/src/core/stdaway/src/awaymsg.cpp
+++ b/src/core/stdaway/src/awaymsg.cpp
@@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 int LoadAwayMessageSending(void);
 
 static HGENMENU hAwayMsgMenuItem;
-static HANDLE hWindowList;
+static MWindowList hWindowList;
 
 struct AwayMsgDlgData {
 	MCONTACT hContact;
diff --git a/src/core/stdmsg/src/globals.h b/src/core/stdmsg/src/globals.h
index 8d5ba0683b..ff0557fc79 100644
--- a/src/core/stdmsg/src/globals.h
+++ b/src/core/stdmsg/src/globals.h
@@ -49,7 +49,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 struct GlobalMessageData
 {
 	unsigned int flags;
-	HANDLE hMessageWindowList;
+	MWindowList hMessageWindowList;
 	DWORD openFlags;
 	DWORD msgTimeout;
 	DWORD nFlashMax;
diff --git a/src/core/stduihist/src/history.cpp b/src/core/stduihist/src/history.cpp
index 176a761ac4..8f38b2d02f 100644
--- a/src/core/stduihist/src/history.cpp
+++ b/src/core/stduihist/src/history.cpp
@@ -31,7 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 static INT_PTR CALLBACK DlgProcHistory(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
 static INT_PTR CALLBACK DlgProcHistoryFind(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
-static HANDLE hWindowList = 0;
+static MWindowList hWindowList = 0;
 static HGENMENU hContactMenu = 0;
 
 /////////////////////////////////////////////////////////////////////////////////////////
diff --git a/src/core/stdurl/commonheaders.h b/src/core/stdurl/commonheaders.h
index 90c3c440d5..6651d1f240 100644
--- a/src/core/stdurl/commonheaders.h
+++ b/src/core/stdurl/commonheaders.h
@@ -71,3 +71,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "../../mir_app/src/resource.h"
 
 extern HINSTANCE hInst;
+extern MWindowList hUrlWindowList;
diff --git a/src/core/stdurl/url.cpp b/src/core/stdurl/url.cpp
index f12c170831..5c1b3c50b3 100644
--- a/src/core/stdurl/url.cpp
+++ b/src/core/stdurl/url.cpp
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_url.h>
 #include "url.h"
 
-HANDLE hUrlWindowList = NULL;
+MWindowList hUrlWindowList = NULL;
 static HANDLE hEventContactSettingChange = NULL;
 static HANDLE hContactDeleted = NULL;
 static HGENMENU hSRUrlMenuItem = NULL;
diff --git a/src/core/stdurl/urldialogs.cpp b/src/core/stdurl/urldialogs.cpp
index d681aa2bde..f65bf202b9 100644
--- a/src/core/stdurl/urldialogs.cpp
+++ b/src/core/stdurl/urldialogs.cpp
@@ -26,8 +26,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 INT_PTR CALLBACK DlgProcUrlSend(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
 
-extern HANDLE hUrlWindowList;
-
 static void sttUpdateTitle(HWND hwndDlg, MCONTACT hContact)
 {
 	TCHAR newtitle[256], oldtitle[256];
diff --git a/src/core/stduserinfo/src/userinfo.cpp b/src/core/stduserinfo/src/userinfo.cpp
index 9fc5cbe86a..db234f29cb 100644
--- a/src/core/stduserinfo/src/userinfo.cpp
+++ b/src/core/stduserinfo/src/userinfo.cpp
@@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 int DetailsInit(WPARAM wParam, LPARAM lParam);
 static INT_PTR CALLBACK DlgProcDetails(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
-static HANDLE hWindowList = NULL;
+static MWindowList hWindowList = NULL;
 static HANDLE hDetailsInitEvent;
 
 struct DetailsPageInit
-- 
cgit v1.2.3