MS_CLUI_GETHWND & MS_CLUI_GETHWNDTREE replaced with pcli->hwndContactList & pcli->hwndContactTree respectively

git-svn-id: http://svn.miranda-ng.org/main/trunk@14386 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

2 files changed, 13 insertions, 19 deletions

diff --git a/plugins/Utils.pas/mircontacts.pas b/plugins/Utils.pas/mircontacts.pas
index 15bb6d61a7..5eca8bb927 100644
--- a/plugins/Utils.pas/mircontacts.pas
+++ b/plugins/Utils.pas/mircontacts.pas
@@ -401,16 +401,14 @@ function SetCListSelContact(hContact:TMCONTACT):TMCONTACT;
 var

   wnd:HWND;

 begin

-  wnd:=CallService(MS_CLUI_GETHWNDTREE,0,0);

+  wnd:=cli^.hwndContactTree;

   result:=hContact;

-//  hContact:=SendMessage(wnd,CLM_FINDCONTACT  ,hContact,0);

   SendMessage(wnd,CLM_SELECTITEM   ,hContact,0);

-//  SendMessage(wnd,CLM_ENSUREVISIBLE,hContact,0);

 end;

 

 function GetCListSelContact:TMCONTACT;

 begin

-  result:=SendMessageW(CallService(MS_CLUI_GETHWNDTREE,0,0),CLM_GETSELECTION,0,0);

+  result:=SendMessageW(cli^.hwndContactTree,CLM_GETSELECTION,0,0);

 end;

 

 function WndToContact(wnd:HWND):TMCONTACT;

diff --git a/plugins/Utils.pas/protocols.pas b/plugins/Utils.pas/protocols.pas
index 08b9221711..85fadc4001 100644
--- a/plugins/Utils.pas/protocols.pas
+++ b/plugins/Utils.pas/protocols.pas
@@ -219,13 +219,11 @@ var
   item:TLVITEMW;

   lvc:TLVCOLUMN;

   i,newItem:integer;

-  cli:PCLIST_INTERFACE;

 begin

   FillChar(lvc,SizeOf(lvc),0);

   ListView_SetExtendedListViewStyle(list, LVS_EX_CHECKBOXES);

   if withIcons then

   begin

-    cli:=PCLIST_INTERFACE(CallService(MS_CLIST_RETRIEVE_INTERFACE,0,0));

     SetWindowLongPtrW(list,GWL_STYLE,

         GetWindowLongPtrW(list,GWL_STYLE) or LVS_SHAREIMAGELISTS);

     ListView_SetImageList(list,

@@ -277,7 +275,7 @@ end;
 

 procedure FillStatusList(proto:uint_ptr;list:HWND;withIcons:bool=false);

 

-  procedure AddString(num:integer;enabled:boolean;cli:PCLIST_INTERFACE);

+  procedure AddString(num:integer;enabled:boolean);

   var

     item:LV_ITEMW;

     newItem:integer;

@@ -300,7 +298,6 @@ procedure FillStatusList(proto:uint_ptr;list:HWND;withIcons:bool=false);
 

 var

   lvc:TLVCOLUMN;

-  cli:PCLIST_INTERFACE;

 begin

   if proto=0 then

     withIcons:=false;

@@ -310,7 +307,6 @@ begin
   ListView_SetExtendedListViewStyle(list, LVS_EX_CHECKBOXES);

   if withIcons then

   begin

-    cli:=PCLIST_INTERFACE(CallService(MS_CLIST_RETRIEVE_INTERFACE,0,0));

     SetWindowLongPtrW(list,GWL_STYLE,

         GetWindowLongPtrW(list,GWL_STYLE) or LVS_SHAREIMAGELISTS);

     ListView_SetImageList(list,

@@ -328,19 +324,19 @@ begin
   lvc.fmt:={LVCFMT_IMAGE or} LVCFMT_LEFT;

   ListView_InsertColumn(list,0,lvc);

 

-  AddString(0,true,nil);

+  AddString(0,true);

   ListView_SetItemState (list,0,LVIS_FOCUSED or LVIS_SELECTED,$000F);

   with protos^[proto] do

   begin

-    if (status and psf_online    )<>0 then AddString(1,(enabled and psf_online    )<>0,cli);

-    if (status and psf_invisible )<>0 then AddString(2,(enabled and psf_invisible )<>0,cli);

-    if (status and psf_shortaway )<>0 then AddString(3,(enabled and psf_shortaway )<>0,cli);

-    if (status and psf_longaway  )<>0 then AddString(4,(enabled and psf_longaway  )<>0,cli);

-    if (status and psf_lightdnd  )<>0 then AddString(5,(enabled and psf_lightdnd  )<>0,cli);

-    if (status and psf_heavydnd  )<>0 then AddString(6,(enabled and psf_heavydnd  )<>0,cli);

-    if (status and psf_freechat  )<>0 then AddString(7,(enabled and psf_freechat  )<>0,cli);

-    if (status and psf_outtolunch)<>0 then AddString(8,(enabled and psf_outtolunch)<>0,cli);

-    if (status and psf_onthephone)<>0 then AddString(9,(enabled and psf_onthephone)<>0,cli);

+    if (status and psf_online    )<>0 then AddString(1,(enabled and psf_online    )<>0);

+    if (status and psf_invisible )<>0 then AddString(2,(enabled and psf_invisible )<>0);

+    if (status and psf_shortaway )<>0 then AddString(3,(enabled and psf_shortaway )<>0);

+    if (status and psf_longaway  )<>0 then AddString(4,(enabled and psf_longaway  )<>0);

+    if (status and psf_lightdnd  )<>0 then AddString(5,(enabled and psf_lightdnd  )<>0);

+    if (status and psf_heavydnd  )<>0 then AddString(6,(enabled and psf_heavydnd  )<>0);

+    if (status and psf_freechat  )<>0 then AddString(7,(enabled and psf_freechat  )<>0);

+    if (status and psf_outtolunch)<>0 then AddString(8,(enabled and psf_outtolunch)<>0);

+    if (status and psf_onthephone)<>0 then AddString(9,(enabled and psf_onthephone)<>0);

   end;

   ListView_SetColumnWidth(list,0,LVSCW_AUTOSIZE);

 end;