summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/delphi/m_addcontact.inc2
-rw-r--r--include/delphi/m_clistint.inc2
-rw-r--r--include/delphi/m_core.inc25
-rw-r--r--include/delphi/m_db_int.inc22
-rw-r--r--include/delphi/m_protoint.inc6
-rw-r--r--include/m_addcontact.h2
-rw-r--r--include/m_chat_int.h4
-rw-r--r--include/m_clist.h2
-rw-r--r--include/m_clistint.h2
-rw-r--r--include/m_core.h33
-rw-r--r--include/m_db_int.h22
-rw-r--r--include/m_protoint.h6
12 files changed, 65 insertions, 63 deletions
diff --git a/include/delphi/m_addcontact.inc b/include/delphi/m_addcontact.inc
index 6b4201640f..f6fb8834d8 100644
--- a/include/delphi/m_addcontact.inc
+++ b/include/delphi/m_addcontact.inc
@@ -32,7 +32,7 @@ type
PADDCONTACTSTRUCT = ^TADDCONTACTSTRUCT;
TADDCONTACTSTRUCT = record
handleType: int;
- handle : THANDLE; // HDBEVENT, TMCONTACT, SearchResult
+ handle : HDBEVENT; // HDBEVENT, SearchResult
szProto : PAnsiChar; // used by search result only
psr : pointer; // @PROTOSEARCHRESULT
end;
diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc
index 0615f9d7d9..3a0b478a44 100644
--- a/include/delphi/m_clistint.inc
+++ b/include/delphi/m_clistint.inc
@@ -458,7 +458,7 @@ type
pfnAddEvent : function (_para1:PCLISTEVENT):PCListEvent; cdecl;
pfnGetEvent : function (hContact:TMCONTACT; idx:int):PCLISTEVENT; cdecl;
- pfnRemoveEvent : function (hContact:TMCONTACT; hDbEvent:THANDLE):int; cdecl;
+ pfnRemoveEvent : function (hContact:TMCONTACT; hDbEvent:HDBEVENT):int; cdecl;
pfnGetImlIconIndex : function (hIcon:HICON):int; cdecl;
(*************************************************************************************
diff --git a/include/delphi/m_core.inc b/include/delphi/m_core.inc
index 20558e72ca..53e9886a49 100644
--- a/include/delphi/m_core.inc
+++ b/include/delphi/m_core.inc
@@ -55,11 +55,12 @@ const
type
PMCONTACT = ^TMCONTACT;
TMCONTACT = dword;
+
const
INVALID_CONTACT_ID = TMCONTACT(-1);
type
- HDBEVENT = THANDLE;
+ HDBEVENT = dword;
PDBVARIANT = ^TDBVARIANT;
TDBVARIANT = record
_type: byte;
@@ -125,7 +126,7 @@ modules are free to define their own, beginning at 2000
DBEVENTINFO.timestamp is in GMT, as returned by time(). There are services
db/time/x below with useful stuff for dealing with it.
}
-function db_event_add(hContact:TMCONTACT; dbei:PDBEVENTINFO):THANDLE; stdcall;
+function db_event_add(hContact:TMCONTACT; dbei:PDBEVENTINFO):HDBEVENT; stdcall;
external CoreDLL name 'db_event_add';
{
@@ -143,7 +144,7 @@ hDbEvent should have been returned by db_event_add/first/last/next/prev()
Returns 0 on success, or nonzero if hDbEvent was invalid
Triggers a db/event/deleted event just *before* the event is deleted
}
-function db_event_delete(hContact:TMCONTACT; hDbEvent:THANDLE):int; stdcall;
+function db_event_delete(hContact:TMCONTACT; hDbEvent:HDBEVENT):int; stdcall;
external CoreDLL name 'db_event_delete';
{
@@ -151,7 +152,7 @@ Retrieves a handle to the first event in the chain for hContact
Returns the handle, or NULL if hContact is invalid or has no events
Events in a chain are sorted chronologically automatically
}
-function db_event_first(hContact:TMCONTACT):THANDLE; stdcall;
+function db_event_first(hContact:TMCONTACT):HDBEVENT; stdcall;
external CoreDLL name 'db_event_first';
{
@@ -165,7 +166,7 @@ should be checked individually with db_event_next() and db_event_get()
This service is designed for startup, reloading all the events that remained
unread from last time
}
-function db_event_firstUnread(hContact:TMCONTACT):THANDLE; stdcall;
+function db_event_firstUnread(hContact:TMCONTACT):HDBEVENT; stdcall;
external CoreDLL name 'db_event_firstUnread';
{
@@ -182,7 +183,7 @@ and then dbe.cbBlob is set to the required size of data to go in dbe.pBlob
On return, dbe.szModule is a pointer to the database module's own internal list
of modules. Look but don't touch.
}
-function db_event_get(hDbEvent:THANDLE; dbei:PDBEVENTINFO):int; stdcall;
+function db_event_get(hDbEvent:HDBEVENT; dbei:PDBEVENTINFO):int; stdcall;
external CoreDLL name 'db_event_get';
{
@@ -190,7 +191,7 @@ Retrieves the space in bytes required to store the blob in hDbEvent
hDbEvent should have been returned by db_event_add/first/last/next/prev()
Returns the space required in bytes, or -1 if hDbEvent is invalid
}
-function db_event_getBlobSize(hDbEvent:THANDLE):int; stdcall;
+function db_event_getBlobSize(hDbEvent:HDBEVENT):int; stdcall;
external CoreDLL name 'db_event_getBlobSize';
{
@@ -202,7 +203,7 @@ success
This service is exceptionally slow. Use only when you have no other choice at
all.
}
-function db_event_getContact(hDbEvent:THANDLE):TMCONTACT; stdcall;
+function db_event_getContact(hDbEvent:HDBEVENT):TMCONTACT; stdcall;
external CoreDLL name 'db_event_getContact';
{
@@ -210,7 +211,7 @@ Retrieves a handle to the last event in the chain for hContact
Returns the handle, or NULL if hContact is invalid or has no events
Events in a chain are sorted chronologically automatically
}
-function db_event_last(hContact:TMCONTACT):THANDLE; stdcall;
+function db_event_last(hContact:TMCONTACT):HDBEVENT; stdcall;
external CoreDLL name 'db_event_last';
{
@@ -221,7 +222,7 @@ is invalid.
This is the one database write operation that does not trigger an event.
Modules should not save flags states for any length of time.
}
-function db_event_markRead(hContact:TMCONTACT; hDbEvent:THANDLE):int; stdcall;
+function db_event_markRead(hContact:TMCONTACT; hDbEvent:HDBEVENT):int; stdcall;
external CoreDLL name 'db_event_markRead';
{
@@ -229,7 +230,7 @@ Retrieves a handle to the next event in a chain after hDbEvent
Returns the handle, or NULL if hDbEvent is invalid or is the last event
Events in a chain are sorted chronologically automatically
}
-function db_event_next(hContact:TMCONTACT; hDbEvent:THANDLE):THANDLE; stdcall;
+function db_event_next(hContact:TMCONTACT; hDbEvent:HDBEVENT):HDBEVENT; stdcall;
external CoreDLL name 'db_event_next';
{
@@ -237,7 +238,7 @@ Retrieves a handle to the previous event in a chain before hDbEvent
Returns the handle, or NULL if hDbEvent is invalid or is the first event
Events in a chain are sorted chronologically automatically
}
-function db_event_prev(hContact:TMCONTACT; hDbEvent:THANDLE):THANDLE; stdcall;
+function db_event_prev(hContact:TMCONTACT; hDbEvent:HDBEVENT):HDBEVENT; stdcall;
external CoreDLL name 'db_event_prev';
function db_free(dbv:PDBVARIANT):int_ptr; stdcall;
diff --git a/include/delphi/m_db_int.inc b/include/delphi/m_db_int.inc
index ee6334e52f..61d8d66fc5 100644
--- a/include/delphi/m_db_int.inc
+++ b/include/delphi/m_db_int.inc
@@ -83,17 +83,17 @@ type
IsDbContact:function(contactID:TMCONTACT):bool; stdcall;
GetEventCount:function(contactID:TMCONTACT):long; stdcall;
- AddEvent:function(contactID:TMCONTACT; dbe:PDBEVENTINFO):THANDLE; stdcall;
- DeleteEvent:function(contactID:TMCONTACT; hDbEvent:THANDLE):bool; stdcall;
- GetBlobSize:function(hDbEvent:THANDLE):long; stdcall;
- GetEvent:function(hDbEvent:THANDLE; dbe:PDBEVENTINFO):bool; stdcall;
- MarkEventRead:function(contactID:TMCONTACT; hDbEvent:THANDLE):bool; stdcall;
- GetEventContact:function(hDbEvent:THANDLE):TMCONTACT; stdcall;
- FindFirstEvent:function(contactID:TMCONTACT):THANDLE; stdcall;
- FindFirstUnreadEvent:function(contactID:TMCONTACT):THANDLE; stdcall;
- FindLastEvent:function(contactID:TMCONTACT):THANDLE; stdcall;
- FindNextEvent:function(contactID:TMCONTACT;hDbEvent:THANDLE):THANDLE; stdcall;
- FindPrevEvent:function(contactID:TMCONTACT;hDbEvent:THANDLE):THANDLE; stdcall;
+ AddEvent:function(contactID:TMCONTACT; dbe:PDBEVENTINFO):HDBEVENT; stdcall;
+ DeleteEvent:function(contactID:TMCONTACT; hDbEvent:HDBEVENT):bool; stdcall;
+ GetBlobSize:function(hDbEvent:HDBEVENT):long; stdcall;
+ GetEvent:function(hDbEvent:HDBEVENT; dbe:PDBEVENTINFO):bool; stdcall;
+ MarkEventRead:function(contactID:TMCONTACT; hDbEvent:HDBEVENT):bool; stdcall;
+ GetEventContact:function(hDbEvent:HDBEVENT):TMCONTACT; stdcall;
+ FindFirstEvent:function(contactID:TMCONTACT):HDBEVENT; stdcall;
+ FindFirstUnreadEvent:function(contactID:TMCONTACT):HDBEVENT; stdcall;
+ FindLastEvent:function(contactID:TMCONTACT):HDBEVENT; stdcall;
+ FindNextEvent:function(contactID:TMCONTACT;hDbEvent:HDBEVENT):HDBEVENT; stdcall;
+ FindPrevEvent:function(contactID:TMCONTACT;hDbEvent:HDBEVENT):HDBEVENT; stdcall;
EnumModuleNames:function(pFunc:TDBMODULEENUMPROC; pParam:pointer):bool; stdcall;
diff --git a/include/delphi/m_protoint.inc b/include/delphi/m_protoint.inc
index be6b9e64cd..2d1f49d22a 100644
--- a/include/delphi/m_protoint.inc
+++ b/include/delphi/m_protoint.inc
@@ -56,10 +56,10 @@ type
// Virtual functions
AddToList :function(intf:PPROTO_INTERFACE;flags:int; var psr:TPROTOSEARCHRESULT):TMCONTACT; cdecl;
- AddToListByEvent:function(intf:PPROTO_INTERFACE;flags:int; iContact:int; hDbEvent:THANDLE):TMCONTACT; cdecl;
+ AddToListByEvent:function(intf:PPROTO_INTERFACE;flags:int; iContact:int; hDbEvent:HDBEVENT):TMCONTACT; cdecl;
- Authorize :function(intf:PPROTO_INTERFACE;hDbEvent:THANDLE):int; cdecl;
- AuthDeny :function(intf:PPROTO_INTERFACE;hDbEvent:THANDLE;const szReason:TChar):int; cdecl;
+ Authorize :function(intf:PPROTO_INTERFACE;hDbEvent:HDBEVENT):int; cdecl;
+ AuthDeny :function(intf:PPROTO_INTERFACE;hDbEvent:HDBEVENT;const szReason:TChar):int; cdecl;
AuthRecv :function(intf:PPROTO_INTERFACE;hContact:TMCONTACT;var ptr:TPROTORECVEVENT):int; cdecl;
AuthRequest:function(intf:PPROTO_INTERFACE;hContact:TMCONTACT;szMessage:TChar):int; cdecl;
diff --git a/include/m_addcontact.h b/include/m_addcontact.h
index 8f42c0f31e..a36bffa2c7 100644
--- a/include/m_addcontact.h
+++ b/include/m_addcontact.h
@@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
typedef struct{
int handleType; // one of the HANDLE_ constants
union {
- HANDLE hDbEvent; // hDbEvent if acs.handleType == HANDLE_EVENT
+ MEVENT hDbEvent; // hDbEvent if acs.handleType == HANDLE_EVENT
MCONTACT hContact; // hContact if acs.handleType == HANDLE_CONTACT
// ignored if acs.handleType == HANDLE_SEARCHRESULT
};
diff --git a/include/m_chat_int.h b/include/m_chat_int.h
index 0725158a72..a98d682713 100644
--- a/include/m_chat_int.h
+++ b/include/m_chat_int.h
@@ -32,7 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define CHAT_MODULE "Chat"
#define CHATFONT_MODULE "ChatFonts"
-#define GC_FAKE_EVENT HANDLE(0xBABABEDA)
+#define GC_FAKE_EVENT MEVENT(0xBABABEDA)
#define GC_UPDATETITLE (WM_USER+100)
#define GC_SPLITTERMOVED (WM_USER+101)
@@ -369,7 +369,7 @@ struct CHAT_MANAGER
MCONTACT (*AddRoom)(const char *pszModule, const TCHAR *pszRoom, const TCHAR *pszDisplayName, int iType);
BOOL (*SetOffline)(MCONTACT hContact, BOOL bHide);
BOOL (*SetAllOffline)(BOOL bHide, const char *pszModule);
- 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 (*FindRoom)(const char *pszModule, const TCHAR *pszRoom);
char* (*Log_CreateRTF)(LOGSTREAMDATA *streamData);
diff --git a/include/m_clist.h b/include/m_clist.h
index 3c22836d1f..b4d2ae16e5 100644
--- a/include/m_clist.h
+++ b/include/m_clist.h
@@ -290,7 +290,7 @@ typedef struct {
DWORD flags; //...of course
union
{
- HANDLE hDbEvent; //caller defined but should be unique for hContact
+ MEVENT hDbEvent; //caller defined but should be unique for hContact
char * lpszProtocol;
};
LPARAM lParam; //caller defined
diff --git a/include/m_clistint.h b/include/m_clistint.h
index 1d3dde5e26..477179390d 100644
--- a/include/m_clistint.h
+++ b/include/m_clistint.h
@@ -404,7 +404,7 @@ typedef struct
struct CListEvent* (*pfnAddEvent)(CLISTEVENT*);
CLISTEVENT* (*pfnGetEvent)(MCONTACT hContact, int idx);
- int (*pfnRemoveEvent)(MCONTACT hContact, HANDLE hDbEvent);
+ int (*pfnRemoveEvent)(MCONTACT hContact, MEVENT hDbEvent);
int (*pfnGetImlIconIndex)(HICON hIcon);
/*************************************************************************************
diff --git a/include/m_core.h b/include/m_core.h
index 9497e11813..9f5bf4cbdb 100644
--- a/include/m_core.h
+++ b/include/m_core.h
@@ -25,6 +25,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#ifndef M_CORE_H__
#define M_CORE_H__ 1
+#include <stdint.h>
+
#ifndef M_TYPES_H__
#include <m_types.h>
#endif
@@ -54,9 +56,11 @@ MIR_CORE_DLL(LPCTSTR) CmdLine_GetOption(LPCTSTR ptszParameter);
///////////////////////////////////////////////////////////////////////////////
// database functions
-typedef UINT32 MCONTACT;
+typedef uint32_t MCONTACT;
#define INVALID_CONTACT_ID (MCONTACT(-1))
+typedef uint32_t MEVENT;
+
// DBVARIANT: used by db/contact/getsetting and db/contact/writesetting
#define DBVT_DELETED 0 // this setting just got deleted, no other values are valid
#define DBVT_BYTE 1 // bVal and cVal are valid
@@ -181,7 +185,7 @@ db/time/x below with useful stuff for dealing with it.
#define EVENTTYPE_AUTHREQUEST 1001 //specific codes, hence the module-
#define EVENTTYPE_FILE 1002 //specific limit has been raised to 2000
-MIR_CORE_DLL(HANDLE) db_event_add(MCONTACT hContact, DBEVENTINFO *dbei);
+MIR_CORE_DLL(MEVENT) db_event_add(MCONTACT hContact, DBEVENTINFO *dbei);
/*
Gets the number of events in the chain belonging to a contact in the database.
@@ -198,7 +202,7 @@ Returns 0 on success, or nonzero if hDbEvent was invalid
Triggers a db/event/deleted event just *before* the event is deleted
*/
-MIR_CORE_DLL(int) db_event_delete(MCONTACT hContact, HANDLE hDbEvent);
+MIR_CORE_DLL(int) db_event_delete(MCONTACT hContact, MEVENT hDbEvent);
/*
Retrieves a handle to the first event in the chain for hContact
@@ -206,7 +210,7 @@ Returns the handle, or NULL if hContact is invalid or has no events
Events in a chain are sorted chronologically automatically
*/
-MIR_CORE_DLL(HANDLE) db_event_first(MCONTACT hContact);
+MIR_CORE_DLL(MEVENT) db_event_first(MCONTACT hContact);
/*
Retrieves a handle to the first unread event in the chain for hContact
@@ -220,7 +224,7 @@ This service is designed for startup, reloading all the events that remained
unread from last time
*/
-MIR_CORE_DLL(HANDLE) db_event_firstUnread(MCONTACT hContact);
+MIR_CORE_DLL(MEVENT) db_event_firstUnread(MCONTACT hContact);
/*
Retrieves all the information stored in hDbEvent
@@ -237,7 +241,7 @@ On return, dbe.szModule is a pointer to the database module's own internal list
of modules. Look but don't touch.
*/
-MIR_CORE_DLL(int) db_event_get(HANDLE hDbEvent, DBEVENTINFO *dbei);
+MIR_CORE_DLL(int) db_event_get(MEVENT hDbEvent, DBEVENTINFO *dbei);
/*
Retrieves the space in bytes required to store the blob in hDbEvent
@@ -245,19 +249,16 @@ hDbEvent should have been returned by db_event_add/first/last/next/prev()
Returns the space required in bytes, or -1 if hDbEvent is invalid
*/
-MIR_CORE_DLL(int) db_event_getBlobSize(HANDLE hDbEvent);
+MIR_CORE_DLL(int) db_event_getBlobSize(MEVENT hDbEvent);
/*
Retrieves a handle to the contact that owns hDbEvent.
hDbEvent should have been returned by db_event_add/first/last/next/prev()
NULL is a valid return value, meaning, as usual, the user.
-Returns (HANDLE)(-1) if hDbEvent is invalid, or the handle to the contact on
-success
-This service is exceptionally slow. Use only when you have no other choice at
-all.
+Returns INVALID_CONTACT_ID if hDbEvent is invalid, or the handle to the contact on success
*/
-MIR_CORE_DLL(MCONTACT) db_event_getContact(HANDLE hDbEvent);
+MIR_CORE_DLL(MCONTACT) db_event_getContact(MEVENT hDbEvent);
/*
Retrieves a handle to the last event in the chain for hContact
@@ -265,7 +266,7 @@ Returns the handle, or NULL if hContact is invalid or has no events
Events in a chain are sorted chronologically automatically
*/
-MIR_CORE_DLL(HANDLE) db_event_last(MCONTACT hContact);
+MIR_CORE_DLL(MEVENT) db_event_last(MCONTACT hContact);
/*
Changes the flags for an event to mark it as read.
@@ -276,7 +277,7 @@ This is the one database write operation that does not trigger an event.
Modules should not save flags states for any length of time.
*/
-MIR_CORE_DLL(int) db_event_markRead(MCONTACT hContact, HANDLE hDbEvent);
+MIR_CORE_DLL(int) db_event_markRead(MCONTACT hContact, MEVENT hDbEvent);
/*
Retrieves a handle to the next event in a chain after hDbEvent
@@ -284,7 +285,7 @@ Returns the handle, or NULL if hDbEvent is invalid or is the last event
Events in a chain are sorted chronologically automatically
*/
-MIR_CORE_DLL(HANDLE) db_event_next(MCONTACT hContact, HANDLE hDbEvent);
+MIR_CORE_DLL(MEVENT) db_event_next(MCONTACT hContact, MEVENT hDbEvent);
/*
Retrieves a handle to the previous event in a chain before hDbEvent
@@ -292,7 +293,7 @@ Returns the handle, or NULL if hDbEvent is invalid or is the first event
Events in a chain are sorted chronologically automatically
*/
-MIR_CORE_DLL(HANDLE) db_event_prev(MCONTACT hContact, HANDLE hDbEvent);
+MIR_CORE_DLL(MEVENT) db_event_prev(MCONTACT hContact, MEVENT hDbEvent);
/******************************************************************************
* DATABASE SETTINGS
diff --git a/include/m_db_int.h b/include/m_db_int.h
index a26e35e9d6..326103199d 100644
--- a/include/m_db_int.h
+++ b/include/m_db_int.h
@@ -90,17 +90,17 @@ interface MIDatabase
STDMETHOD_(BOOL, IsDbContact)(MCONTACT contactID) PURE;
STDMETHOD_(LONG, GetEventCount)(MCONTACT contactID) PURE;
- STDMETHOD_(HANDLE, AddEvent)(MCONTACT contactID, DBEVENTINFO *dbe) PURE;
- STDMETHOD_(BOOL, DeleteEvent)(MCONTACT contactID, HANDLE hDbEvent) PURE;
- STDMETHOD_(LONG, GetBlobSize)(HANDLE hDbEvent) PURE;
- STDMETHOD_(BOOL, GetEvent)(HANDLE hDbEvent, DBEVENTINFO *dbe) PURE;
- STDMETHOD_(BOOL, MarkEventRead)(MCONTACT contactID, HANDLE hDbEvent) PURE;
- STDMETHOD_(MCONTACT, GetEventContact)(HANDLE hDbEvent) PURE;
- STDMETHOD_(HANDLE, FindFirstEvent)(MCONTACT contactID) PURE;
- STDMETHOD_(HANDLE, FindFirstUnreadEvent)(MCONTACT contactID) PURE;
- STDMETHOD_(HANDLE, FindLastEvent)(MCONTACT contactID) PURE;
- STDMETHOD_(HANDLE, FindNextEvent)(MCONTACT contactID, HANDLE hDbEvent) PURE;
- STDMETHOD_(HANDLE, FindPrevEvent)(MCONTACT contactID, HANDLE hDbEvent) PURE;
+ STDMETHOD_(MEVENT, AddEvent)(MCONTACT contactID, DBEVENTINFO *dbe) PURE;
+ STDMETHOD_(BOOL, DeleteEvent)(MCONTACT contactID, MEVENT hDbEvent) PURE;
+ STDMETHOD_(LONG, GetBlobSize)(MEVENT hDbEvent) PURE;
+ STDMETHOD_(BOOL, GetEvent)(MEVENT hDbEvent, DBEVENTINFO *dbe) PURE;
+ STDMETHOD_(BOOL, MarkEventRead)(MCONTACT contactID, MEVENT hDbEvent) PURE;
+ STDMETHOD_(MCONTACT, GetEventContact)(MEVENT hDbEvent) PURE;
+ STDMETHOD_(MEVENT, FindFirstEvent)(MCONTACT contactID) PURE;
+ STDMETHOD_(MEVENT, FindFirstUnreadEvent)(MCONTACT contactID) PURE;
+ STDMETHOD_(MEVENT, FindLastEvent)(MCONTACT contactID) PURE;
+ STDMETHOD_(MEVENT, FindNextEvent)(MCONTACT contactID, MEVENT hDbEvent) PURE;
+ STDMETHOD_(MEVENT, FindPrevEvent)(MCONTACT contactID, MEVENT hDbEvent) PURE;
STDMETHOD_(BOOL, EnumModuleNames)(DBMODULEENUMPROC pFunc, void *pParam) PURE;
diff --git a/include/m_protoint.h b/include/m_protoint.h
index c19b8b7ae0..9b062a7ce9 100644
--- a/include/m_protoint.h
+++ b/include/m_protoint.h
@@ -151,10 +151,10 @@ struct PROTO_INTERFACE : public MZeroedObject
// Virtual functions
virtual MCONTACT __cdecl AddToList(int flags, PROTOSEARCHRESULT* psr) = 0;
- virtual MCONTACT __cdecl AddToListByEvent(int flags, int iContact, HANDLE hDbEvent) = 0;
+ virtual MCONTACT __cdecl AddToListByEvent(int flags, int iContact, MEVENT hDbEvent) = 0;
- virtual int __cdecl Authorize(HANDLE hDbEvent) = 0;
- virtual int __cdecl AuthDeny(HANDLE hDbEvent, const PROTOCHAR* szReason) = 0;
+ virtual int __cdecl Authorize(MEVENT hDbEvent) = 0;
+ virtual int __cdecl AuthDeny(MEVENT hDbEvent, const PROTOCHAR* szReason) = 0;
virtual int __cdecl AuthRecv(MCONTACT hContact, PROTORECVEVENT*) = 0;
virtual int __cdecl AuthRequest(MCONTACT hContact, const PROTOCHAR* szMessage) = 0;