From 85c0b6a96f366bdf0ca334ee7cb1877fb3f2288c Mon Sep 17 00:00:00 2001 From: George Hazan 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 --- protocols/MSN/src/msn_mail.cpp | 2 +- protocols/MSN/src/msn_proto.cpp | 6 +++--- protocols/MSN/src/msn_proto.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'protocols/MSN/src') diff --git a/protocols/MSN/src/msn_mail.cpp b/protocols/MSN/src/msn_mail.cpp index 3158934d8e..03ab085bc5 100644 --- a/protocols/MSN/src/msn_mail.cpp +++ b/protocols/MSN/src/msn_mail.cpp @@ -291,7 +291,7 @@ void CMsnProto::sttNotificationMessage(char* msgBody, bool isInitial) cle.cbSize = sizeof(cle); cle.hContact = hContact; - cle.hDbEvent = (HANDLE)1; + cle.hDbEvent = 1; cle.flags = CLEF_URGENT | CLEF_TCHAR; cle.hIcon = LoadSkinnedIcon(SKINICON_OTHER_SENDEMAIL); cle.ptszTooltip = tBuffer2; diff --git a/protocols/MSN/src/msn_proto.cpp b/protocols/MSN/src/msn_proto.cpp index 3e9adec7d7..b21c71a683 100644 --- a/protocols/MSN/src/msn_proto.cpp +++ b/protocols/MSN/src/msn_proto.cpp @@ -248,7 +248,7 @@ MCONTACT __cdecl CMsnProto::AddToList(int flags, PROTOSEARCHRESULT* psr) flags); } -MCONTACT __cdecl CMsnProto::AddToListByEvent(int flags, int, HANDLE hDbEvent) +MCONTACT __cdecl CMsnProto::AddToListByEvent(int flags, int, MEVENT hDbEvent) { DBEVENTINFO dbei = { sizeof(dbei) }; if ((dbei.cbBlob = db_event_getBlobSize(hDbEvent)) == (DWORD)(-1)) @@ -303,7 +303,7 @@ int __cdecl CMsnProto::AuthRequest(MCONTACT hContact, const TCHAR* szMessage) ///////////////////////////////////////////////////////////////////////////////////////// // MsnAuthAllow - called after successful authorization -int CMsnProto::Authorize(HANDLE hDbEvent) +int CMsnProto::Authorize(MEVENT hDbEvent) { if (!msnLoggedIn) return 1; @@ -341,7 +341,7 @@ int CMsnProto::Authorize(HANDLE hDbEvent) ///////////////////////////////////////////////////////////////////////////////////////// // MsnAuthDeny - called after unsuccessful authorization -int CMsnProto::AuthDeny(HANDLE hDbEvent, const TCHAR*) +int CMsnProto::AuthDeny(MEVENT hDbEvent, const TCHAR*) { if (!msnLoggedIn) return 1; diff --git a/protocols/MSN/src/msn_proto.h b/protocols/MSN/src/msn_proto.h index 42922a2ab4..0600dc1d16 100644 --- a/protocols/MSN/src/msn_proto.h +++ b/protocols/MSN/src/msn_proto.h @@ -33,10 +33,10 @@ struct CMsnProto : public PROTO //==================================================================================== virtual MCONTACT __cdecl AddToList(int flags, PROTOSEARCHRESULT* psr); - virtual MCONTACT __cdecl AddToListByEvent(int flags, int iContact, HANDLE hDbEvent); + virtual MCONTACT __cdecl AddToListByEvent(int flags, int iContact, MEVENT hDbEvent); - virtual int __cdecl Authorize(HANDLE hDbEvent); - virtual int __cdecl AuthDeny(HANDLE hDbEvent, const TCHAR* szReason); + virtual int __cdecl Authorize(MEVENT hDbEvent); + virtual int __cdecl AuthDeny(MEVENT hDbEvent, const TCHAR* szReason); virtual int __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT*); virtual int __cdecl AuthRequest(MCONTACT hContact, const TCHAR* szMessage); -- cgit v1.2.3