From 85c0b6a96f366bdf0ca334ee7cb1877fb3f2288c Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 16 Jan 2015 17:49:54 +0000
Subject: MEVENT - the strict type for events, they are not HANDLE anymore

git-svn-id: http://svn.miranda-ng.org/main/trunk@11866 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/modules/protocols/protoaccs.cpp |  6 +++---
 src/modules/protocols/protocols.cpp | 14 +++++++-------
 src/modules/protocols/protoint.cpp  |  6 +++---
 3 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/modules/protocols')

diff --git a/src/modules/protocols/protoaccs.cpp b/src/modules/protocols/protoaccs.cpp
index fcadce7773..393fb3aae4 100644
--- a/src/modules/protocols/protoaccs.cpp
+++ b/src/modules/protocols/protoaccs.cpp
@@ -298,17 +298,17 @@ static INT_PTR stub1(PROTO_INTERFACE* ppi, WPARAM wParam, LPARAM lParam)
 
 static INT_PTR stub2(PROTO_INTERFACE* ppi, WPARAM wParam, LPARAM lParam)
 {
-	return (INT_PTR)ppi->AddToListByEvent(HIWORD(wParam), LOWORD(wParam), (HANDLE)lParam);
+	return (INT_PTR)ppi->AddToListByEvent(HIWORD(wParam), LOWORD(wParam), (MEVENT)lParam);
 }
 
 static INT_PTR stub3(PROTO_INTERFACE* ppi, WPARAM wParam, LPARAM)
 {
-	return (INT_PTR)ppi->Authorize((HANDLE)wParam);
+	return (INT_PTR)ppi->Authorize((MEVENT)wParam);
 }
 
 static INT_PTR stub4(PROTO_INTERFACE* ppi, WPARAM wParam, LPARAM lParam)
 {
-	return (INT_PTR)ppi->AuthDeny((HANDLE)wParam, StrConvT((const char*)lParam));
+	return (INT_PTR)ppi->AuthDeny((MEVENT)wParam, StrConvT((const char*)lParam));
 }
 
 static INT_PTR stub11(PROTO_INTERFACE* ppi, WPARAM wParam, LPARAM lParam)
diff --git a/src/modules/protocols/protocols.cpp b/src/modules/protocols/protocols.cpp
index a981c96a96..ee89f89233 100644
--- a/src/modules/protocols/protocols.cpp
+++ b/src/modules/protocols/protocols.cpp
@@ -412,12 +412,12 @@ INT_PTR CallProtoServiceInt(MCONTACT hContact, const char *szModule, const char
 					return res;
 				}
 
-			case 2: return (INT_PTR)ppi->AddToListByEvent(LOWORD(wParam), HIWORD(wParam), (HANDLE)lParam);
-			case 3: return (INT_PTR)ppi->Authorize((HANDLE)wParam);
+			case 2: return (INT_PTR)ppi->AddToListByEvent(LOWORD(wParam), HIWORD(wParam), (MEVENT)lParam);
+			case 3: return (INT_PTR)ppi->Authorize((MEVENT)wParam);
 			case 4:
 				if (ppi->m_iVersion > 1)
-					return (INT_PTR)ppi->AuthDeny((HANDLE)wParam, StrConvT((char*)lParam));
-				return (INT_PTR)ppi->AuthDeny((HANDLE)wParam, (PROTOCHAR*)lParam);
+					return (INT_PTR)ppi->AuthDeny((MEVENT)wParam, StrConvT((char*)lParam));
+				return (INT_PTR)ppi->AuthDeny((MEVENT)wParam, (PROTOCHAR*)lParam);
 			case 5: return (INT_PTR)ppi->AuthRecv(hContact, (PROTORECVEVENT*)lParam);
 			case 6:
 				if (ppi->m_iVersion > 1)
@@ -529,8 +529,8 @@ INT_PTR CallProtoServiceInt(MCONTACT hContact, const char *szModule, const char
 				return (INT_PTR)ppi->AuthRequest(hContact, StrConvA((const TCHAR*)lParam));
 			case 107:
 				if (ppi->m_iVersion > 1)
-					return (INT_PTR)ppi->AuthDeny((HANDLE)wParam, (const TCHAR*)lParam);
-				return (INT_PTR)ppi->AuthDeny((HANDLE)wParam, StrConvA((const TCHAR*)lParam));
+					return (INT_PTR)ppi->AuthDeny((MEVENT)wParam, (const TCHAR*)lParam);
+				return (INT_PTR)ppi->AuthDeny((MEVENT)wParam, StrConvA((const TCHAR*)lParam));
 			case 108:
 				if (ppi->m_iVersion > 1)
 					return (INT_PTR)ppi->SearchBasic((const TCHAR*)lParam);
@@ -595,7 +595,7 @@ INT_PTR CallProtoServiceInt(MCONTACT hContact, const char *szModule, const char
 		case 106:
 			return (INT_PTR)pa->ppro->AuthRequest(ccs->hContact, (const TCHAR*)ccs->lParam);
 		case 107:
-			return (INT_PTR)pa->ppro->AuthDeny((HANDLE)wParam, (const TCHAR*)lParam);
+			return (INT_PTR)pa->ppro->AuthDeny((MEVENT)wParam, (const TCHAR*)lParam);
 		case 108:
 			return (INT_PTR)pa->ppro->SearchBasic((const TCHAR*)lParam);
 		case 109:
diff --git a/src/modules/protocols/protoint.cpp b/src/modules/protocols/protoint.cpp
index be43cbf488..9152877e44 100644
--- a/src/modules/protocols/protoint.cpp
+++ b/src/modules/protocols/protoint.cpp
@@ -51,17 +51,17 @@ struct DEFAULT_PROTO_INTERFACE : public PROTO_INTERFACE
 		return (MCONTACT)ProtoCallService(m_szModuleName, PS_ADDTOLIST, flags, (LPARAM)psr);
 	}
 
-	MCONTACT __cdecl AddToListByEvent(int flags, int iContact, HANDLE hDbEvent)
+	MCONTACT __cdecl AddToListByEvent(int flags, int iContact, MEVENT hDbEvent)
 	{
 		return (MCONTACT)ProtoCallService(m_szModuleName, PS_ADDTOLISTBYEVENT, MAKELONG(flags, iContact), (LPARAM)hDbEvent);
 	}
 
-	int __cdecl Authorize(HANDLE hDbEvent)
+	int __cdecl Authorize(MEVENT hDbEvent)
 	{
 		return (int)ProtoCallService(m_szModuleName, PS_AUTHALLOW, (WPARAM)hDbEvent, 0);
 	}
 
-	int __cdecl AuthDeny(HANDLE hDbEvent, const TCHAR* szReason)
+	int __cdecl AuthDeny(MEVENT hDbEvent, const TCHAR* szReason)
 	{
 		return (int)ProtoCallService(m_szModuleName, PS_AUTHDENY, (WPARAM)hDbEvent, (LPARAM)StrConvA(szReason));
 	}
-- 
cgit v1.2.3