1 files changed, 7 insertions, 9 deletions
diff --git a/plugins/QuickSearch/sr_window.pas b/plugins/QuickSearch/sr_window.pas
index de9ba1b634..0b13cbeede 100644
--- a/plugins/QuickSearch/sr_window.pas
+++ b/plugins/QuickSearch/sr_window.pas
@@ -500,7 +500,7 @@ var
   cni:TCONTACTINFO;
   dbei:TDBEVENTINFO;
   hDbEvent:cardinal;
-  tmp:uint_ptr;
+  tmp:int_ptr;
   protov:PAnsiChar;
 begin
   FillChar(res,SizeOf(tQSRec),0);
@@ -526,7 +526,7 @@ begin
       ST_SERVICE: begin
         if wparam._type=ptCurrent then wparam.n:=hContact;
         if lparam._type=ptCurrent then lparam.n:=hContact;
-        tmp:=uint_ptr(CallService(protov,wparam.n,lparam.n));
+        tmp:=int_ptr(CallService(protov,wparam.n,lparam.n));
         if tmp=CALLSERVICE_NOTFOUND then exit;
         case setting_cnftype of
           ptString: begin
@@ -1884,6 +1884,7 @@ var
   rc:TRECT;
   h:HICON;
   buf:array [0..255] of AnsiChar;
+  MirVerW:PWideChar;
   i,j,sub:integer;
 begin
   lplvcd:=pointer(lParam);
@@ -1946,13 +1947,10 @@ begin
       if (qsopt.columns[sub].flags and COL_CLIENT)<>0 then
       begin
         i:=LV_GetLParam(grid,lplvcd^.nmcd.dwItemSpec);
-        FastWideToAnsiBuf(MainBuf[i,sub].text,buf);
-
-//        ListView_GetItemTextA(grid,lplvcd^.nmcd.dwItemSpec,lplvcd^.iSubItem,buf,SizeOf(buf));
-//!!
-        if (buf[0]<>#0) and (ServiceExists(MS_FP_GETCLIENTICON)<>0) then
+        MirVerW:=MainBuf[i,sub].text;
+        if (MirVerW[0]<>#0) and (ServiceExists(MS_FP_GETCLIENTICONW)<>0) then
         begin
-          h:=CallService(MS_FP_GETCLIENTICON,tlparam(@buf),0);
+          h:=CallService(MS_FP_GETCLIENTICONW,tlparam(MirVerW),0);
           ListView_GetSubItemRect(grid,lplvcd^.nmcd.dwItemSpec,lplvcd^.iSubItem,LVIR_ICON,@rc);
           DrawIconEx(lplvcd^.nmcd.hdc,rc.left+1,rc.top,h,16,16,0,0,DI_NORMAL);
           DestroyIcon(h);
@@ -2184,7 +2182,7 @@ begin
     else if (wparam.a<>NIL) and // FingerPrint preprocess
        (setting_type=ST_STRING) and
        (lstrcmpia(wparam.a,'MirVer')=0) and
-       (ServiceExists(MS_FP_GETCLIENTICON)<>0) then
+       (ServiceExists(MS_FP_GETCLIENTICONW)<>0) then
       flags:=flags or COL_CLIENT;
   end;
 end;