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 --- src/modules/chat/chat.h | 2 +- src/modules/chat/clist.cpp | 2 +- src/modules/clist/clc.h | 2 +- src/modules/clist/clistevents.cpp | 8 ++++---- src/modules/protocols/protoaccs.cpp | 6 +++--- src/modules/protocols/protocols.cpp | 14 +++++++------- src/modules/protocols/protoint.cpp | 6 +++--- 7 files changed, 20 insertions(+), 20 deletions(-) (limited to 'src/modules') diff --git a/src/modules/chat/chat.h b/src/modules/chat/chat.h index 68ef108dfb..f393d629b3 100644 --- a/src/modules/chat/chat.h +++ b/src/modules/chat/chat.h @@ -55,7 +55,7 @@ char* Log_CreateRTF(LOGSTREAMDATA *streamData); char* Log_SetStyle(int style); // clist.c -BOOL AddEvent(MCONTACT hContact, HICON hIcon, HANDLE hEvent, int type, TCHAR* fmt, ...); +BOOL AddEvent(MCONTACT hContact, HICON hIcon, MEVENT hEvent, int type, TCHAR* fmt, ...); MCONTACT AddRoom(const char *pszModule, const TCHAR *pszRoom, const TCHAR *pszDisplayName, int iType); MCONTACT FindRoom(const char *pszModule, const TCHAR *pszRoom); BOOL SetAllOffline(BOOL bHide, const char *pszModule); diff --git a/src/modules/chat/clist.cpp b/src/modules/chat/clist.cpp index 2499b79f2d..f96179e84b 100644 --- a/src/modules/chat/clist.cpp +++ b/src/modules/chat/clist.cpp @@ -197,7 +197,7 @@ INT_PTR PrebuildContactMenuSvc(WPARAM wParam, LPARAM lParam) return PrebuildContactMenu(wParam, lParam); } -BOOL AddEvent(MCONTACT hContact, HICON hIcon, HANDLE hEvent, int type, TCHAR* fmt, ... ) +BOOL AddEvent(MCONTACT hContact, HICON hIcon, MEVENT hEvent, int type, TCHAR* fmt, ...) { TCHAR szBuf[4096]; diff --git a/src/modules/clist/clc.h b/src/modules/clist/clc.h index b3e9bf6b17..c0100a6b8c 100644 --- a/src/modules/clist/clc.h +++ b/src/modules/clist/clc.h @@ -146,7 +146,7 @@ void fnFreeEvent(struct CListEvent* p); int fnEventsProcessContactDoubleClick(MCONTACT hContact); int fnEventsProcessTrayDoubleClick(int); int fnGetImlIconIndex(HICON hIcon); -int fnRemoveEvent(MCONTACT hContact, HANDLE dbEvent); +int fnRemoveEvent(MCONTACT hContact, MEVENT dbEvent); /* clistmod.c */ int fnGetContactIcon(MCONTACT hContact); diff --git a/src/modules/clist/clistevents.cpp b/src/modules/clist/clistevents.cpp index 0a63fcb759..fae471f9b9 100644 --- a/src/modules/clist/clistevents.cpp +++ b/src/modules/clist/clistevents.cpp @@ -185,7 +185,7 @@ CListEvent* fnAddEvent(CLISTEVENT *cle) // Removes an event from the contact list's queue // Returns 0 if the event was successfully removed, or nonzero if the event was not found -int fnRemoveEvent(MCONTACT hContact, HANDLE dbEvent) +int fnRemoveEvent(MCONTACT hContact, MEVENT dbEvent) { // Find the event that should be removed int i; @@ -255,7 +255,7 @@ int fnEventsProcessContactDoubleClick(MCONTACT hContact) { for (int i = 0; i < cli.events.count; i++) { if (cli.events.items[i]->cle.hContact == hContact) { - HANDLE hDbEvent = cli.events.items[i]->cle.hDbEvent; + MEVENT hDbEvent = cli.events.items[i]->cle.hDbEvent; CallService(cli.events.items[i]->cle.pszService, (WPARAM)(HWND)NULL, (LPARAM)& cli.events.items[i]->cle); cli.pfnRemoveEvent(hContact, hDbEvent); return 0; @@ -330,7 +330,7 @@ int fnEventsProcessTrayDoubleClick(int index) lck.unlock(); MCONTACT hContact = cli.events.items[eventIndex]->cle.hContact; - HANDLE hDbEvent = cli.events.items[eventIndex]->cle.hDbEvent; + MEVENT hDbEvent = cli.events.items[eventIndex]->cle.hDbEvent; // ; may be better to show send msg? CallService(cli.events.items[eventIndex]->cle.pszService, 0, (LPARAM)& cli.events.items[eventIndex]->cle); cli.pfnRemoveEvent(hContact, hDbEvent); @@ -378,7 +378,7 @@ static int CListEventSettingsChanged(WPARAM hContact, LPARAM lParam) INT_PTR AddEventSyncStub(WPARAM wParam, LPARAM lParam) { return CallServiceSync(MS_CLIST_ADDEVENT"_SYNC", wParam, lParam); } INT_PTR AddEventStub(WPARAM, LPARAM lParam) { return cli.pfnAddEvent((CLISTEVENT*)lParam) == NULL; } -INT_PTR RemoveEventStub(WPARAM wParam, LPARAM lParam) { return cli.pfnRemoveEvent(wParam, (HANDLE)lParam); } +INT_PTR RemoveEventStub(WPARAM wParam, LPARAM lParam) { return cli.pfnRemoveEvent(wParam, lParam); } INT_PTR GetEventStub(WPARAM wParam, LPARAM lParam) { return (INT_PTR)cli.pfnGetEvent(wParam, (int)lParam); } int InitCListEvents(void) 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