other pascal merge

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

1 files changed, 6 insertions, 6 deletions

diff --git a/plugins/QuickSearch/sr_window.pas b/plugins/QuickSearch/sr_window.pas
index 5655e70792..5306c44968 100644
--- a/plugins/QuickSearch/sr_window.pas
+++ b/plugins/QuickSearch/sr_window.pas
@@ -504,7 +504,7 @@ var
   protov:PAnsiChar;

 begin

   FillChar(res,SizeOf(tQSRec),0);

-  res.data:=dword(-1);

+  res.data:=uint_ptr(-1);

   res.text:=nil;

   with qsopt.columns[num] do

   begin

@@ -1625,7 +1625,7 @@ end;
           end;

           p^:=#0;

 }

-        CallService(MS_TIPPER_SHOWTIPW,0{dword(txt)},tlparam(@info));

+        CallService(MS_TIPPER_SHOWTIPW,0{twparam(txt)},tlparam(@info));

 //        mFreeMem(txt);

         TTShowed:=true;

       end;

@@ -1949,7 +1949,8 @@ begin
         FastWideToAnsiBuf(MainBuf[i,sub].text,buf);

 

 //        ListView_GetItemTextA(grid,lplvcd^.nmcd.dwItemSpec,lplvcd^.iSubItem,buf,SizeOf(buf));

-        if buf[0]<>#0 then

+//

+        if (buf[0]<>#0) and (ServiceExists(MS_FP_GETCLIENTICON)<>0) then

         begin

           h:=CallService(MS_FP_GETCLIENTICON,tlparam(@buf),0);

           ListView_GetSubItemRect(grid,lplvcd^.nmcd.dwItemSpec,lplvcd^.iSubItem,LVIR_ICON,@rc);

@@ -2239,13 +2240,12 @@ end;
 procedure FillProtoCombo(cb:HWND);

 var

   i:integer;

-  buf:array [0..63] of WideChar;

 begin

   SendMessage(cb,CB_RESETCONTENT,0,0);

   CB_AddStrDataW(cb,TranslateW('All'));

   for i:=1 to GetNumProto do

   begin

-    CB_AddStrDataW(cb,FastAnsiToWideBuf(GetProtoName(i),@buf),i);

+    CB_AddStrDataW(cb,GetProtoAccName(i),i);

   end;

   SendMessage(cb,CB_SETCURSEL,0,0);

 end;

@@ -2898,7 +2898,7 @@ begin
             inc(col);

           end;

 

-        SendMessageW(grid,LVM_SETCOLUMNORDERARRAY,tablecolumns,dword(@lcol[0]));

+        SendMessageW(grid,LVM_SETCOLUMNORDERARRAY,tablecolumns,tlparam(@lcol[0]));

 

         InvalidateRect(grid,nil,false);

 }