diff options
Diffstat (limited to 'include/delphi')
| -rw-r--r-- | include/delphi/m_addcontact.inc | 2 | ||||
| -rw-r--r-- | include/delphi/m_clistint.inc | 2 | ||||
| -rw-r--r-- | include/delphi/m_core.inc | 25 | ||||
| -rw-r--r-- | include/delphi/m_db_int.inc | 22 | ||||
| -rw-r--r-- | include/delphi/m_protoint.inc | 6 | 
5 files changed, 29 insertions, 28 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;
  | 
