correct type for ServiceExists() - bool

27 files changed, 56 insertions, 568 deletions

diff --git a/plugins/Actman/i_opt_dlg2.inc b/plugins/Actman/i_opt_dlg2.inc
index fc76ba6fb0..0a50f9d171 100644
--- a/plugins/Actman/i_opt_dlg2.inc
+++ b/plugins/Actman/i_opt_dlg2.inc
@@ -451,19 +451,6 @@ begin
   actptr:=p.Create;

   SendMessage(p.DlgHandle,WM_ACT_SAVE,0,tlparam(actptr));

   actptr.flags:=actptr.flags or ACF_INTRODUCED;

-{ maybe do it at full chain saving?

-  

-  li.iItem     :=listnum;

-  li.mask      :=LVIF_TEXT;

-  li.iSubItem  :=0;

-  li.pszText   :=@arr;

-  li.cchTextMax:=SizeOf(arr) div SizeOf(WideChar);

-  SendDlgItemMessageW(Dialog,IDC_ACTION_LIST,LVM_GETITEMW,0,tlparam(@li));

-  StrDupW(actptr.ActionDescr,arr);

-

-  if ListView_GetCheckState(wnd,listnum)=0 then

-    actptr.flags:=actptr.flags or ACF_DISABLED;

-}

   LV_SetLParam(wnd,tlparam(actptr),listnum);

 end;

 

@@ -760,16 +747,7 @@ begin
       if (CurMacro^.flags and ACF_ASSIGNED)<>0 then

       begin

         lvi.iItem :=i;

-

         lvi.lParam:=LPARAM(i) or LPARAM(CurMacro^.flags and ACF_MACROFLAG);

-{!!

-        if (CurMacro^.flags and ACF_FIRSTRUN)<>0 then

-          lvi.lParam:=lvi.lParam or ACF_FIRSTRUN;

-        if (CurMacro^.flags and ACF_VOLATILE)<>0 then

-          lvi.lParam:=lvi.lParam or ACF_VOLATILE;

-        if (CurMacro^.flags and ACF_SINGLEINST)<>0 then

-          lvi.lParam:=lvi.lParam or ACF_SINGLEINST;

-!!}

         lvi.pszText:=@(CurMacro^.descr);

         SendMessageW(list,LVM_INSERTITEMW,0,tlparam(@lvi));

         inc(result);

@@ -779,7 +757,6 @@ begin
   end;

 

   CheckMacroList(Dialog);

-//??  SendMessage(list,CB_SETCURSEL,0,0);

   SendMessage(list,LVM_SETCOLUMNWIDTH,0,LVSCW_AUTOSIZE_USEHEADER);

 

   ListView_SetItemState(list,0,

@@ -815,11 +792,6 @@ begin
   ti.lpszText:=TranslateW('New');

   OptSetButtonIcon(ti.uId,ACI_NEW);

   SendMessageW(hwndTooltip,TTM_ADDTOOLW,0,lparam(@ti));

-{

-  hNew:=GetDlgItem(Dialog,IDC_NEW);

-  SendMessage  (hNew,BUTTONADDTOOLTIP,TWPARAM(TranslateW('New')),BATF_UNICODE);

-  OptSetButtonIcon(hNew,ACI_NEW);

-}

 

   ti.uId     :=GetDlgItem(Dialog,IDC_GROUP_NEW);

   OptSetButtonIcon(ti.uId,ACI_NEW);

@@ -851,27 +823,11 @@ begin
   ti.uId     :=GetDlgItem(Dialog,IDC_GROUP_DELETE);

   OptSetButtonIcon(ti.uId,ACI_DELETE);

   SendMessageW(hwndTooltip,TTM_ADDTOOLW,0,lparam(@ti));

-{

-  ti.uId     :=GetDlgItem(Dialog,IDC_GROUP_RELOAD);

-  ti.lpszText:=TranslateW('Reload');

-  OptSetButtonIcon(ti.uId,ACI_RELOAD);

-  SendMessageW(hwndTooltip,TTM_ADDTOOLW,0,lparam(@ti));

-}

+

   ti.uId     :=GetDlgItem(Dialog,IDC_GROUP_TEST);

   ti.lpszText:=TranslateW('Test');

   OptSetButtonIcon(ti.uId,ACI_TEST);

   SendMessageW(hwndTooltip,TTM_ADDTOOLW,0,lparam(@ti));

-{!!

-  ti.uId     :=GetDlgItem(Dialog,IDC_GROUP_IMPORT);

-  ti.lpszText:=TranslateW('Import');

-  OptSetButtonIcon(ti.uId,ACI_IMPORT);

-  SendMessageW(hwndTooltip,TTM_ADDTOOLW,0,lparam(@ti));

-

-  ti.uId     :=GetDlgItem(Dialog,IDC_GROUP_EXPORT);

-  ti.lpszText:=TranslateW('Export');

-  OptSetButtonIcon(ti.uId,ACI_EXPORT);

-  SendMessageW(hwndTooltip,TTM_ADDTOOLW,0,lparam(@ti));

-}

 end;

 

 function DlgProcOpt2(Dialog:HWND;hMessage:uint;wParam:WPARAM;lParam:LPARAM):LRESULT; stdcall;

@@ -910,14 +866,7 @@ begin
 

       // action type combobox

       FillActTypeList(GetDlgItem(Dialog,IDC_ACTION_TYPE));

-{!!

-      // XML import/export service

-      if ServiceExists(MS_SYSTEM_GET_XI)=0 then

-      begin

-        EnableWindow(GetDlgItem(Dialog,IDC_GROUP_EXPORT),false);

-        EnableWindow(GetDlgItem(Dialog,IDC_GROUP_IMPORT),false);

-      end;

-}      

+

       OldActTableProc  :=pointer(SetWindowLongPtrW(wnd,GWL_WNDPROC,long_ptr(@NewActTableProc)));

       OldGroupTableProc:=pointer(SetWindowLongPtrW(MacroListWindow,

             GWL_WNDPROC,long_ptr(@NewGroupTableProc)));

@@ -944,15 +893,6 @@ begin
     WM_COMMAND: begin

       if DontReact then exit;

       case wParam shr 16 of

-{

-        EN_CHANGE: begin

-// check for group renaming

-          if loword(wParam)<>IDC_EDIT_FORMAT then

-          begin

-            SetChanged(Dialog,etACT);

-          end;

-        end;

-}

         CBN_SELCHANGE:  begin

           case loword(wParam) of

             IDC_ACTION_TYPE: begin

@@ -995,43 +935,6 @@ begin
           end;

 

           case loword(wParam) of

-{

-            IDC_GROUP_EXPORT: begin

-              if ShowDlgW(xmlfilename,xmlfilename,TranslateW(inoutfilter),false) then

-              begin

-                wnd:=MacroListWindow;

-                for i:=0 to ListView_GetItemCount(wnd)-1 do

-                begin

-                  if ListView_GetItemState(wnd,i,LVIS_SELECTED)<>0 then

-                  begin

-                    with EditMacroList[LV_GetLParam(wnd,i)] do

-                      if (flags and ACF_ASSIGNED)<>0 then // must be always true

-                        flags:=flags or ACF_EXPORT;

-                  end

-                  else

-                    with EditMacroList[i] do

-                      if (flags and (ACF_EXPORT or ACF_ASSIGNED))=

-                                    (ACF_EXPORT or ACF_ASSIGNED) then

-                        flags:=flags and not ACF_EXPORT;

-                end;

-                i:=ACIO_EXPORT or ACIO_SELECTED;

-                if GetFSize(xmlfilename)>0 then

-                  if MessageBoxW(Dialog,TranslateW('Append data to file?'),

-                     PluginName,MB_YESNO+MB_ICONWARNING)=IDYES then

-                    i:=i or ACIO_APPEND;

-//!!!!!!!!!!!!!!!

-// we MUST Export EditMacroList, NOT MacroList

-// OR

-// Use "Apply" code before

-                CallService(MS_ACT_INOUT,i,TLPARAM(@xmlfilename));

-                for i:=0 to MaxGroups-1 do

-                  with EditMacroList[i] do

-                    if (flags and (ACF_EXPORT or ACF_ASSIGNED))=

-                                  (ACF_EXPORT or ACF_ASSIGNED) then

-                      flags:=flags and not ACF_EXPORT;

-              end;

-            end;

-}

             IDC_GROUP_IMPORT: begin

               if ShowDlgW(xmlfilename,xmlfilename,TranslateW(inoutfilter)) then

               begin

@@ -1039,7 +942,6 @@ begin
                 BuildActionChain(Dialog);

 

                 if Import(EditMacroList,xmlfilename,0)<>0 then

-//                if CallService(MS_ACT_INOUT,0,TLPARAM(@xmlfilename))<>0 then

                 begin

                   // copy from WM_INITDIALOG

                   FillMacroList(Dialog);

@@ -1236,16 +1138,6 @@ begin
                 ChangeListNotify(2);

 

                 DontReact:=false;

-              end

-              else

-              begin

-{??

-                lvflag:=(PNMLISTVIEW(lParam)^.uOldState and LVNI_SELECTED)-

-                        (PNMLISTVIEW(lParam)^.uNewState and LVNI_SELECTED);

-

-                if lvflag<>0 then

-                  CheckMacroListDirectionButtons(Dialog);

-}

               end;

             end;

           end

@@ -1273,13 +1165,6 @@ begin
             end

             else

             begin // checkboxes

-{??

-              lvflag:=(PNMLISTVIEW(lParam)^.uOldState and LVNI_SELECTED)-

-                      (PNMLISTVIEW(lParam)^.uNewState and LVNI_SELECTED);

-

-              if lvflag<>0 then

-                CheckMacroListDirectionButtons(Dialog);

-}

               if (PNMLISTVIEW(lParam)^.uOldState or PNMLISTVIEW(lParam)^.uNewState)=$3000 then

               begin

                 SetChanged(Dialog,etACT);

@@ -1331,8 +1216,5 @@ begin
 

       end;

     end;

-  else

-//  {result:=}DefWindowProc(Dialog,hMessage,wParam,lParam);

   end;

-//  {result:=}DefWindowProc(Dialog,hMessage,wParam,lParam);

 end;

diff --git a/plugins/Actman/ua/ua.pas b/plugins/Actman/ua/ua.pas
index e6e33aeaad..da59fda540 100644
--- a/plugins/Actman/ua/ua.pas
+++ b/plugins/Actman/ua/ua.pas
@@ -55,7 +55,7 @@ begin
   begin

     with NamesArray[i] do

     begin

-      enable:=(service=nil) or (ServiceExists(service)<>0);

+      enable:=(service=nil) or ServiceExists(service);

     end;

   end;

 end;

diff --git a/plugins/ExternalAPI/delphi/m_notify.inc b/plugins/ExternalAPI/delphi/m_notify.inc
index 6d269b0f99..2798ebbf31 100644
--- a/plugins/ExternalAPI/delphi/m_notify.inc
+++ b/plugins/ExternalAPI/delphi/m_notify.inc
@@ -64,188 +64,6 @@ const
 

 var

   notifyLink:PMNOTIFYLINK;

-(*

-function MNotifyRegister(name:PAnsiChar;icon:HICON):THANDLE;

-begin

-  if notifyLink<>nil then

-    result:=notifyLink^.Register(name,icon)

-  else

-    result:=0;

-end;

-function MNotifyCreate(atype:THANDLE):THANDLE;

-begin

-  if notifyLink<>nil then

-    result:=notifyLink^.Create(atype)

-  else

-    result:=0;

-end;

-function MNotifyIsValid(notify:THANDLE):int;

-begin

-  if notifyLink<>nil then

-    result:=notifyLink^.IsValid(notify)

-  else

-    result:=0;

-end;

-function MNotifySet(notifyORtype:THANDLE,name:PAnsiChar;val:TDBVARIANT):int;

-begin

-  if notifyLink<>nil then

-    result:=notifyLink^.Set(notifyORtype,name,val)

-  else

-    result:=0;

-end;

-function MNotifyGet(notifyORtype:THANDLE,name:PAnsiChar;val:PDBVARIANT):int;

-begin

-  if notifyLink<>nil then

-    result:=notifyLink^.Get(notifyORtype,name,val)

-  else

-    result:=0;

-end;

-function MNotifyAddAction(notifyORtype:THANDLE;icon:HICON;name:PAnsiChar;service:PAnsiChar=nil;cookie:dword=0):int;

-begin

-  if notifyLink<>nil then

-    result:=notifyLink^.AddAction(notifyORtype,icon,name)

-  else

-    result:=0;

-end;

-function MNotifyGetActions(notifyORtype:THANDLE;actions:PMNOTIFYACTIONINFO):int;

-begin

-  if notifyLink<>nil then

-    result:=notifyLink^.GetActions(notifyORtype,actions)

-  else

-    result:=0;

-end;

-function MNotifyAddRef(notify:THANDLE):int;

-begin

-  if notifyLink<>nil then

-    result:=notifyLink^.AddRef(notify)

-  else

-    result:=0;

-end;

-function MNotifyRelease(notify:THANDLE):int;

-begin

-  if notifyLink<>nil then

-    result:=notifyLink^.Release(notify)

-  else

-    result:=0;

-end;

-procedure MNotifyShow(notify:THANDLE);

-begin

-  if notifyLink<>nil then

-    notifyLink^.Show(notify)

-end;

-procedure MNotifyUpdate(notify:THANDLE);

-begin

-  if notifyLink<>nil then

-    notifyLink^.Update(notify)

-end;

-procedure MNotifyRemove(notify:THANDLE);

-begin

-  if notifyLink<>nil then

-    notifyLink^.Remove(notify)

-end;

-

-procedure MNotifyGetLink;

-begin

-  if PluginLink^.ServiceExists(MS_NOTIFY_GETLINK)<>0 then

-    notifyLink:=PMNOTIFYLINK(CallService(MS_NOTIFY_GETLINK,0,0))

-  else

-    notifyLink:=nil;

-end;

-

-// get helpers

-function MNotifyGetByte(notifyORtype:THANDLE;name:PAnsiChar;defValue:byte):byte;

-var

-  dbv:TDBVARIANT;

-begin

-  MNotifyGet(notifyORtype,name,dbv);

-  if dbv._type<>DBVT_BYTE then

-    result:=defValue

-  else

-    result:=dbv.bVal;

-end;

-function MNotifyGetWord(notifyORtype:THANDLE;name:PAnsiChar;defValue:word):word;

-var

-  dbv:TDBVARIANT;

-begin

-  MNotifyGet(notifyORtype,name,dbv);

-  if dbv._type<>DBVT_WORD then

-    result:=defValue

-  else

-   result:=dbv.wVal;

-end;

-function MNotifyGetDWord(notifyORtype:THANDLE;name:PAnsiChar;defValue:dword):dword;

-var

-  dbv:TDBVARIANT;

-begin

-  MNotifyGet(notifyORtype,name,dbv);

-  if dbv._type<>DBVT_DWORD then

-    result:=defValue

-  else

-    result:=dbv.dVal;

-end;

-function MNotifyGetString(notifyORtype:THANDLE;name:PAnsiChar;defValue:PAnsiChar):PAnsiChar;

-var

-  dbv:TDBVARIANT;

-begin

-  MNotifyGet(notifyORtype,name,dbv);

-  if dbv._type<>DBVT_ASCIIZ then

-    result:=defValue

-  else

-    result:=dbv.szVal.a;

-end;

-function MNotifyGetWString(notifyORtype:THANDLE;name:PAnsiChar;defValue:PWideChar):PWideChar;

-var

-  dbv:TDBVARIANT;

-begin

-  MNotifyGet(notifyORtype,name,dbv);

-  if dbv._type<>DBVT_WCHAR then

-    result:=defValue

-  else

-    result:=dbv.szVal.w;

-end;

-

-// set helpers

-procedure MNotifySetByte(notifyORtype:THANDLE;name:PAnsiChar;value:byte);

-var

-  dbv:TDBVARIANT;

-begin

-  dbv._type:=DBVT_BYTE;

-  dbv.bVal :=value;

-  MNotifySet(notifyORtype,name,dbv);

-end;

-procedure MNotifySetWord(notifyORtype:THANDLE;name:PAnsiChar;value:word);

-var

-  dbv:TDBVARIANT;

-begin

-  dbv._type:=DBVT_WORD;

-  dbv.wVal :=value;

-  MNotifySet(notifyORtype,name,dbv);

-end;

-procedure MNotifySetDWord(notifyORtype:THANDLE;name:PAnsiChar;value:dword);

-var

-  dbv:TDBVARIANT;

-begin

-  dbv._type:=DBVT_DWORD;

-  dbv.dVal :=value;

-  MNotifySet(notifyORtype,name,dbv);

-end;

-procedure MNotifySetString(notifyORtype:THANDLE;name:PAnsiChar;value:PAnsiChar);

-var

-  dbv:TDBVARIANT;

-begin

-  dbv._type  :=DBVT_ASCIIZ;

-  dbv.szVal.a:=value;

-  MNotifySet(notifyORtype,name,dbv);

-end;

-procedure MNotifySetWString(notifyORtype:THANDLE;name:PAnsiChar;value:PWideChar);

-var

-  dbv:TDBVARIANT;

-begin

-  dbv._type  :=DBVT_WCHAR;

-  dbv.szVal.w:=value;

-  MNotifySet(notifyORtype,name,dbv);

-end;

-*)

 

 const

 // Common options for Get/Set actions

@@ -260,6 +78,5 @@ const
   NFOPT_BACKCOLOR = 'General/BackColor';

   NFOPT_TEXTCOLOR = 'General/TextColor';

   NFOPT_TIMEOUT   = 'General/Timeout';

-//  NFOPT_ONDESTROY = 'General/OnDestroy';

 

 {$ENDIF}

diff --git a/plugins/ExternalAPI/delphi/m_skin_eng.inc b/plugins/ExternalAPI/delphi/m_skin_eng.inc
index 986d31718c..78ad8d306c 100644
--- a/plugins/ExternalAPI/delphi/m_skin_eng.inc
+++ b/plugins/ExternalAPI/delphi/m_skin_eng.inc
@@ -167,108 +167,6 @@ type
     hFont   :HFONT;

   end;

 

-//* HELPER FUNCTIONS */

-(*

-//Paint  ObjectID as parent background for frame hwndIn

-int __inline SkinDrawWindowBack(HWND hwndIn, HDC hdc, RECT * rcClip, char * objectID)

-{

-	SKINDRAWREQUEST rq;

-	POINT pt={0};

-	RECT rc,r1;

-

-	HWND hwnd=(HWND)CallService(MS_CLUI_GETHWND,0,0);

-	if (!objectID) return 0;

-	GetWindowRect(hwndIn,&r1);

-	pt.x=r1.left;

-	pt.y=r1.top;

-	//ClientToScreen(hwndIn,&pt);

-	GetWindowRect(hwnd,&rc);

-	OffsetRect(&rc,-pt.x ,-pt.y);

-	rq.hDC=hdc;

-	rq.rcDestRect=rc;

-	rq.rcClipRect=*rcClip;

-	lstrcpynA(rq.szObjectID,objectID,sizeof(rq.szObjectID));

-	///ske_Service_DrawGlyph((WPARAM)&rq,0);    //$$$

-	return CallService(MS_SKIN_DRAWGLYPH,(WPARAM)&rq,0);

-}

-

-

-//Paint  ObjectID

-int __inline SkinDrawGlyph(HDC hdc, RECT * rcSize, RECT * rcClip, char * objectID);

-

-//Register object with predefined style

-int __inline CreateGlyphedObjectDefStyle(char * ObjID,BYTE defStyle);

-int __inline CreateGlyphedObjectDefColor(char * ObjID,dword defColor);

-//Register default object

-int __inline CreateGlyphedObject(char * ObjID);

-

-

-//// Creating and registering objects

-//int __inline CreateGlyphedObject(char * ObjID)

-//{   

-//    DEF_SKIN_OBJECT_PARAMS prm={0};

-//    prm.defColor=DEFAULT_BKCOLOUR;

-//    prm.defStyle=DEFAULT_STYLE;

-//    prm.szObjectID=ObjID;   

-//    return CallService(MS_SKIN_REGISTERDEFOBJECT,(WPARAM)&prm,0);

-//}

-static BOOL __inline ScreenToClientRect(HWND hWnd, LPRECT lpRect)

-{

-	BOOL ret;

-

-	POINT pt;

-

-	pt.x = lpRect->left;

-	pt.y = lpRect->top;

-

-	ret = ScreenToClient(hWnd, &pt);

-

-	if (!ret) return ret;

-

-	lpRect->left = pt.x;

-	lpRect->top = pt.y;

-

-

-	pt.x = lpRect->right;

-	pt.y = lpRect->bottom;

-

-	ret = ScreenToClient(hWnd, &pt);

-

-	lpRect->right = pt.x;

-	lpRect->bottom = pt.y;

-

-	return ret;

-}

-

-//int __inline CreateGlyphedObjectDefStyle(char * ObjID,BYTE defStyle)

-//{

-//    DEF_SKIN_OBJECT_PARAMS prm={0};

-//    prm.defColor=DEFAULT_BKCOLOUR;

-//    prm.defStyle=defStyle;

-//    prm.szObjectID=ObjID;

-//    return CallService(MS_SKIN_REGISTERDEFOBJECT,(WPARAM)&prm,0);

-//}  

-//int __inline CreateGlyphedObjectDefColor(char * ObjID,dword defColor)

-//{

-//    DEF_SKIN_OBJECT_PARAMS prm={0};

-//    prm.defColor=defColor;

-//    prm.defStyle=ST_BRUSH;

-//    prm.szObjectID=ObjID;

-//    return CallService(MS_SKIN_REGISTERDEFOBJECT,(WPARAM)&prm,0);

-//}  

-static int __inline SkinDrawGlyph(HDC hdc, RECT * rcSize, RECT * rcClip, char * objectID)

-{

-	SKINDRAWREQUEST rq;

-	if (!objectID) return 0;

-	rq.hDC=hdc;

-	rq.rcDestRect=*rcSize;

-	rq.rcClipRect=*rcClip;  

-	lstrcpynA(rq.szObjectID,objectID,sizeof(rq.szObjectID));

-	return CallService(MS_SKIN_DRAWGLYPH,(WPARAM)&rq,0);

-}

-*)

-//#include "../hdr/modern_skin_selector.h"

-

 //////////////////////////////////////////////

 //                                          //

 //  New Painting sequence servises          //

@@ -309,53 +207,6 @@ type
   tPaintCallbackProc = function(hWnd:HWND; hDC:HDC; rcPaint:PRECT; rgnUpdate:HRGN;

        dFlags:dword; CallBackData:pointer):int;

 

-// HELPER TO UPDATEIMAGEFRAME

-

-(*

-inline BOOL isSkinEngineEnabled()

-{

-	return ServiceExists(MS_SKINENG_REGISTERPAINTSUB) && !DBGetContactSettingByte(NULL, "ModernData", "DisableEngine", FALSE);

-}

-

-

-inline BOOL isLayeredEnabled()

-{

-	return isSkinEngineEnabled() && DBGetContactSettingByte(NULL, "ModernData", "EnableLayering", TRUE);

-}

-

-int __inline SkinEngUpdateImageFrame(HWND hwnd, RECT * rcUpdate, dword dwFlags, void * CallBackData)

-{

-  sPaintRequest sr={0};

-  sr.dStructSize=sizeof(sPaintRequest);

-  sr.hWnd=hwnd;

-  if (rcUpdate)

-    sr.rcUpdate=*rcUpdate;

-  sr.dwFlags=dwFlags;

-  sr.CallbackData=CallBackData;

-  return CallService(MS_SKINENG_UPTATEFRAMEIMAGE,(WPARAM)hwnd,(LPARAM)&sr);

-}

-

-int __inline SkinEngInvalidateImageFrame(HWND hwnd, CONST RECT * rcUpdate, dword dwFlags, void * CallBackData)

-{

-  sPaintRequest sr={0};

-  if (hwnd && !isLayeredEnabled()) return InvalidateRect(hwnd,rcUpdate,dwFlags);

-  sr.dStructSize=sizeof(sPaintRequest);

-  sr.hWnd=hwnd;

-  if (rcUpdate)

-    sr.rcUpdate=*rcUpdate;

-  sr.dwFlags=dwFlags;

-  sr.CallbackData=CallBackData;

-  return CallService(MS_SKINENG_INVALIDATEFRAMEIMAGE,(WPARAM)hwnd,(LPARAM)&sr);

-}

-

-

-int __inline SkinInvalidateFrame(HWND hWnd, CONST RECT* lpRect,BOOL bErase)

-{

-	return SkinEngInvalidateImageFrame(hWnd,lpRect,0,0);

-}

-*)

-// Alpha channel GDI replacements/helpers

-

 const

 // 

 // Paints text with correct alpha channel

@@ -372,19 +223,7 @@ type
     ARGBcolor:dword;

     reserv   :array [0..15] of byte;

   end;

-(*

-int __inline AlphaText(HDC hDC, LPCTSTR lpString, int nCount, RECT * lpRect, UINT format, dword ARGBcolor)

-{

-  AlphaTextOutParams ap={0};

-  ap.hDC=hDC;

-  ap.lpString=lpString;

-  ap.nCount=nCount;

-  ap.lpRect=lpRect;

-  ap.format=format;

-  ap.ARGBcolor=ARGBcolor;

-  return CallService(MS_SKINENG_ALPHATEXTOUT,(WPARAM)&ap,0);

-}

-*)

+

 type

   ImageListFixParam = record

     himl :THANDLE; //HIMAGELIST;

@@ -408,22 +247,7 @@ type
 const

 //wParam - pointer to DrawIconFixParam

   MS_SKINENG_DRAWICONEXFIX:PAnsiChar = 'SkinEngine/DrawIconEx_Fix';

-(*

-int __inline mod_DrawIconEx_helper(HDC hdc,int xLeft,int yTop,HICON hIcon,int cxWidth,int cyWidth, UINT istepIfAniCur, HBRUSH hbrFlickerFreeDraw, UINT diFlags)

-{

-  DrawIconFixParam p={0};

-  p.hdc=hdc;

-  p.xLeft=xLeft;

-  p.yTop=yTop;

-  p.hIcon=hIcon;

-  p.cxWidth=cxWidth;

-  p.cyWidth=cyWidth;

-  p.istepIfAniCur=istepIfAniCur;

-  p.hbrFlickerFreeDraw=hbrFlickerFreeDraw;

-  p.diFlags=diFlags;

-  return CallService(MS_SKINENG_DRAWICONEXFIX,(WPARAM)&p,0);

-}

-*)

+

 const

 //  Register of plugin's user

 //

@@ -441,5 +265,4 @@ const
 //  lParam = 0

   ME_BACKGROUNDCONFIG_CHANGED:PAnsiChar = 'ModernBkgrCfg/Changed';

 

-

 {$ENDIF}

diff --git a/plugins/HistoryPlusPlus/hpp_options.pas b/plugins/HistoryPlusPlus/hpp_options.pas
index a64505f63b..d638a2a030 100644
--- a/plugins/HistoryPlusPlus/hpp_options.pas
+++ b/plugins/HistoryPlusPlus/hpp_options.pas
@@ -588,7 +588,7 @@ begin
   end;

 

   // Register in SmileyAdd

-  SmileyAddEnabled := boolean(ServiceExists(MS_SMILEYADD_REPLACESMILEYS));

+  SmileyAddEnabled := ServiceExists(MS_SMILEYADD_REPLACESMILEYS);

 end;

 

 procedure PrepareSaveDialog(SaveDialog: TSaveDialog; SaveFormat: TSaveFormat; AllFormats: boolean = false);

diff --git a/plugins/QuickSearch/quicksearch.dpr b/plugins/QuickSearch/quicksearch.dpr
index 2a6ce5742b..c9f90d01fb 100644
--- a/plugins/QuickSearch/quicksearch.dpr
+++ b/plugins/QuickSearch/quicksearch.dpr
@@ -52,7 +52,7 @@ begin
   result:=0;

 

 // toptoolbar

-  if ServiceExists(MS_TTB_GETBUTTONOPTIONS)<>0 then

+  if ServiceExists(MS_TTB_GETBUTTONOPTIONS) then

   begin

     CallService(MS_TTB_GETBUTTONOPTIONS,(hTTBButton shl 16)+TTBO_ALLDATA,TLPARAM(@ttb));

     ttb.hIconUp:=IcoLib_GetIcon(QS_QS,0);

diff --git a/plugins/QuickSearch/sr_frame.pas b/plugins/QuickSearch/sr_frame.pas
index e66fe68568..ed83536d43 100644
--- a/plugins/QuickSearch/sr_frame.pas
+++ b/plugins/QuickSearch/sr_frame.pas
@@ -144,7 +144,7 @@ var
   tr:TRECT;

   cid:TColourID;

 begin

-  if ServiceExists(MS_CLIST_FRAMES_ADDFRAME)=0 then

+  if not ServiceExists(MS_CLIST_FRAMES_ADDFRAME) then

     exit;

 

   hbr:=0;

diff --git a/plugins/QuickSearch/sr_global.pas b/plugins/QuickSearch/sr_global.pas
index 1412e8142a..8299edc8fc 100644
--- a/plugins/QuickSearch/sr_global.pas
+++ b/plugins/QuickSearch/sr_global.pas
@@ -201,7 +201,7 @@ procedure removetoolbar;
 begin

   if hTTBButton<>0 then

   begin

-    if ServiceExists(MS_TTB_REMOVEBUTTON)>0 then

+    if ServiceExists(MS_TTB_REMOVEBUTTON) then

     begin

       CallService(MS_TTB_REMOVEBUTTON,WPARAM(hTTBButton),0);

       hTTBButton:=0;

@@ -215,7 +215,7 @@ var
 begin

   removetoolbar;

 

-  if ServiceExists(MS_TTB_ADDBUTTON)>0 then

+  if ServiceExists(MS_TTB_ADDBUTTON) then

   begin

     ZeroMemory(@ttbopt,sizeof(ttbopt));

     ttbopt.pszService:=QS_SHOWSERVICE;

diff --git a/plugins/QuickSearch/sr_window.pas b/plugins/QuickSearch/sr_window.pas
index bdefa5f51b..e1d44f8e11 100644
--- a/plugins/QuickSearch/sr_window.pas
+++ b/plugins/QuickSearch/sr_window.pas
@@ -359,7 +359,7 @@ end;
 

 procedure DeleteOneContact(hContact:TMCONTACT);

 begin

-  if ServiceExists(strCListDel)>0 then

+  if ServiceExists(strCListDel) then

     CallService(strCListDel,hContact,0)

   else

     db_delete_contact(hContact);

@@ -899,7 +899,7 @@ begin
   AppendMenuW(mmenu,MF_SEPARATOR,0,nil);

   AppendMenuW(mmenu,MF_STRING,101,TranslateW('&Delete'));

   AppendMenuW(mmenu,MF_STRING,102,TranslateW('&Copy'));

-  if ServiceExists(MS_MC_CONVERTTOMETA)<>0 then

+  if ServiceExists(MS_MC_CONVERTTOMETA) then

     AppendMenuW(mmenu,MF_STRING,103,TranslateW('C&onvert to Meta'));

 

   cntmenu:=MakeContainerMenu(300);

@@ -1485,7 +1485,7 @@ begin
         if j>0 then

         begin

           StrCopy(StrCopyE(buf,GetProtoName(FlagBuf[i].proto)),PS_GETCUSTOMSTATUSICON);

-          if ServiceExists(buf)<>0 then

+          if ServiceExists(buf) then

           begin

             h:=CallService(buf,j,LR_SHARED);

 

@@ -1508,7 +1508,7 @@ begin
         MirVerW:=MainBuf[lplvcd^.nmcd.lItemlParam,sub].text;

 

 //!!

-        if (MirVerW<>nil) and (MirVerW[0]<>#0) and (ServiceExists(MS_FP_GETCLIENTICONW)<>0) then

+        if (MirVerW<>nil) and (MirVerW[0]<>#0) and ServiceExists(MS_FP_GETCLIENTICONW) then

         begin

           h:=CallService(MS_FP_GETCLIENTICONW,tlparam(MirVerW),0);

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

@@ -1622,7 +1622,7 @@ begin
 

       else if (datatype=QSTS_STRING) and

          (StrCmp(setting,'MirVer')=0) and

-         (ServiceExists(MS_FP_GETCLIENTICONW)<>0) then

+         ServiceExists(MS_FP_GETCLIENTICONW) then

         flags:=flags or COL_CLIENT;

 

     end

@@ -2258,7 +2258,7 @@ begin
   if j=0 then

     exit;

 

-  TTInstalled := ServiceExists(MS_TIPPER_SHOWTIP)<>0;

+  TTInstalled := ServiceExists(MS_TIPPER_SHOWTIP);

   // too lazy to move pattern and flags to thread

   if apattern<>nil then

   begin

diff --git a/plugins/Utils.pas/cbex.pas b/plugins/Utils.pas/cbex.pas
index 59778fcee7..7c05478ae9 100644
--- a/plugins/Utils.pas/cbex.pas
+++ b/plugins/Utils.pas/cbex.pas
@@ -26,7 +26,7 @@ begin
   SendMessage(wnd,CB_RESETCONTENT,0,0);

   StrCopy(StrCopyE(buf,proto),PS_GETCUSTOMSTATUSICON);

 

-  if ServiceExists(@buf)=0 then

+  if not ServiceExists(@buf) then

     exit;

 

   il:=ImageList_Create(16,16,ILC_COLOR32 or ILC_MASK,0,1);

diff --git a/plugins/Utils.pas/editwrapper.pas b/plugins/Utils.pas/editwrapper.pas
index 034a45e15b..61d1c60277 100644
--- a/plugins/Utils.pas/editwrapper.pas
+++ b/plugins/Utils.pas/editwrapper.pas
@@ -127,16 +127,12 @@ begin
       ShowWindow(GetDlgItem(Dialog,idhide),SW_HIDE);

 

       wnd:=GetDlgItem(Dialog,IDC_SCRIPT_HELP);

-      if ServiceExists(MS_VARS_FORMATSTRING)<>0 then

+      if ServiceExists(MS_VARS_FORMATSTRING) then

       begin

         SendMessage(wnd,BM_SETIMAGE,IMAGE_ICON,

             CallService(MS_VARS_GETSKINITEM,0,VSI_HELPICON));

         SendMessage(wnd,BUTTONADDTOOLTIP,

             CallService(MS_VARS_GETSKINITEM,0,VSI_HELPTIPTEXT),0);

-{

-        SendMessage(wnd,BM_SETIMAGE,IMAGE_ICON,

-            CallService(MS_SKIN_LOADICON,SKINICON_OTHER_HELP,0));

-}

       end

       else

       begin

@@ -414,16 +410,12 @@ begin
       ShowWindow(GetDlgItem(Dialog,idhide),SW_HIDE);

 

       wnd:=GetDlgItem(Dialog,IDC_SCRIPT_HELP);

-      if ServiceExists(MS_VARS_FORMATSTRING)<>0 then

+      if ServiceExists(MS_VARS_FORMATSTRING) then

       begin

         SendMessage(wnd,BM_SETIMAGE,IMAGE_ICON,

             CallService(MS_VARS_GETSKINITEM,0,VSI_HELPICON));

         SendMessage(wnd,BUTTONADDTOOLTIP,

             CallService(MS_VARS_GETSKINITEM,0,VSI_HELPTIPTEXT),0);

-{

-        SendMessage(wnd,BM_SETIMAGE,IMAGE_ICON,

-            CallService(MS_SKIN_LOADICON,SKINICON_OTHER_HELP,0));

-}

       end

       else

       begin

diff --git a/plugins/Utils.pas/mircontacts.pas b/plugins/Utils.pas/mircontacts.pas
index 7e5337c8c8..8cc128ab2f 100644
--- a/plugins/Utils.pas/mircontacts.pas
+++ b/plugins/Utils.pas/mircontacts.pas
@@ -477,7 +477,7 @@ CallService(MS_CLIST_CONTACTDOUBLECLICKED,hContact,0);
       end

       else

       begin

-        if ServiceExists(MS_MSG_CONVERS)<>0 then // Convers compat.

+        if ServiceExists(MS_MSG_CONVERS) then // Convers compat.

           CallService(MS_MSG_CONVERS,hContact,0)

         else

           CallService(MS_MSG_SENDMESSAGE,hContact,0)

diff --git a/plugins/Utils.pas/mirutils.pas b/plugins/Utils.pas/mirutils.pas
index bbedeb252b..10f2ea2578 100644
--- a/plugins/Utils.pas/mirutils.pas
+++ b/plugins/Utils.pas/mirutils.pas
@@ -139,7 +139,7 @@ end;
 function isVarsInstalled:bool;

 {$IFDEF AllowInline}inline;{$ENDIF}

 begin

-  result:=ServiceExists(MS_VARS_FORMATSTRING)<>0;

+  result:=ServiceExists(MS_VARS_FORMATSTRING);

 end;

 

 function ParseVarString(astr:PAnsiChar;aContact:TMCONTACT=0;extra:PAnsiChar=nil):PAnsiChar;

@@ -228,7 +228,7 @@ procedure ShowPopupW(text:PWideChar;title:PWideChar=nil);
 var

   ppdu:TPOPUPDATAW;

 begin

-  if ServiceExists(MS_POPUP_ADDPOPUPW)=0 then

+  if not ServiceExists(MS_POPUP_ADDPOPUPW) then

     exit;

 

   FillChar(ppdu,SizeOf(TPOPUPDATAW),0);

diff --git a/plugins/Utils.pas/protocols.pas b/plugins/Utils.pas/protocols.pas
index f4526a6c09..97a972dbe0 100644
--- a/plugins/Utils.pas/protocols.pas
+++ b/plugins/Utils.pas/protocols.pas
@@ -448,11 +448,11 @@ begin
 

       p:=StrCopyE(buf,name);

       StrCopy(p,PS_GETCUSTOMSTATUSEX);

-      if ServiceExists(buf)<>0 then

+      if ServiceExists(buf) then

         status:=status or psf_icq;

 

       StrCopy(p,PS_SET_LISTENINGTO);

-      if ServiceExists(buf)<>0 then

+      if ServiceExists(buf) then

         status:=status or psf_tunes;

 

     end;

diff --git a/plugins/Utils.pas/srvblock.pas b/plugins/Utils.pas/srvblock.pas
index 6a0e0adfe0..4a088b86f0 100644
--- a/plugins/Utils.pas/srvblock.pas
+++ b/plugins/Utils.pas/srvblock.pas
@@ -566,7 +566,7 @@ begin
     else

       Exit;

 

-  if ServiceExists(buf)<>0 then

+  if ServiceExists(buf) then

   begin

     result:=true;

 

diff --git a/plugins/Watrack/i_cover.inc b/plugins/Watrack/i_cover.inc
index 96aec9da47..0d1e6b3e84 100644
--- a/plugins/Watrack/i_cover.inc
+++ b/plugins/Watrack/i_cover.inc
@@ -20,7 +20,7 @@ begin
     begin

       move(p1^,line,i*SizeOf(WideChar));

       line[i]:=#0;

-      if ServiceExists(MS_WAT_REPLACETEXT)<>0 then

+      if ServiceExists(MS_WAT_REPLACETEXT) then

         wr:=pWideChar(CallService(MS_WAT_REPLACETEXT,0,lparam(@line)))

       else

         wr:=@line;

diff --git a/plugins/Watrack/i_gui.inc b/plugins/Watrack/i_gui.inc
index 7c77ab6ad7..0128d7c566 100644
--- a/plugins/Watrack/i_gui.inc
+++ b/plugins/Watrack/i_gui.inc
@@ -50,7 +50,7 @@ begin
   else

     Menu_ModifyItem(hMenuDisable, 'Disable WATrack', IcoLib_GetIcon(IcoBtnEnable,0));

 

-  if ServiceExists(MS_TTB_SETBUTTONSTATE)<>0 then

+  if ServiceExists(MS_TTB_SETBUTTONSTATE) then

   begin

     if f1<>0 then

     begin

@@ -75,7 +75,7 @@ begin
   Menu_ModifyItem(hMenuDisable, nil, IcoLib_GetIcon(IcoBtnEnable,0));

 

   // toptoolbar

-  if ServiceExists(MS_TTB_GETBUTTONOPTIONS)<>0 then

+  if ServiceExists(MS_TTB_GETBUTTONOPTIONS) then

   begin

     CallService(MS_TTB_GETBUTTONOPTIONS,(ttbState shl 16)+TTBO_ALLDATA,tlparam(@ttb));

     ttb.hIconDn:=IcoLib_GetIcon(IcoBtnEnable,0);

diff --git a/plugins/Watrack/kolframe/kolframe.pas b/plugins/Watrack/kolframe/kolframe.pas
index 20acfa9ffb..c8e33ce408 100644
--- a/plugins/Watrack/kolframe/kolframe.pas
+++ b/plugins/Watrack/kolframe/kolframe.pas
@@ -198,7 +198,7 @@ var
   FrameWnd:HWND;

 begin

   result:=false;

-  if ServiceExists(MS_CLIST_FRAMES_ADDFRAME)=0 then

+  if not ServiceExists(MS_CLIST_FRAMES_ADDFRAME) then

     exit;

 

   if parent=0 then

diff --git a/plugins/Watrack/myshows/i_myshows_api.inc b/plugins/Watrack/myshows/i_myshows_api.inc
index f753da56f4..25593311d7 100644
--- a/plugins/Watrack/myshows/i_myshows_api.inc
+++ b/plugins/Watrack/myshows/i_myshows_api.inc
@@ -36,7 +36,7 @@ begin
   end;

   StrCopyW(StrCopyEW(buf,'MyShows: '),TranslateW(ppc));

   

-  if ServiceExists(MS_POPUP_SHOWMESSAGEW)<>0 then

+  if ServiceExists(MS_POPUP_SHOWMESSAGEW) then

     CallService(MS_POPUP_SHOWMESSAGEW,TWPARAM(@buf),SM_WARNING)

   else

     MessageBoxW(0,@buf,'ERROR',MB_ICONERROR)

@@ -195,23 +195,11 @@ begin
   begin

     // Episode check

     StrCopy(StrCopyE(buf,API_URL+'profile/episodes/check/'),epId);

-//      json_free(epId);        // !! cause memory error (no need for GetName?)

-  //  StrCopy(request,API_URL+'profile/shows/');

+

     if SendMSRequest(buf,show) then

     begin

-{

-      if si.cover=nil then

-      begin

-        jn:=json_get(jroot,'show');

-        img:=json_as_string(json_get(jn,'image'));

-        si:=pointer(CallService(MS_WAT_RETURNGLOBAL,WAT_INF_UNICODE,0));

-        FastAnsiToWide(img,pSongInfoW(si)^.cover);

-        json_free(img);

-      end;

-}

-

       //!! add option to show it??

-      if ServiceExists(MS_POPUP_SHOWMESSAGEW)<>0 then

+      if ServiceExists(MS_POPUP_SHOWMESSAGEW) then

       begin

         jn:=json_get(jroot,'show');

         shId:=json_as_string(json_get(jn,'title'));

@@ -232,9 +220,6 @@ begin
         '" checked');

         CallService(MS_POPUP_SHOWMESSAGEW,TWPARAM(pc),SM_NOTIFY);

         mFreeMem(pc);

-

-  {!!json_free(shId);} mir_free(shId);

-  {!!json_free(epId);} mir_free(epId);

       end;

       result:=true;

     end;

diff --git a/plugins/Watrack/myshows/myshows.pas b/plugins/Watrack/myshows/myshows.pas
index 53925f857b..cc89e9be16 100644
--- a/plugins/Watrack/myshows/myshows.pas
+++ b/plugins/Watrack/myshows/myshows.pas
@@ -109,13 +109,10 @@ begin
       begin

         if pSongInfo(lParam).width>0 then // for video only

         begin

-//!!          if ServiceExists(MS_JSON_GETINTERFACE)<>0 then

-          begin

-            timervalue:=integer(pSongInfo(lParam).total)*10*msh_scrobpos; // 1000(msec) div 100(%)

-            if timervalue=0 then

-              timervalue:=DefTimerValue;

-            hTimer:=SetTimer(0,0,timervalue,@TimerProc);

-          end;

+          timervalue:=integer(pSongInfo(lParam).total)*10*msh_scrobpos; // 1000(msec) div 100(%)

+          if timervalue=0 then

+            timervalue:=DefTimerValue;

+          hTimer:=SetTimer(0,0,timervalue,@TimerProc);

         end;

       end;

     end;

diff --git a/plugins/Watrack/players/pl_mradio.pas b/plugins/Watrack/players/pl_mradio.pas
index 2d27287796..e41a2bdeb2 100644
--- a/plugins/Watrack/players/pl_mradio.pas
+++ b/plugins/Watrack/players/pl_mradio.pas
@@ -186,7 +186,7 @@ var
   ptr:PavatarCacheEntry;

 begin

   result:=nil;

-  if ServiceExists(MS_AV_GETAVATARBITMAP)<>0 then

+  if ServiceExists(MS_AV_GETAVATARBITMAP) then

   begin

     ptr:=PavatarCacheEntry(CallService(MS_AV_GETAVATARBITMAP,CurrentStation,0));

     if ptr<>nil then

diff --git a/plugins/Watrack/popup/popups.pas b/plugins/Watrack/popup/popups.pas
index 089fe0b957..026f03e82b 100644
--- a/plugins/Watrack/popup/popups.pas
+++ b/plugins/Watrack/popup/popups.pas
@@ -247,7 +247,6 @@ begin
         colorBack       :=cb;

         colorText       :=ct;

 

-    //    if ServiceExists(MS_POPUP_REGISTERACTIONS)=0 then

         if ActionList=nil then

           flag:=0

         else

@@ -392,18 +391,18 @@ var
 begin

   result:=true;

   // Popups

-  newstate:=ServiceExists(MS_POPUP_ADDPOPUPW)<>0;

+  newstate:=ServiceExists(MS_POPUP_ADDPOPUPW);

   if newstate=PopupPresent then

     exit;

 

   PopupPresent:=newstate;

   if PopupPresent then

   begin

-    IsFreeImagePresent:=ServiceExists(MS_IMG_LOAD       )<>0;

-    IsPopup2Present   :=ServiceExists(MS_POPUP_ADDPOPUP2)<>0;

+    IsFreeImagePresent:=ServiceExists(MS_IMG_LOAD);

+    IsPopup2Present   :=ServiceExists(MS_POPUP_ADDPOPUP2);

     opthook:=HookEvent(ME_OPT_INITIALISE,@OnOptInitialise);

 

-    if ServiceExists(MS_POPUP_REGISTERACTIONS)<>0 then

+    if ServiceExists(MS_POPUP_REGISTERACTIONS) then

     begin

       if RegisterButtonIcons then

       begin

@@ -420,7 +419,7 @@ begin
   end;

 

   // TTB

-  newstate:=ServiceExists(MS_TTB_ADDBUTTON)<>0;

+  newstate:=ServiceExists(MS_TTB_ADDBUTTON);

   if newstate=(ttbInfo<>0) then

     exit;

 

@@ -433,7 +432,7 @@ begin
   end

   else

   begin

-    if ServiceExists(MS_TTB_REMOVEBUTTON)>0 then

+    if ServiceExists(MS_TTB_REMOVEBUTTON) then

       CallService(MS_TTB_REMOVEBUTTON,WPARAM(ttbInfo),0);

     ttbInfo:=0;

   end;

@@ -481,15 +480,15 @@ begin
   hMenuInfo:=Menu_AddMainMenuItem(@mi);

 

   ActionList:=nil;

-  if ServiceExists(MS_POPUP_ADDPOPUPW)<>0 then

+  if ServiceExists(MS_POPUP_ADDPOPUPW) then

   begin

-    IsFreeImagePresent:=ServiceExists(MS_IMG_LOAD       )<>0;

-    IsPopup2Present   :=ServiceExists(MS_POPUP_ADDPOPUP2)<>0;

+    IsFreeImagePresent:=ServiceExists(MS_IMG_LOAD);

+    IsPopup2Present   :=ServiceExists(MS_POPUP_ADDPOPUP2);

     PopupPresent:=true;

     opthook:=HookEvent(ME_OPT_INITIALISE,@OnOptInitialise);

     loadpopup;

 

-    if ServiceExists(MS_POPUP_REGISTERACTIONS)<>0 then

+    if ServiceExists(MS_POPUP_REGISTERACTIONS) then

     begin

       if RegisterButtonIcons then

       begin

@@ -508,7 +507,7 @@ begin
 

   plStatusHook:=HookEvent(ME_WAT_NEWSTATUS,@NewPlStatus);

 

-  if ServiceExists(MS_TTB_ADDBUTTON)>0 then

+  if ServiceExists(MS_TTB_ADDBUTTON) then

   begin

     onttbhook:=0;

     OnTTBLoaded(0,0);

@@ -532,7 +531,7 @@ begin
 

   if ttbInfo<>0 then

   begin

-    if ServiceExists(MS_TTB_REMOVEBUTTON)>0 then

+    if ServiceExists(MS_TTB_REMOVEBUTTON) then

       CallService(MS_TTB_REMOVEBUTTON,WPARAM(ttbInfo),0);

     ttbInfo:=0;

   end;

diff --git a/plugins/Watrack/status/i_opt_11.inc b/plugins/Watrack/status/i_opt_11.inc
index 8039dae4c1..f996cae6c9 100644
--- a/plugins/Watrack/status/i_opt_11.inc
+++ b/plugins/Watrack/status/i_opt_11.inc
@@ -142,7 +142,7 @@ begin
 

   StrCopy(buf,GetProtoName(CurProto));

   StrCat(buf,PS_GETCUSTOMSTATUSICON);

-  endis:=ServiceExists(buf)<>0;

+  endis:=ServiceExists(buf);

 

   EnableWindow(GetDlgItem(Dialog,IDC_CBEX       ),endis);

   EnableWindow(GetDlgItem(Dialog,IDC_XSTAT_AUDIO),endis);

diff --git a/plugins/Watrack/status/i_status.inc b/plugins/Watrack/status/i_status.inc
index 9bb071a785..bbd8f2e1fa 100644
--- a/plugins/Watrack/status/i_status.inc
+++ b/plugins/Watrack/status/i_status.inc
@@ -91,9 +91,7 @@ begin
         todo  :=true;

       end;

 

-      if (UseListeningTo<>BST_UNCHECKED) and

-         IsTunesSupported(j) then

-//         (ProtoServiceExists(proto,PS_SET_LISTENINGTO)<>0) then

+      if (UseListeningTo<>BST_UNCHECKED) and IsTunesSupported(j) then

       begin

         if doClear then

           CallProtoService(proto,PS_SET_LISTENINGTO,0,0)

diff --git a/plugins/Watrack/status/status.pas b/plugins/Watrack/status/status.pas
index cc52e6e1d1..81c1f20d9a 100644
--- a/plugins/Watrack/status/status.pas
+++ b/plugins/Watrack/status/status.pas
@@ -69,11 +69,6 @@ begin
   hINS:=CreateServiceFunction(MS_WAT_INSERT,@InsertProc);

   reghotkey;

   plStatusHook:=HookEvent(ME_WAT_NEWSTATUS,@NewPlStatus);

-

-//  mStatus.ModuleStat:=1;

-

-//  if ServiceExists(MS_LISTENINGTO_GETPARSEDTEXT)<>0 then

-//    hLTo:=CreateServiceFunction(MS_LISTENINGTO_GETPARSEDTEXT,@ListenProc);

 end;

 

 procedure DeInitProc(aSetDisable:boolean);

diff --git a/plugins/Watrack/watrack.dpr b/plugins/Watrack/watrack.dpr
index d766d53b06..c1c947704a 100644
--- a/plugins/Watrack/watrack.dpr
+++ b/plugins/Watrack/watrack.dpr
@@ -456,7 +456,7 @@ begin
   end;

 

   // TTB

-  newstate:=ServiceExists(MS_TTB_ADDBUTTON)<>0;

+  newstate:=ServiceExists(MS_TTB_ADDBUTTON);

   if newstate=(ttbState<>0) then

     exit;

 

@@ -471,7 +471,7 @@ begin
   end

   else

   begin

-    if ServiceExists(MS_TTB_REMOVEBUTTON)>0 then

+    if ServiceExists(MS_TTB_REMOVEBUTTON) then

       CallService(MS_TTB_REMOVEBUTTON,WPARAM(ttbState),0);

     ttbState:=0;

   end;

@@ -520,7 +520,7 @@ begin
 

   CreateMenus;

 

-  if ServiceExists(MS_TTB_ADDBUTTON)<>0 then

+  if ServiceExists(MS_TTB_ADDBUTTON) then

     HookEvent(ME_TTB_MODULELOADED,@OnTTBLoaded)

   else

     ttbState:=0;

@@ -608,7 +608,7 @@ begin
 

   if ttbState<>0 then

   begin

-    if ServiceExists(MS_TTB_REMOVEBUTTON)>0 then

+    if ServiceExists(MS_TTB_REMOVEBUTTON) then

       CallService(MS_TTB_REMOVEBUTTON,TWPARAM(ttbState),0);

     ttbState:=0;

   end;

diff --git a/plugins/mRadio/rframeapi.pas b/plugins/mRadio/rframeapi.pas
index 449f80700b..c0cc1702bc 100644
--- a/plugins/mRadio/rframeapi.pas
+++ b/plugins/mRadio/rframeapi.pas
@@ -203,7 +203,7 @@ var
   tr:TRECT;

   cid:TColourID;

 begin

-  if ServiceExists(MS_CLIST_FRAMES_ADDFRAME)=0 then

+  if not ServiceExists(MS_CLIST_FRAMES_ADDFRAME) then

     exit;

   if parent=0 then

     parent:=cli^.hwndContactList;