From 10bc9e42dfba6ed8be41199243d688c2e367dc0d Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Tue, 30 Jun 2015 18:59:38 +0000
Subject: MS_CLIST_GETSTATUSMODEDESCRIPTION & MS_CLIST_GETCONTACTDISPLAYNAME
 replaced with pcli->* members

git-svn-id: http://svn.miranda-ng.org/main/trunk@14459 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 include/delphi/m_clist.inc    | 31 -------------------------------
 include/delphi/m_clistint.inc | 11 +++++++----
 2 files changed, 7 insertions(+), 35 deletions(-)

(limited to 'include/delphi')

diff --git a/include/delphi/m_clist.inc b/include/delphi/m_clist.inc
index 9c54fae5d5..388990f8af 100644
--- a/include/delphi/m_clist.inc
+++ b/include/delphi/m_clist.inc
@@ -33,19 +33,6 @@ const
   }
   MS_CLIST_GETSTATUSMODE:PAnsiChar = 'CList/GetStatusMode';
 
-  GSMDF_UNICODE      = 2; // will return TCHAR* instead of AnsiChar*
-  GSMDF_UNTRANSLATED = 4;
-
-  {
-    wParam : status_mode
-    lParam : flags
-    Affect : Get a textual description of the given status mode
-    Returns: pointer to a static buffer of the description of the given status mode
-             or NULL(0) if the mode was unknown.
-    Version: v0.1.0.1+
-  }
-  MS_CLIST_GETSTATUSMODEDESCRIPTION:PAnsiChar = 'CList/GetStatusModeDescription';
-
 function Menu_BuildContactMenu(hContact:TMCONTACT) : HMENU; stdcall;
              external AppDll name 'Menu_BuildContactMenu';
 
@@ -110,24 +97,6 @@ const
   }
   ME_CLIST_DOUBLECLICKED:PAnsiChar = 'CList/DoubleClicked';
 
-  GCDNF_NOMYHANDLE = 1; // will never return the user's custom name
-  GCDNF_UNICODE    = 2; // will return TCHAR* instead of AnsiChar*
-  GCDNF_NOCACHE    = 4; // will not use the cache
-  {
-    wParam : TMCONTACT
-    lParam : flags
-    Affect : Gets the string that the contact list will use to represent a contact
-    Returns: Always a pointer
-    Notes  : Returns a pointer to the name, will always succeed, even if it needs
-             to return "(Unknown Contact)"
-             -
-             this pointer is a statically allocated buffer which will
-             be overwritten on every call to this service, callers should make
-             sure that they copy the information before they call it again
-    Version: v0.1.2.0+, 0.2.0+ ONLY (0.3a supports the contacts module)
-  }
-  MS_CLIST_GETCONTACTDISPLAYNAME:PAnsiChar = 'CList/GetContactDisplayName';
-
   {
     Invalidates the display name cache
     wParam=(WPARAM)(HANDLE)hContact
diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc
index 33e2ab5d7e..108163db8b 100644
--- a/include/delphi/m_clistint.inc
+++ b/include/delphi/m_clistint.inc
@@ -273,6 +273,10 @@ const
    * CLIST_INTERFACE structure definition
    ************************************************************************** }
 
+const
+  GCDNF_NOMYHANDLE = 1; // will never return the user's custom name
+  GCDNF_NOCACHE    = 4; // will not use the cache
+
 type
   PClcProtoStatus = ^TClcProtoStatus;
   TClcProtoStatus = record
@@ -396,7 +400,7 @@ type
   (* clistmod.c *)
     pfnIconFromStatusMode       : function (szProto:PAnsiChar; status:int; hContact:TMCONTACT):int; cdecl;
     pfnShowHide                 : function (_para1:WPARAM; _para2:LPARAM):int; cdecl;
-    pfnGetStatusModeDescription : function (mode:int; flags:int):TChar; cdecl;
+    pfnGetStatusModeDescription : function (mode:int; flags:int) : PWideChar; cdecl;
 
   (* clistsettings.c *)
     pfnGetCacheEntry   : function (hContact:TMCONTACT):PClcCacheEntry; cdecl;
@@ -404,12 +408,11 @@ type
     pfnCheckCacheItem  : procedure (_para1:PClcCacheEntry); cdecl;
     pfnFreeCacheItem   : procedure (_para1:PClcCacheEntry); cdecl;
 
-    pfnGetContactDisplayName           : function  (hContact:TMCONTACT; mode:int):TChar; cdecl;
+    pfnGetContactDisplayName           : function  (hContact:TMCONTACT; mode:int):PWideChar; cdecl;
     pfnInvalidateDisplayNameCacheEntry : procedure (hContact:TMCONTACT); cdecl;
 
   (* clisttray.c *)
-    pfnTrayIconUpdateWithImageList : procedure (iImage:int; szNewTip:TChar;
-                                     szPreferredProto:PAnsiChar); cdecl;
+    pfnTrayIconUpdateWithImageList : procedure (iImage:int; szNewTip:TChar; szPreferredProto:PAnsiChar); cdecl;
     pfnTrayIconUpdateBase          : procedure (szChangedProto:PAnsiChar); cdecl;
     pfnTrayIconSetToBase           : procedure (szPreferredProto:PAnsiChar); cdecl;
     pfnTrayIconIconsChanged        : procedure ; cdecl;
-- 
cgit v1.2.3