From abf8cd813bb0ac4f4f5451d2af929279d816abac Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Wed, 18 Apr 2018 23:04:26 +0300
Subject: core changes:

- PROTOCOLDESCRIPTOR's implementation hidden inside mir_app;
- Proto_RegisterModule now doesn't need a PROTOCOLDESCRIPTOR structure;
- PROTOTYPE_PROTOWITHACCS type added for protos that work with accounts
---
 include/delphi/m_clistint.inc  | 18 ------------------
 include/delphi/m_protocols.inc |  1 -
 include/delphi/m_protomod.inc  | 15 +++++----------
 3 files changed, 5 insertions(+), 29 deletions(-)

(limited to 'include/delphi')

diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc
index 724ad30bf7..3ec038b04d 100644
--- a/include/delphi/m_clistint.inc
+++ b/include/delphi/m_clistint.inc
@@ -23,24 +23,6 @@
 {$IFNDEF M_CLISTINT}
 {$DEFINE M_CLISTINT}
 
-{Type
-  P_menuProto           = ^_menuProto;
-  PClcCacheEntryBase    = ^ClcCacheEntryBase;
-  PClcContact           = ^ClcContact;
-  PClcData              = ^ClcData;
-  PClcFontInfo          = ^ClcFontInfo;
-  PClcGroup             = ^ClcGroup;
-  PClcProtoStatus       = ^ClcProtoStatus;
-  PCLIST_INTERFACE      = ^CLIST_INTERFACE;
-  PCListEvent           = ^CListEvent;
-  PCLCCacheEntry        = ^CLCCacheEntry;
-  PContactList          = ^ContactList;
-  PEventList            = ^EventList;
-  PMenuProto            = ^MenuProto;
-  PMIRANDASYSTRAYNOTIFY = ^MIRANDASYSTRAYNOTIFY;
-  PPROTOCOLDESCRIPTOR   = ^PROTOCOLDESCRIPTOR;
-  PtrayIconInfo_t       = ^trayIconInfo_t;
-}
 const
   HCONTACT_ISGROUP = $80000000;
   HCONTACT_ISINFO  = $FFFF0000;
diff --git a/include/delphi/m_protocols.inc b/include/delphi/m_protocols.inc
index 713bbb031a..d7bf082421 100644
--- a/include/delphi/m_protocols.inc
+++ b/include/delphi/m_protocols.inc
@@ -157,7 +157,6 @@ type
   PPROTOCOLDESCRIPTOR = ^TPROTOCOLDESCRIPTOR;
   PPPROTOCOLDESCRIPTOR = ^PPROTOCOLDESCRIPTOR;
   TPROTOCOLDESCRIPTOR = record
-    cbSize : size_t;
     szName : PAnsiChar; // unique name of the module
     _type  : int;   // module type, see PROTOTYPE_ constants
   end;
diff --git a/include/delphi/m_protomod.inc b/include/delphi/m_protomod.inc
index 416d5758e5..df9d30f2aa 100644
--- a/include/delphi/m_protomod.inc
+++ b/include/delphi/m_protomod.inc
@@ -39,8 +39,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
            be done for PROTOTYPE_PROTOCOL.
 }
 
-function Proto_RegisterModule(descr:pPROTOCOLDESCRIPTOR) : int; stdcall;
-                 external AppDLL name 'Proto_RegisterModule';
+function Proto_RegisterModule(iType:int; name:PAnsiChar) : int; stdcall; external AppDLL;
 
 {
   Affect : Add the given protocol module to the chain for a contact, see notes
@@ -49,16 +48,14 @@ function Proto_RegisterModule(descr:pPROTOCOLDESCRIPTOR) : int; stdcall;
            registered type.
 }
 
-function Proto_AddToContact(hContact:TMCONTACT; proto:PAnsiChar) : int; stdcall;
-                 external AppDLL name 'Proto_AddToContact';
+function Proto_AddToContact(hContact:TMCONTACT; proto:PAnsiChar) : int; stdcall; external AppDLL;
 
 {
   Affect : Remove the given protocol name from the chain for the given contact
   Returns: 0 on success, [non zero] on failure
 }
 
-function Proto_RemoveFromContact(hContact:TMCONTACT; proto:PAnsiChar) : int; stdcall;
-                 external AppDLL name 'Proto_RemoveFromContact';
+function Proto_RemoveFromContact(hContact:TMCONTACT; proto:PAnsiChar) : int; stdcall; external AppDLL;
 
 {
   Affect : Call the next service in the chain for the send operation, see notes
@@ -69,8 +66,7 @@ function Proto_RemoveFromContact(hContact:TMCONTACT; proto:PAnsiChar) : int; std
            typically your service should return ASAP.
 }
 
-function Proto_ChainSend(order:int; ccs:pCCSDATA) : INT_PTR; stdcall;
-                 external AppDLL name 'Proto_ChainSend';
+function Proto_ChainSend(order:int; ccs:pCCSDATA) : INT_PTR; stdcall; external AppDLL;
 
 {
   Affect : Call the next service in the chain in this receive operation, see notes
@@ -84,7 +80,6 @@ function Proto_ChainSend(order:int; ccs:pCCSDATA) : INT_PTR; stdcall;
            are translated to the main thread and passed from there.
 }
 
-function Proto_ChainRecv(order:int; ccs:pCCSDATA) : INT_PTR; stdcall;
-                 external AppDLL name 'Proto_ChainRecv';
+function Proto_ChainRecv(order:int; ccs:pCCSDATA) : INT_PTR; stdcall; external AppDLL;
 
 {$ENDIF}
-- 
cgit v1.2.3