From 0bc017159442fed3020f64da88adbb3d9ab2a03b Mon Sep 17 00:00:00 2001 From: Alexey Kulakov Date: Wed, 28 Jan 2015 06:34:50 +0000 Subject: Pascal: miranda API updates git-svn-id: http://svn.miranda-ng.org/main/trunk@11937 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- include/delphi/interfaces.inc | 1 + include/delphi/m_addcontact.inc | 2 +- include/delphi/m_clist.inc | 4 ++-- include/delphi/m_clistint.inc | 2 +- include/delphi/m_core.inc | 29 ++++++++++++++--------------- include/delphi/m_database.inc | 10 +++++----- include/delphi/m_db_int.inc | 24 ++++++++++++------------ include/delphi/m_protoint.inc | 6 +++--- include/delphi/m_protosvc.inc | 10 +++++----- 9 files changed, 44 insertions(+), 44 deletions(-) (limited to 'include/delphi') diff --git a/include/delphi/interfaces.inc b/include/delphi/interfaces.inc index c3cae74ad1..c0e660bf82 100644 --- a/include/delphi/interfaces.inc +++ b/include/delphi/interfaces.inc @@ -24,6 +24,7 @@ const MIID_AUTOAWAY :MUUID='{9C87F7DC-3BD7-4983-B7FB-B848FDBC91F0}'; const MIID_USERONLINE :MUUID='{130829E0-2463-4FF8-BBC8-CE73C0188442}'; const MIID_IDLE :MUUID='{296F9F3B-5B6F-40E5-8FB0-A6496C18BF0A}'; const MIID_CRYPTO :MUUID='{415CA6E1-895F-40E6-87BD-9B396016D0E5}'; +const MIID_SSL :MUUID='{3BBBBD20-20E6-479B-BD4B-E84DE2627120}'; // Common plugin interfaces (core plugins) const MIID_DATABASE :MUUID='{AE77FD33-E484-4DC7-8CBC-099FEDCCCFDD}'; diff --git a/include/delphi/m_addcontact.inc b/include/delphi/m_addcontact.inc index f6fb8834d8..dd4bc0a3dd 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 : HDBEVENT; // HDBEVENT, SearchResult + handle : TMEVENT; // TMEVENT, TMCONTACT, SearchResult szProto : PAnsiChar; // used by search result only psr : pointer; // @PROTOSEARCHRESULT end; diff --git a/include/delphi/m_clist.inc b/include/delphi/m_clist.inc index bf14ee784c..e3940e143d 100644 --- a/include/delphi/m_clist.inc +++ b/include/delphi/m_clist.inc @@ -230,7 +230,7 @@ type hContact : TMCONTACT; // handle to the contact to put the icon by hIcon : HICON; // icon to flash! flags : dword; - hDBEvent : THANDLE; // caller defined, but should be unique for hContact + hDBEvent : TMEVENT; // caller defined, but should be unique for hContact // or pszProtocol:PAnsiChar lParam : LPARAM; pszService: PAnsiChar; // name of service to call on activation @@ -268,7 +268,7 @@ const { wParam : TMCONTACT - lParam : HDBEVENT + lParam : TMEVENT Affect : Remove an event from the contact list queue Returns: 0 on success, [non zero] on failure } diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc index 3a0b478a44..1d21e9d942 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:HDBEVENT):int; cdecl; + pfnRemoveEvent : function (hContact:TMCONTACT; hDbEvent:TMEVENT):int; cdecl; pfnGetImlIconIndex : function (hIcon:HICON):int; cdecl; (************************************************************************************* diff --git a/include/delphi/m_core.inc b/include/delphi/m_core.inc index 53e9886a49..983cbb903d 100644 --- a/include/delphi/m_core.inc +++ b/include/delphi/m_core.inc @@ -55,12 +55,11 @@ const type PMCONTACT = ^TMCONTACT; TMCONTACT = dword; - const INVALID_CONTACT_ID = TMCONTACT(-1); type - HDBEVENT = dword; + TMEVENT = dword; PDBVARIANT = ^TDBVARIANT; TDBVARIANT = record _type: byte; @@ -126,7 +125,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):HDBEVENT; stdcall; +function db_event_add(hContact:TMCONTACT; dbei:PDBEVENTINFO):TMEVENT; stdcall; external CoreDLL name 'db_event_add'; { @@ -144,7 +143,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:HDBEVENT):int; stdcall; +function db_event_delete(hContact:TMCONTACT; hDbEvent:TMEVENT):int; stdcall; external CoreDLL name 'db_event_delete'; { @@ -152,7 +151,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):HDBEVENT; stdcall; +function db_event_first(hContact:TMCONTACT):TMEVENT; stdcall; external CoreDLL name 'db_event_first'; { @@ -166,7 +165,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):HDBEVENT; stdcall; +function db_event_firstUnread(hContact:TMCONTACT):TMEVENT; stdcall; external CoreDLL name 'db_event_firstUnread'; { @@ -183,7 +182,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:HDBEVENT; dbei:PDBEVENTINFO):int; stdcall; +function db_event_get(hDbEvent:TMEVENT; dbei:PDBEVENTINFO):int; stdcall; external CoreDLL name 'db_event_get'; { @@ -191,7 +190,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:HDBEVENT):int; stdcall; +function db_event_getBlobSize(hDbEvent:TMEVENT):int; stdcall; external CoreDLL name 'db_event_getBlobSize'; { @@ -203,7 +202,7 @@ success This service is exceptionally slow. Use only when you have no other choice at all. } -function db_event_getContact(hDbEvent:HDBEVENT):TMCONTACT; stdcall; +function db_event_getContact(hDbEvent:TMEVENT):TMCONTACT; stdcall; external CoreDLL name 'db_event_getContact'; { @@ -211,7 +210,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):HDBEVENT; stdcall; +function db_event_last(hContact:TMCONTACT):TMEVENT; stdcall; external CoreDLL name 'db_event_last'; { @@ -222,7 +221,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:HDBEVENT):int; stdcall; +function db_event_markRead(hContact:TMCONTACT; hDbEvent:TMEVENT):int; stdcall; external CoreDLL name 'db_event_markRead'; { @@ -230,7 +229,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:HDBEVENT):HDBEVENT; stdcall; +function db_event_next(hContact:TMCONTACT; hDbEvent:TMEVENT):THANDLE; stdcall; external CoreDLL name 'db_event_next'; { @@ -238,7 +237,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:HDBEVENT):HDBEVENT; stdcall; +function db_event_prev(hContact:TMCONTACT; hDbEvent:TMEVENT):THANDLE; stdcall; external CoreDLL name 'db_event_prev'; function db_free(dbv:PDBVARIANT):int_ptr; stdcall; @@ -595,8 +594,8 @@ function mir_writeLogW(hLogger:THANDLE; format:PWideChar):int; cdecl; type pmir_md5_state_t = ^mir_md5_state_t; mir_md5_state_t = record - count:array [0.. 1] of cardinal; // message length in bits, lsw first - abcd :array [0.. 3] of cardinal; // digest buffer + count:array [0.. 1] of longword; // message length in bits, lsw first + abcd :array [0.. 3] of longword; // digest buffer buf :array [0..63] of byte; // accumulate block end; diff --git a/include/delphi/m_database.inc b/include/delphi/m_database.inc index 20d78fe556..0ca504eec1 100644 --- a/include/delphi/m_database.inc +++ b/include/delphi/m_database.inc @@ -326,13 +326,13 @@ const { wParam : TMCONTACT - lParam : HDBEVENT + lParam : TMEVENT Affect : Called when a new event has been added to the event chain for a contact, TMCONTACT contains the contact who added the event, - HDBEVENT a handle to what was added. + TMEVENT a handle to what was added. see notes notes : since events are sorted chronologically, you can not guarantee - that HDBEVENT is in any particular position in the chain. + that TMEVENT is in any particular position in the chain. } ME_DB_EVENT_ADDED:PAnsiChar = 'DB/Event/Added'; @@ -355,14 +355,14 @@ const { wParam : TMCONTACT - lParam : HDBEVENT + lParam : TMEVENT Affect : Called when an event is marked read } ME_DB_EVENT_MARKED_READ:PAnsiChar = 'DB/Event/Marked/Read'; { wParam : TMCONTACT - lParam : HDBEVENT + lParam : TMEVENT Affect : Called when an event is about to be deleted from the event chain for a contact, see notes notes : Returning non zero from your hook will NOT stop the deletion, diff --git a/include/delphi/m_db_int.inc b/include/delphi/m_db_int.inc index 753c4ea5ec..29ffc6844e 100644 --- a/include/delphi/m_db_int.inc +++ b/include/delphi/m_db_int.inc @@ -83,17 +83,17 @@ type GetContactSize:function():long; stdcall; GetEventCount:function(contactID:TMCONTACT):long; 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; + AddEvent:function(contactID:TMCONTACT; dbe:PDBEVENTINFO):TMEVENT; stdcall; + DeleteEvent:function(contactID:TMCONTACT; hDbEvent:TMEVENT):bool; stdcall; + GetBlobSize:function(hDbEvent:TMEVENT):long; stdcall; + GetEvent:function(hDbEvent:TMEVENT; dbe:PDBEVENTINFO):bool; stdcall; + MarkEventRead:function(contactID:TMCONTACT; hDbEvent:TMEVENT):bool; stdcall; + GetEventContact:function(hDbEvent:TMEVENT):TMCONTACT; stdcall; + FindFirstEvent:function(contactID:TMCONTACT):TMEVENT; stdcall; + FindFirstUnreadEvent:function(contactID:TMCONTACT):TMEVENT; stdcall; + FindLastEvent:function(contactID:TMCONTACT):TMEVENT; stdcall; + FindNextEvent:function(contactID:TMCONTACT;hDbEvent:TMEVENT):TMEVENT; stdcall; + FindPrevEvent:function(contactID:TMCONTACT;hDbEvent:TMEVENT):TMEVENT; stdcall; EnumModuleNames:function(pFunc:TDBMODULEENUMPROC; pParam:pointer):bool; stdcall; @@ -162,7 +162,7 @@ const EGROKPRF_UNKHEADER = 2; // header not supported, not a supported profile EGROKPRF_VERNEWER = 3; // header correct, version in profile newer than reader/writer EGROKPRF_DAMAGED = 4; // header/version fine, other internal data missing, damaged. - EGROKPRF_OBSOLETE = 5; // obsolete database version detected, requiring conversion + EGROKPRF_OBSOLETE = 5; // obsolete database version detected, requiring conversion // makeDatabase() error codes EMKPRF_CREATEFAILED = 1; // for some reason CreateFile() didnt like something diff --git a/include/delphi/m_protoint.inc b/include/delphi/m_protoint.inc index 2d1f49d22a..1c1fce8af1 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:HDBEVENT):TMCONTACT; cdecl; + AddToListByEvent:function(intf:PPROTO_INTERFACE;flags:int; iContact:int; hDbEvent:TMEVENT):TMCONTACT; cdecl; - Authorize :function(intf:PPROTO_INTERFACE;hDbEvent:HDBEVENT):int; cdecl; - AuthDeny :function(intf:PPROTO_INTERFACE;hDbEvent:HDBEVENT;const szReason:TChar):int; cdecl; + Authorize :function(intf:PPROTO_INTERFACE;hDbEvent:TMEVENT):int; cdecl; + AuthDeny :function(intf:PPROTO_INTERFACE;hDbEvent:TMEVENT;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/delphi/m_protosvc.inc b/include/delphi/m_protosvc.inc index 542ca78a9f..315e5222c9 100644 --- a/include/delphi/m_protosvc.inc +++ b/include/delphi/m_protosvc.inc @@ -349,7 +349,7 @@ const PS_GETSTATUS = '/GetStatus'; { - wParam : HDBEVENT + wParam : TMEVENT lParam : 0 Affect : allow 'somebody' to add the user to their contact list, see notes Returns: 0 on success, [non zero] on failure @@ -359,13 +359,13 @@ const protocolSpecific: dword; nick, firstname, lastName, e-mail, requestReason: ASCIIZ; - - HDBEVENT musts be the handle of such an event, one or more + TMEVENT musts be the handle of such an event, one or more fields may be empty if the protocol doesn't support them } PS_AUTHALLOW = '/Authorize'; { - wParam : HDBEVENT + wParam : TMEVENT lParam : TChar - Reason Affect : Deny an authorisation request Returns: 0 on success, [non zero] on failure @@ -503,10 +503,10 @@ const { wParam : MAKEWPARAM(flags, iContact) - lParam : HDBEVENT + lParam : TMEVENT Affects: Add a contact to the contact list given an auth/added/contacts events, see notes Returns: A TMCONTACT or NULL(0) on failure - Notes : HDBEVENT must be either EVENTTYPE_AUTHREQ or EVENTTYPE_ADDED + Notes : TMEVENT must be either EVENTTYPE_AUTHREQ or EVENTTYPE_ADDED flags are the same as PS_ADDTOLIST, - iContacts is only used for contacts vents, it is 0-based index -- cgit v1.2.3