From 66a5a3ee980520f1bb690b78e85b6105d0f80347 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 10 Mar 2013 20:15:02 +0000
Subject: other pascal merge

git-svn-id: http://svn.miranda-ng.org/main/trunk@3966 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Utils.pas/protocols.pas | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

(limited to 'plugins/Utils.pas/protocols.pas')

diff --git a/plugins/Utils.pas/protocols.pas b/plugins/Utils.pas/protocols.pas
index a353a5ada5..101c1e4282 100644
--- a/plugins/Utils.pas/protocols.pas
+++ b/plugins/Utils.pas/protocols.pas
@@ -19,11 +19,12 @@ function IsChatSupported   (ProtoNum:uint_ptr):bool;
 function GetProtoStatus   (ProtoNum:uint_ptr):integer;
 function GetProtoStatusNum(ProtoNum:uint_ptr):integer;
 function GetProtoName     (ProtoNum:uint_ptr):PAnsiChar;
+function GetProtoAccName  (ProtoNum:uint_ptr):PWideChar;
 
 procedure FillProtoList  (list:hwnd;withIcons:bool=false);
 procedure CheckProtoList (list:hwnd);
-procedure FillStatusList (proto:cardinal;list:hwnd;withIcons:bool=false);
-procedure CheckStatusList(list:hwnd;ProtoNum:cardinal);
+procedure FillStatusList (proto:uint_ptr;list:hwnd;withIcons:bool=false);
+procedure CheckStatusList(list:hwnd;ProtoNum:uint_ptr);
 
 function  CreateProtoList(deepscan:boolean=false):integer;
 procedure FreeProtoList;
@@ -205,6 +206,14 @@ begin
     result:=nil;
 end;
 
+function GetProtoAccName(ProtoNum:uint_ptr):PWideChar;
+begin
+  if ProtoNum<=NumProto then
+    result:=protos^[ProtoNum].descr
+  else
+    result:=nil;
+end;
+
 procedure FillProtoList(list:hwnd;withIcons:bool=false);
 var
   item:TLVITEMW;
@@ -266,7 +275,7 @@ begin
   end;
 end;
 
-procedure FillStatusList(proto:cardinal;list:hwnd;withIcons:bool=false);
+procedure FillStatusList(proto:uint_ptr;list:hwnd;withIcons:bool=false);
 
   procedure AddString(num:integer;enabled:boolean;cli:PCLIST_INTERFACE);
   var
@@ -336,7 +345,7 @@ begin
   ListView_SetColumnWidth(list,0,LVSCW_AUTOSIZE);
 end;
 
-procedure CheckStatusList(list:hwnd;ProtoNum:cardinal);
+procedure CheckStatusList(list:hwnd;ProtoNum:uint_ptr);
 
   procedure SetStatusMask(stat:integer;state:bool);
   var
@@ -571,7 +580,13 @@ begin
         wParam:=@i;
         lParam:=@j;
       end;
-      CallProtoService(proto,PS_GETCUSTOMSTATUSEX,0,dword(@ics));
+      CallProtoService(proto,PS_GETCUSTOMSTATUSEX,0,LPARAM(@ics));
+    end;
+
+    with ics do
+    begin
+      flags:=CSSF_MASK_STATUS;
+      status:=@result;
     end;
 
     if title<>nil then
@@ -579,10 +594,9 @@ begin
       mGetMem(title^,(i+1)*SizeOf(WideChar));
       with ics do
       begin
-        flags   :=CSSF_MASK_NAME or CSSF_UNICODE;
+        flags   :=flags or CSSF_MASK_NAME or CSSF_UNICODE;
         szName.w:=pWideChar(title^);
       end;
-      CallProtoService(proto,PS_GETCUSTOMSTATUSEX,0,dword(@ics));
     end;
 
     if txt<>nil then
@@ -590,18 +604,12 @@ begin
       mGetMem(txt^,(j+1)*SizeOf(WideChar));
       with ics do
       begin
-        flags:=CSSF_MASK_MESSAGE or CSSF_UNICODE;
+        flags:=flags or CSSF_MASK_MESSAGE or CSSF_UNICODE;
         szMessage.w:=pWideChar(txt^);
       end;
-      CallProtoService(proto,PS_GETCUSTOMSTATUSEX,0,dword(@ics));
     end;
 
-    with ics do
-    begin
-      flags:=CSSF_MASK_STATUS;
-      status:=@result;
-    end;
-    CallProtoService(proto,PS_GETCUSTOMSTATUSEX,0,dword(@ics));
+    CallProtoService(proto,PS_GETCUSTOMSTATUSEX,0,LPARAM(@ics));
 
 {
     StrCopy(buf,proto);
-- 
cgit v1.2.3