Pascal-style type correction

Letter case correction
small fixes
Actman UA part dialog slightly changed

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

41 files changed, 101 insertions, 88 deletions

diff --git a/plugins/Watrack/HlpDlg.pas b/plugins/Watrack/HlpDlg.pas
index c420345bd4..a27a93c85c 100644
--- a/plugins/Watrack/HlpDlg.pas
+++ b/plugins/Watrack/HlpDlg.pas
@@ -32,7 +32,7 @@ const
 const

   COLORDLG = 'COLOR';

 

-function ColorHelpDlg(Dialog:HWnd;hMessage,wParam,lParam:DWord):integer; stdcall;

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

 var

   ps:tPaintStruct;

   br:hBrush;

diff --git a/plugins/Watrack/formats/fmt_m4a.pas b/plugins/Watrack/formats/fmt_m4a.pas
index 1bfcf2309a..23c819c57b 100644
--- a/plugins/Watrack/formats/fmt_m4a.pas
+++ b/plugins/Watrack/formats/fmt_m4a.pas
@@ -81,13 +81,13 @@ type
     NumEntires  :dword;

     DescSize    :dword;

     CodingName  :array[0..3] of AnsiChar;

-    Reserved    :array[0..5] of Byte;

-    RefIndex    :Word;

+    Reserved    :array[0..5] of byte;

+    RefIndex    :word;

     Reserved_   :array[0..1] of dword;

-    ChannelCount:Word;

-    SampleSize  :Word;

-    Pre_defined :Word;

-    Reserved___ :Word;

+    ChannelCount:word;

+    SampleSize  :word;

+    Pre_defined :word;

+    Reserved___ :word;

     Samplerate  :dword;

   end;

   pmvhd = ^mvhd;

diff --git a/plugins/Watrack/formats/tag_id3v2.inc b/plugins/Watrack/formats/tag_id3v2.inc
index b1f833ea2a..78660fdb6d 100644
--- a/plugins/Watrack/formats/tag_id3v2.inc
+++ b/plugins/Watrack/formats/tag_id3v2.inc
@@ -65,7 +65,7 @@ type
   pID3v2FrameHdr = ^tID3v2FrameHdr;

   tID3v2FrameHdrOld = packed record

     ID  : array [0..2] of byte; { Frame ID }

-    Size: array [0..2] of Byte; { Size excluding header }

+    Size: array [0..2] of byte; { Size excluding header }

   end;

   pID3v2FrameHdrOld = ^tID3v2FrameHdrOld;

 

diff --git a/plugins/Watrack/i_opt_0.inc b/plugins/Watrack/i_opt_0.inc
index ab17d6ec0d..7f6723cad7 100644
--- a/plugins/Watrack/i_opt_0.inc
+++ b/plugins/Watrack/i_opt_0.inc
@@ -1,6 +1,6 @@
 {special tab: parts settings}

 

-function DlgProcOptions0(Dialog:HWnd;hMessage:UINT;wParam:WPARAM;lParam:LPARAM):LRESULT; stdcall;

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

 const

   hasApply:boolean=false;

 var

diff --git a/plugins/Watrack/i_opt_1.inc b/plugins/Watrack/i_opt_1.inc
index a3ecef9cfc..fe9c4c45aa 100644
--- a/plugins/Watrack/i_opt_1.inc
+++ b/plugins/Watrack/i_opt_1.inc
@@ -27,7 +27,7 @@ const
     (cpId:1361;cpName:'Korean (Johab)'));

 

 var

-  hCpCombo:hwnd;

+  hCpCombo:HWND;

 

 function FillCpCombo(astr:PAnsiChar):boolean; stdcall;

 var

@@ -52,7 +52,7 @@ begin
   end;

 end;

 

-function DlgProcOptions1(Dialog:HWnd;hMessage:UINT;wParam:WPARAM;lParam:LPARAM):lresult; stdcall;

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

 const

   btnChkPlayer:bool=false;

   btnChkFormat:integer=0;

diff --git a/plugins/Watrack/kolframe/frm_dlg1.inc b/plugins/Watrack/kolframe/frm_dlg1.inc
index 401e04536d..8759ac059c 100644
--- a/plugins/Watrack/kolframe/frm_dlg1.inc
+++ b/plugins/Watrack/kolframe/frm_dlg1.inc
@@ -19,7 +19,7 @@ begin
   move(buf,result^,size);

 end;

 

-procedure SwitchBk(Dialog:hwnd);

+procedure SwitchBk(Dialog:HWND);

 var

   en:boolean;

 begin

@@ -38,7 +38,7 @@ begin
   EnableWindow(GetDlgItem(Dialog,IDC_USECOVER ),en);

 end;

 

-function FrameViewDlg(Dialog:HWnd; hMessage,wParam,lParam:DWord):integer; stdcall;

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

 const

   DlgInited:boolean=false;

 var

@@ -201,6 +201,7 @@ begin
         buf1^:=#0;

         buf:=GetDlgText(Dialog,IDC_FRMBKPIC,true);

         PathToRelative(buf,buf1);

+//        CallService(MS_UTILS_PATHTORELATIVE,twparam(buf),tlparam(buf1));

         if StrCmp(buf1,D.BkDefFile)<>0 then

         begin

           mFreeMem(D.BkDefFile);

diff --git a/plugins/Watrack/kolframe/frm_dlg2.inc b/plugins/Watrack/kolframe/frm_dlg2.inc
index 6325e05fcd..8f539c9dcb 100644
--- a/plugins/Watrack/kolframe/frm_dlg2.inc
+++ b/plugins/Watrack/kolframe/frm_dlg2.inc
@@ -2,7 +2,7 @@
 const

   MaxTxtScrollSpeed = 20;

 

-function FrameTextDlg(Dialog:HWnd; hMessage,wParam,lParam:DWord):integer; stdcall;

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

 const

   DlgInited      :boolean=false;

   TemplateChanged:Boolean=false;

diff --git a/plugins/Watrack/kolframe/frm_frame.inc b/plugins/Watrack/kolframe/frm_frame.inc
index 8911f868c4..b1e6d9e262 100644
--- a/plugins/Watrack/kolframe/frm_frame.inc
+++ b/plugins/Watrack/kolframe/frm_frame.inc
@@ -3,7 +3,7 @@
 const

   WS_EX_LAYERED = $00080000;

 

-function SetLayeredWindowAttributes(Hwnd: THandle; crKey: COLORREF; bAlpha: Byte; dwFlags: DWORD): Boolean; stdcall;

+function SetLayeredWindowAttributes(Hwnd: THANDLE; crKey: COLORREF; bAlpha: byte; dwFlags: dword): Boolean; stdcall;

    external user32 name 'SetLayeredWindowAttributes';

 

 const

diff --git a/plugins/Watrack/kolframe/frm_trackbar.inc b/plugins/Watrack/kolframe/frm_trackbar.inc
index eb9ad5c285..0f24c83c54 100644
--- a/plugins/Watrack/kolframe/frm_trackbar.inc
+++ b/plugins/Watrack/kolframe/frm_trackbar.inc
@@ -10,7 +10,7 @@ type
     procedure CtrlResize(Sender: PObj);

     procedure Erase(Sender: PControl; DC: HDC);

     procedure Paint(Sender: PControl; DC: HDC);

-    procedure Scroll(Sender:PTrackbar; Code:Integer);

+    procedure Scroll(Sender:PTrackbar; Code:integer);

     procedure PressButton  (Sender: PControl;var Mouse: TMouseEventData);

     procedure UnPressButton(Sender: PControl;var Mouse: TMouseEventData);

     procedure DragButton   (Sender: PControl;var Mouse: TMouseEventData);

@@ -129,7 +129,7 @@ begin
     end;

 end;

 

-procedure tAWKTrackbar.Scroll(Sender:PTrackbar; Code:Integer);

+procedure tAWKTrackbar.Scroll(Sender:PTrackbar; Code:integer);

 begin

   if code=TB_ENDTRACK then

   begin

diff --git a/plugins/Watrack/kolframe/i_bitmap.inc b/plugins/Watrack/kolframe/i_bitmap.inc
index bee15fdda7..a34d897fbd 100644
--- a/plugins/Watrack/kolframe/i_bitmap.inc
+++ b/plugins/Watrack/kolframe/i_bitmap.inc
@@ -121,7 +121,7 @@ end;
 

 procedure PreMultiplyChanells(hbmp:HBITMAP);

 type

-  tPixel=array [0..3] of Byte;

+  tPixel=array [0..3] of byte;

 var

   bmp:windows.TBITMAP;

   flag:bool;

diff --git a/plugins/Watrack/kolframe/kolframe.pas b/plugins/Watrack/kolframe/kolframe.pas
index 27fe7dde26..8120e34f0e 100644
--- a/plugins/Watrack/kolframe/kolframe.pas
+++ b/plugins/Watrack/kolframe/kolframe.pas
@@ -105,7 +105,7 @@ begin
 

   case wParam of

     WAT_EVENT_PLAYERSTATUS: begin

-      case Integer(loword(lParam)) of

+      case integer(loword(lParam)) of

         WAT_PLS_NORMAL  : exit;

         WAT_PLS_NOMUSIC : begin

           if D.HideNoMusic then

@@ -231,7 +231,7 @@ end;
 

 procedure DestroyFrame;

 var

-  id:Integer;

+  id:integer;

 begin

   if (FrameCtrl<>nil) and (PWATFrameData(FrameCtrl.CustomData).FrameId>=0) then

   begin

diff --git a/plugins/Watrack/lastfm/i_last_api.inc b/plugins/Watrack/lastfm/i_last_api.inc
index 1f934646a3..ec42acfeeb 100644
--- a/plugins/Watrack/lastfm/i_last_api.inc
+++ b/plugins/Watrack/lastfm/i_last_api.inc
@@ -223,7 +223,7 @@ begin
 end;

 

 var

-  xmlparser:XML_API_W;

+  xmlparser:TXML_API_W;

 

 function FixInfo(info:pWideChar):pWideChar;

 var

@@ -300,7 +300,7 @@ begin
   begin

     UTF8ToWide(res,pcw);

     mFreeMem(res);

-    xmlparser.cbSize:={XML_API_SIZEOF_V1;//}SizeOf(XML_API_W);

+    xmlparser.cbSize:={XML_API_SIZEOF_V1;//}SizeOf(TXML_API_W);

     CallService(MS_SYSTEM_GET_XI,0,lparam(@xmlparser));

     with xmlparser do

     begin

@@ -424,7 +424,7 @@ begin
   begin

     UTF8ToWide(res,pcw);

     mFreeMem(res);

-    xmlparser.cbSize:={XML_API_SIZEOF_V1;//}SizeOf(XML_API_W);

+    xmlparser.cbSize:={XML_API_SIZEOF_V1;//}SizeOf(TXML_API_W);

     CallService(MS_SYSTEM_GET_XI,0,lparam(@xmlparser));

     with xmlparser do

     begin

@@ -533,7 +533,7 @@ begin
   begin

     UTF8ToWide(res,pcw);

     mFreeMem(res);

-    xmlparser.cbSize:={XML_API_SIZEOF_V1;//}SizeOf(XML_API_W);

+    xmlparser.cbSize:={XML_API_SIZEOF_V1;//}SizeOf(TXML_API_W);

     CallService(MS_SYSTEM_GET_XI,0,lparam(@xmlparser));

     with xmlparser do

     begin

diff --git a/plugins/Watrack/lastfm/i_last_dlg.inc b/plugins/Watrack/lastfm/i_last_dlg.inc
index b72545843e..ee1f96092f 100644
--- a/plugins/Watrack/lastfm/i_last_dlg.inc
+++ b/plugins/Watrack/lastfm/i_last_dlg.inc
@@ -37,7 +37,7 @@ begin
   mFreeMem(data.image);

 end;

 

-function DlgProcOptions(Dialog:HWnd;hMessage:UINT;wParam:WPARAM;lParam:LPARAM):lresult; stdcall;

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

 var

   tmp:longbool;

   bmp,wnd:HWND;

diff --git a/plugins/Watrack/lastfm/lastfm.pas b/plugins/Watrack/lastfm/lastfm.pas
index d2a5cbc8a7..46098c558b 100644
--- a/plugins/Watrack/lastfm/lastfm.pas
+++ b/plugins/Watrack/lastfm/lastfm.pas
@@ -73,7 +73,7 @@ begin
 

   if (lfm_login   <>nil) and (lfm_login^   <>#0) and

      (lfm_password<>nil) and (lfm_password^<>#0) then

-    mir_forkthread(@ThScrobble,nil);

+    {CloseHandle}(mir_forkthread(@ThScrobble,nil));

 end;

 

 function NewPlStatus(wParam:WPARAM;lParam:LPARAM):int;cdecl;

@@ -118,7 +118,7 @@ begin
     end;

 

     WAT_EVENT_PLAYERSTATUS: begin

-      case Integer(loword(lParam)) of

+      case integer(loword(lParam)) of

         WAT_PLS_NOMUSIC,WAT_PLS_NOTFOUND: begin

           if hTimer<>0 then

           begin

diff --git a/plugins/Watrack/myrtf.pas b/plugins/Watrack/myrtf.pas
index a789b95d6a..0e1751017a 100644
--- a/plugins/Watrack/myrtf.pas
+++ b/plugins/Watrack/myrtf.pas
@@ -5,7 +5,7 @@ unit MyRTF;
 interface

 uses windows;

 

-procedure SendRTF(wnd:hwnd;txt:PWideChar;isUnicode:Boolean;CP:integer=CP_ACP);

+procedure SendRTF(wnd:HWND;txt:PWideChar;isUnicode:Boolean;CP:integer=CP_ACP);

 

 implementation

 uses richedit,common,messages{,m_api};

@@ -60,7 +60,7 @@ begin
   result:=0;

 end;

 

-procedure WriteRTF(wnd:hwnd;const pszText:PAnsiChar);

+procedure WriteRTF(wnd:HWND;const pszText:PAnsiChar);

 var

   stream:TEDITSTREAM;

 begin

@@ -80,7 +80,7 @@ begin
   result:=0;

 end;

 

-procedure ReadRTF(wnd:hwnd;var dst:PAnsiChar);

+procedure ReadRTF(wnd:HWND;var dst:PAnsiChar);

 var

   stream:TEDITSTREAM;

 begin

@@ -191,7 +191,7 @@ begin
   end;

 end;

 

-procedure SendRTF(wnd:hwnd;txt:PWideChar;isUnicode:Boolean;CP:integer=CP_ACP);

+procedure SendRTF(wnd:HWND;txt:PWideChar;isUnicode:Boolean;CP:integer=CP_ACP);

 var

   tmp:PAnsiChar;

   sstart:integer;

diff --git a/plugins/Watrack/myshows/i_myshows_dlg.inc b/plugins/Watrack/myshows/i_myshows_dlg.inc
index 13740d5a34..1f51ed7d11 100644
--- a/plugins/Watrack/myshows/i_myshows_dlg.inc
+++ b/plugins/Watrack/myshows/i_myshows_dlg.inc
@@ -12,7 +12,7 @@ begin
   SetDlgItemTextW(dlg,IDC_DATA_INFO   ,'');

 end;

 

-function DlgProcOptions(Dialog:HWnd;hMessage:UINT;wParam:WPARAM;lParam:LPARAM):lresult; stdcall;

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

 const

   inited:bool=false;

 var

diff --git a/plugins/Watrack/myshows/myshows.pas b/plugins/Watrack/myshows/myshows.pas
index a26c7dd4ae..f09cc3cf08 100644
--- a/plugins/Watrack/myshows/myshows.pas
+++ b/plugins/Watrack/myshows/myshows.pas
@@ -144,7 +144,7 @@ begin
     end;

 

     WAT_EVENT_PLAYERSTATUS: begin

-      case Integer(loword(lParam)) of

+      case integer(loword(lParam)) of

         WAT_PLS_NOMUSIC,WAT_PLS_NOTFOUND: begin

           if hTimer<>0 then

           begin

diff --git a/plugins/Watrack/player.ini b/plugins/Watrack/player.ini
index 2b0ede81a3..3006b4e83c 100644
--- a/plugins/Watrack/player.ini
+++ b/plugins/Watrack/player.ini
@@ -28,7 +28,7 @@ file='AREZMEDIA.EXE'
 url='http://www.arezsoft.co.uk/'

 

 [Ashampoo Media Player]

-test='Ashampoo Media Player+'

+text='Ashampoo Media Player+'

 class='AMPMainWindow class'

 class1='AMP MainOwnerWindow Class'

 url='http://www2.ashampoo.com/webcache/html/1/product_2_0014___USD.htm'

@@ -130,7 +130,6 @@ Notes='Winamp API used to get more info'
 class='MPlayer - The Movie Player'

 url='http://www.mplayerhq.hu/'

 

-

 [Media Commander Express]

 class='TApplication'

 file='MCX.EXE'

@@ -146,6 +145,7 @@ url='http://www.grafmstudio.narod.ru/mlmaster.htm'
 class='wxWindowClassNR'

 file='MOREAMP.EXE'

 url='http://sourceforge.net/projects/moreamp/'

+

 [MPC-BE]

 class='MPC-BE'

 url='http://sourceforge.net/projects/mpcbe/'

diff --git a/plugins/Watrack/players/pl_apollo.pas b/plugins/Watrack/players/pl_apollo.pas
index 360b23ab89..1658f48b1d 100644
--- a/plugins/Watrack/players/pl_apollo.pas
+++ b/plugins/Watrack/players/pl_apollo.pas
@@ -63,7 +63,7 @@ end;
 

 function GetFileName(wnd:HWND;flags:integer):pWideChar;cdecl;

 var

-  tmpwnd:hwnd;

+  tmpwnd:HWND;

   ps:array [0..255] of AnsiChar;

 begin

   if GetStatus(wnd)<>WAT_MES_STOPPED then

@@ -83,7 +83,7 @@ end;
 

 function GetWndText(wnd:HWND):pWideChar;

 var

-  tmpwnd:hwnd;

+  tmpwnd:HWND;

   ps:array [0..255] of AnsiChar;

 begin

   tmpwnd:=SendMessage(wnd,WM_APOLLO_COMMAND,APOLLO_GETCURRENTLYPLAYEDTITLE,0);

@@ -167,7 +167,7 @@ end;
 

 function GetRemoteTitle(wnd:HWND):pWideChar;

 var

-  tmpwnd:hwnd;

+  tmpwnd:HWND;

   ps:array [0..255] of AnsiChar;

   num:integer;

 begin

diff --git a/plugins/Watrack/players/pl_behold.pas b/plugins/Watrack/players/pl_behold.pas
index 977a021034..ddac43cfa1 100644
--- a/plugins/Watrack/players/pl_behold.pas
+++ b/plugins/Watrack/players/pl_behold.pas
@@ -55,7 +55,7 @@ end;
 

 function GetVersion(wnd:HWND):integer;

 begin

-  result:=DWORD(SendMessage(wnd,WM_BHCMD,WMBH_GETVERSION,0));

+  result:=dword(SendMessage(wnd,WM_BHCMD,WMBH_GETVERSION,0));

   result:=((result shr 16) shl 8)+LoWord(result);

 end;

 

@@ -92,7 +92,7 @@ end;
 

 function GetVolume(wnd:HWND):cardinal;

 begin

-  result:=WORD(SendMessage(wnd,WM_BHCMD,WMBH_GETVOLUME,0));

+  result:=word(SendMessage(wnd,WM_BHCMD,WMBH_GETVOLUME,0));

   result:=(result shl 16)+(result shr 12);

 end;

 

@@ -103,12 +103,12 @@ end;
 

 function VolDn(wnd:HWND):integer;

 begin

-  result:=WORD(SendMessage(wnd,WM_BHCMD,WMBH_VOLUMEDOWN,0));

+  result:=word(SendMessage(wnd,WM_BHCMD,WMBH_VOLUMEDOWN,0));

 end;

 

 function VolUp(wnd:HWND):integer;

 begin

-  result:=WORD(SendMessage(wnd,WM_BHCMD,WMBH_VOLUMEUP,0));

+  result:=word(SendMessage(wnd,WM_BHCMD,WMBH_VOLUMEUP,0));

 end;

 

 function GetInfo(var SongInfo:tSongInfo;flags:integer):integer;cdecl;

diff --git a/plugins/Watrack/players/pl_bs.pas b/plugins/Watrack/players/pl_bs.pas
index 7fd2e9c5e5..efcd6c26d4 100644
--- a/plugins/Watrack/players/pl_bs.pas
+++ b/plugins/Watrack/players/pl_bs.pas
@@ -36,7 +36,7 @@ const
 const

   bspwnd:HWND = 0;

 

-function HiddenWindProc(wnd:HWnd; msg:UINT;wParam:WPARAM;lParam:LPARAM):integer; stdcall;

+function HiddenWindProc(wnd:HWND; msg:uint;wParam:WPARAM;lParam:LPARAM):LRESULT; stdcall;

 begin

   result:=DefWindowProc(wnd,msg,wParam,lParam);

 end;

diff --git a/plugins/Watrack/players/pl_cowon.pas b/plugins/Watrack/players/pl_cowon.pas
index 0977ea4b20..fb2d985038 100644
--- a/plugins/Watrack/players/pl_cowon.pas
+++ b/plugins/Watrack/players/pl_cowon.pas
@@ -69,7 +69,7 @@ const
   hostwnd :HWND = 0;

   tmpstr  :pWideChar=nil;

 

-function HiddenWindProc(wnd:HWnd; msg:UINT;wParam:WPARAM;lParam:LPARAM):integer; stdcall;

+function HiddenWindProc(wnd:HWND; msg:uint;wParam:WPARAM;lParam:LPARAM):LRESULT; stdcall;

 var

   cds:PCOPYDATASTRUCT;

 begin

@@ -106,7 +106,7 @@ begin
   end;

 end;

 

-function chwnd(awnd:hwnd;param:pdword):boolean; stdcall;

+function chwnd(awnd:HWND;param:pdword):boolean; stdcall;

 var

   s:array [0..255] of AnsiChar;

 begin

diff --git a/plugins/Watrack/players/pl_mpc.pas b/plugins/Watrack/players/pl_mpc.pas
index a2127cea76..bd0fade514 100644
--- a/plugins/Watrack/players/pl_mpc.pas
+++ b/plugins/Watrack/players/pl_mpc.pas
@@ -19,7 +19,7 @@ begin
     result:=FindWindowEx(0,wnd,MPCClass98,NIL);

 end;

 

-function chwnd(awnd:hwnd;Param:pdword):boolean; stdcall;

+function chwnd(awnd:HWND;Param:pdword):boolean; stdcall;

 var

   s:array [0..31] of AnsiChar;

   i:integer;

diff --git a/plugins/Watrack/players/pl_mradio.pas b/plugins/Watrack/players/pl_mradio.pas
index 68589eb159..b694fb912c 100644
--- a/plugins/Watrack/players/pl_mradio.pas
+++ b/plugins/Watrack/players/pl_mradio.pas
@@ -75,7 +75,7 @@ begin
   CurrentStation:=db_find_first(playername);

   while CurrentStation<>0 do

   begin

-    i:=DBReadWord(CurrentStation,playername,'Status',WORD(-1));

+    i:=DBReadWord(CurrentStation,playername,'Status',word(-1));

     if i=ID_STATUS_ONLINE then

     begin

       result:=1;

diff --git a/plugins/Watrack/players/pl_winamp.pas b/plugins/Watrack/players/pl_winamp.pas
index 254475e09a..e107cb81f6 100644
--- a/plugins/Watrack/players/pl_winamp.pas
+++ b/plugins/Watrack/players/pl_winamp.pas
@@ -96,7 +96,7 @@ var
   pid:dword;

   op:THANDLE;

   buf:array [0..1023] of AnsiChar;

-  tmp:{$IFDEF FPC}LongWord{$ELSE}ulong_ptr{$ENDIF};

+  tmp:{$IFDEF FPC}longword{$ELSE}ulong_ptr{$ENDIF};

 begin

   result:=nil;

   if (flags and WAT_OPT_IMPLANTANT)<>0 then

diff --git a/plugins/Watrack/popup/pop_dlg.inc b/plugins/Watrack/popup/pop_dlg.inc
index 865cf94401..2d8c0ce79b 100644
--- a/plugins/Watrack/popup/pop_dlg.inc
+++ b/plugins/Watrack/popup/pop_dlg.inc
@@ -4,7 +4,7 @@
 const

   DLGPOPUP = 'POPUP';

 

-function DlgPopupOpt(Dialog:HWnd;hMessage:Uint;wParam:WPARAM;lParam:LPARAM):LRESULT; stdcall;

+function DlgPopupOpt(Dialog:HWND;hMessage:Uint;wParam:WPARAM;lParam:LPARAM):LRESULT; stdcall;

 const

   dlginit:boolean=false;

 var

diff --git a/plugins/Watrack/popup/pop_vars.inc b/plugins/Watrack/popup/pop_vars.inc
index 4a845aaadc..2bbfce178b 100644
--- a/plugins/Watrack/popup/pop_vars.inc
+++ b/plugins/Watrack/popup/pop_vars.inc
@@ -21,7 +21,7 @@ var
   hMenuInfo   :THANDLE;

   ssmi,sic,

   plStatusHook:THANDLE;

-  PopupPresent:Bool;

+  PopupPresent:bool;

   onttbhook,

   opthook:THANDLE;

   ttbInfo:THANDLE;
\ No newline at end of file
diff --git a/plugins/Watrack/popup/popups.pas b/plugins/Watrack/popup/popups.pas
index f22a9c44bd..eda32a07ce 100644
--- a/plugins/Watrack/popup/popups.pas
+++ b/plugins/Watrack/popup/popups.pas
@@ -71,7 +71,7 @@ begin
   mFreeMem(buf);

 end;

 

-function DumbPopupDlgProc(Wnd:hwnd;msg:uint;wParam:integer;lParam:longint):integer;stdcall;

+function DumbPopupDlgProc(Wnd:HWND;msg:dword;wParam:WPARAM;lParam:LPARAM):LRESULT; stdcall;

 var

   si:pSongInfo;

   h:HBITMAP;

@@ -312,7 +312,7 @@ end;
 

 procedure regpophotkey;

 var

-  hkrec:HOTKEYDESC;

+  hkrec:THOTKEYDESC;

 begin

   if DisablePlugin=dsPermanent then

     exit;

diff --git a/plugins/Watrack/proto/i_proto_dlg.inc b/plugins/Watrack/proto/i_proto_dlg.inc
index ebfd6d31c9..5d3b6e2bb4 100644
--- a/plugins/Watrack/proto/i_proto_dlg.inc
+++ b/plugins/Watrack/proto/i_proto_dlg.inc
@@ -2,7 +2,8 @@
 

 procedure SetAllContactStat(hwndList:HWND);

 var

-  hContact,hItem:THANDLE;

+  hContact:TMCONTACT;

+  hItem:THANDLE;

 begin

   hContact:=db_find_first();

   while hContact<>0 do

@@ -19,7 +20,8 @@ end;
 

 procedure SaveAllContactStat(hwndList:HWND);

 var

-  hContact,hItem:THANDLE;

+  hContact:TMCONTACT;

+  hItem:THANDLE;

 begin

   hContact:=db_find_first();

   while hContact<>0 do

@@ -75,7 +77,7 @@ begin
   if IsDlgButtonChecked(Dlg,IDC_ISEND      )<>BST_UNCHECKED then HistMask:=HistMask or hmISend;

 end;

 

-function DlgProcOptions(Dialog:HWnd;hMessage:UINT;wParam:WPARAM;lParam:LPARAM):lresult; stdcall;

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

 const

   Changed:integer=0;

 //  hItemAll:THANDLE=0;

diff --git a/plugins/Watrack/proto/proto.pas b/plugins/Watrack/proto/proto.pas
index b26c6dba04..d2b2d8b4d4 100644
--- a/plugins/Watrack/proto/proto.pas
+++ b/plugins/Watrack/proto/proto.pas
@@ -57,7 +57,7 @@ var
 {$include i_proto_opt.inc}

 {$include i_proto_dlg.inc}

 

-procedure AddEvent(hContact:MCONTACT;atype,flag:integer;data:pointer;size:integer;time:dword=0);

+procedure AddEvent(hContact:TMCONTACT;atype,flag:integer;data:pointer;size:integer;time:dword=0);

 var

   dbeo:TDBEVENTINFO;

 begin

@@ -404,7 +404,7 @@ end;
 

 procedure RegisterContacts;

 var

-  hContact:MCONTACT;

+  hContact:TMCONTACT;

 begin

   hContact:=db_find_first();

   while hContact<>0 do

@@ -445,6 +445,8 @@ begin
   desc._type :=PROTOTYPE_TRANSLATION;

 

   CallService(MS_PROTO_REGISTERMODULE,0,lparam(@desc));

+//  CreateProtoServiceFunction(PluginShort,PSS_MESSAGE ,@SendMessageProcW);

+//  CreateProtoServiceFunction(PluginShort,PSS_MESSAGEW,@SendMessageProcW);

   hSRM:=CreateProtoServiceFunction(PluginShort,PSR_MESSAGE ,@ReceiveMessageProcW);

 //  CreateProtoServiceFunction(PluginShort,PSR_MESSAGEW,@ReceiveMessageProcW);

 end;

@@ -500,7 +502,6 @@ begin
   result:=1;

 

   ReadOptions;

-

   RegisterIcons;

 

   FillChar(mi, sizeof(mi), 0);

@@ -524,6 +525,7 @@ procedure DeInitProc(aSetDisable:boolean);
 begin

   if aSetDisable then

     SetModStatus(0);

+

   UnhookEvent(hAddUserHook);

   UnhookEvent(contexthook);

   UnhookEvent(icchangedhook);

diff --git a/plugins/Watrack/srv_format.pas b/plugins/Watrack/srv_format.pas
index aa892bb7da..58c046c712 100644
--- a/plugins/Watrack/srv_format.pas
+++ b/plugins/Watrack/srv_format.pas
@@ -5,8 +5,8 @@ interface
 

 uses windows,wat_api;

 

-procedure DefFillFormatList (hwndList:hwnd);

-procedure DefCheckFormatList(hwndList:hwnd);

+procedure DefFillFormatList (hwndList:HWND);

+procedure DefCheckFormatList(hwndList:HWND);

 function ProcessFormatLink:integer;

 

 function GetFileFormatInfo(var dst:tSongInfo):integer;

@@ -111,7 +111,7 @@ begin
   result:=WAT_RES_NOTFOUND;

 end;

 

-procedure DefFillFormatList(hwndList:hwnd);

+procedure DefFillFormatList(hwndList:HWND);

 var

   item:LV_ITEMA;

   lvc:LV_COLUMN;

@@ -145,7 +145,7 @@ begin
   ListView_SetColumnWidth(hwndList,0,LVSCW_AUTOSIZE);

 end;

 

-procedure DefCheckFormatList(hwndList:hwnd);

+procedure DefCheckFormatList(hwndList:HWND);

 var

   i,j,k:integer;

   item:LV_ITEMA;

diff --git a/plugins/Watrack/srv_player.pas b/plugins/Watrack/srv_player.pas
index dff61191b5..be55c6f2a2 100644
--- a/plugins/Watrack/srv_player.pas
+++ b/plugins/Watrack/srv_player.pas
@@ -18,8 +18,8 @@ function SendCommand  (wParam:WPARAM;lParam:LPARAM;flags:integer):int_ptr;
 procedure ClearPlayers;

 

 // options procedures

-procedure DefFillPlayerList (hwndList:hwnd);

-procedure DefCheckPlayerList(hwndList:hwnd);

+procedure DefFillPlayerList (hwndList:HWND);

+procedure DefCheckPlayerList(hwndList:HWND);

 

 type

   MusEnumProc = function(param:PAnsiChar;lParam:LPARAM):bool;stdcall;

@@ -255,7 +255,7 @@ begin
     result:=nil;

 end;

 

-procedure DefFillPlayerList(hwndList:hwnd);

+procedure DefFillPlayerList(hwndList:HWND);

 var

   item:LV_ITEMA;

   lvc:TLVCOLUMN;

@@ -293,7 +293,7 @@ begin
 //  ListView_SetColumnWidth(hwndList,0,LVSCW_AUTOSIZE);

 end;

 

-procedure DefCheckPlayerList(hwndList:hwnd);

+procedure DefCheckPlayerList(hwndList:HWND);

 var

   i,j,k:integer;

   item:LV_ITEMA;

diff --git a/plugins/Watrack/stat/stat_dlg.inc b/plugins/Watrack/stat/stat_dlg.inc
index 6a3747c476..be0887f06d 100644
--- a/plugins/Watrack/stat/stat_dlg.inc
+++ b/plugins/Watrack/stat/stat_dlg.inc
@@ -2,7 +2,7 @@
 

 {$include stat_rc.inc}

 

-procedure SetReportMask(Dlg:hwnd);

+procedure SetReportMask(Dlg:HWND);

 begin

   ReportMask:=0;

   if IsDlgButtonChecked(Dlg,IDC_FREQART)=BST_CHECKED then

@@ -19,7 +19,7 @@ begin
     ReportMask:=ReportMask or stAlbum;

 end;

 

-procedure EnableItems(Dlg:hwnd;enable:boolean);

+procedure EnableItems(Dlg:HWND;enable:boolean);

 begin

   EnableWindow(GetDlgItem(Dlg,IDC_STATNAME) ,enable);

   EnableWindow(GetDlgItem(Dlg,IDC_SNBUTTON) ,enable);

@@ -46,7 +46,7 @@ begin
   EnableWindow(GetDlgItem(Dlg,IDC_AUTOSORT) ,enable);

 end;

 

-function DlgProcOptions(Dialog:HWnd; hMessage:dword;wParam:WPARAM;lParam:LPARAM):LRESULT; stdcall;

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

 const

   changed:boolean=false;

 var

@@ -186,6 +186,7 @@ begin
         begin

           buf1[0]:=#0;

           PathToRelative(buf,buf1);

+//          CallService(MS_UTILS_PATHTORELATIVE,TWPARAM(@buf),TLPARAM(@buf1));

           StrDup(StatName,buf1);

         end;

 

@@ -195,6 +196,7 @@ begin
         begin

           buf1[0]:=#0;

           PathToRelative(buf,buf1);

+//          CallService(MS_UTILS_PATHTORELATIVE,TWPARAM(@buf),TLPARAM(@buf1));

           StrDup(ReportName,buf1);

         end;

 

@@ -204,6 +206,7 @@ begin
         begin

           buf1[0]:=#0;

           PathToRelative(buf,buf1);

+//          CallService(MS_UTILS_PATHTORELATIVE,TWPARAM(@buf),TLPARAM(@buf1));

           StrDup(TmplName,buf1);

         end;

 

diff --git a/plugins/Watrack/status/i_opt_11.inc b/plugins/Watrack/status/i_opt_11.inc
index 1e6e3ab8e9..9cf8cd778d 100644
--- a/plugins/Watrack/status/i_opt_11.inc
+++ b/plugins/Watrack/status/i_opt_11.inc
@@ -31,7 +31,7 @@ var
   CurProto,

   CurStatus:integer;

 

-procedure RedrawFields(Dialog:hwnd;proto:integer=-1);

+procedure RedrawFields(Dialog:HWND;proto:integer=-1);

 var

   wnd1,wnd:HWND;

   p:pWideChar;

@@ -110,7 +110,7 @@ begin
   Changed:=Changed and not DLGED_INIT;

 end;

 

-procedure SetScreenFull(Dialog:hwnd);

+procedure SetScreenFull(Dialog:HWND);

 var

   show:integer;

   buf:array [0..127] of AnsiChar;

@@ -159,13 +159,13 @@ begin
   RedrawFields(Dialog);

 end;

 

-procedure SetTemplate(Dialog:hwnd;idc:integer;Tmpl:tTemplateType);

+procedure SetTemplate(Dialog:HWND;idc:integer;Tmpl:tTemplateType);

 begin

   SetTemplateStr   (GetDlgText(Dialog,ABS(idc)),Tmpl,CurProto,CurStatus);

   SetTemplateActive(idc>0                      ,Tmpl,CurProto,CurStatus);

 end;

 

-procedure SaveChanges(Dialog:hwnd);

+procedure SaveChanges(Dialog:HWND);

 var

   i,j:integer;

 begin

@@ -213,7 +213,7 @@ begin
   end;

 end;

 

-function SaveCBExValue(Dialog:HWnd;direct:boolean):cardinal;

+function SaveCBExValue(Dialog:HWND;direct:boolean):cardinal;

 var

   wnd:HWND;

   i,j,shift:cardinal;

@@ -234,7 +234,7 @@ begin
   result:=(i shr (8-shift)) and $FF;

 end;

 

-procedure FillCBType(Dialog:hwnd;proto:pAnsiChar=nil);

+procedure FillCBType(Dialog:HWND;proto:pAnsiChar=nil);

 var

   wnd:HWND;

   j:integer;

@@ -252,7 +252,7 @@ begin
     ShowWindow(GetDlgItem(Dialog,aListFields[j]),aShowFields[0][j]);

 end;

 

-function DlgProcOptions11(Dialog:HWnd;hMessage:UINT;wParam:WPARAM;lParam:LPARAM):lresult; stdcall;

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

 var

   Item:LV_ITEMA;

   buf:array [0..127] of AnsiChar;

diff --git a/plugins/Watrack/status/i_opt_12.inc b/plugins/Watrack/status/i_opt_12.inc
index 7414ecf9d7..507e644546 100644
--- a/plugins/Watrack/status/i_opt_12.inc
+++ b/plugins/Watrack/status/i_opt_12.inc
@@ -1,6 +1,6 @@
 {Templates}

 

-procedure SetScreenLite(Dialog:HWnd);

+procedure SetScreenLite(Dialog:HWND);

 var

   p:pWideChar;

 begin

@@ -18,12 +18,12 @@ begin
   Changed:=Changed and not DLGED_INIT;

 end;

 

-procedure SetTemplateLite(Dialog:HWnd;idc:integer;Tmpl:tTemplateType);

+procedure SetTemplateLite(Dialog:HWND;idc:integer;Tmpl:tTemplateType);

 begin

   SetTemplateStr(GetDlgText(Dialog,idc),Tmpl,0,0);

 end;

 

-procedure SaveChangesLite(Dialog:HWnd);

+procedure SaveChangesLite(Dialog:HWND);

 begin

   if (Changed and DLGED_BASE)<>0 then

   begin

@@ -45,7 +45,7 @@ begin
   end;

 end;

 

-function DlgProcOptions12(Dialog:HWnd;hMessage:UINT;wParam:WPARAM;lParam:LPARAM):lparam; stdcall;

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

 begin

   result:=0;

   case hMessage of

diff --git a/plugins/Watrack/status/i_opt_3.inc b/plugins/Watrack/status/i_opt_3.inc
index 423b7c22c1..432eebcf64 100644
--- a/plugins/Watrack/status/i_opt_3.inc
+++ b/plugins/Watrack/status/i_opt_3.inc
@@ -1,6 +1,6 @@
 {format specific}

 

-function DlgProcOptions3(Dialog:HWnd;hMessage:UINT;wParam:WPARAM;lParam:LPARAM):lresult; stdcall;

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

 const

   dlginit:boolean=false;

 var

diff --git a/plugins/Watrack/status/status.pas b/plugins/Watrack/status/status.pas
index 0bdc7cdcb5..6348ecbb72 100644
--- a/plugins/Watrack/status/status.pas
+++ b/plugins/Watrack/status/status.pas
@@ -15,7 +15,7 @@ const
 

 procedure reghotkey;

 var

-  hkrec:HOTKEYDESC;

+  hkrec:THOTKEYDESC;

 begin

 //  if DisablePlugin=dsPermanent then

 //    exit;

@@ -68,6 +68,10 @@ begin
   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);

@@ -130,6 +134,7 @@ begin
   mStatus.AddOption :=@AddOptionsPage;

   mStatus.Check     :=nil;

   mStatus.ModuleName:='Statuses';

+//  mStatus.ModuleStat:=0;

   ModuleLink        :=@mStatus;

 end;

 

diff --git a/plugins/Watrack/templates/i_expkey.inc b/plugins/Watrack/templates/i_expkey.inc
index 960fd1a43e..fd990cda31 100644
--- a/plugins/Watrack/templates/i_expkey.inc
+++ b/plugins/Watrack/templates/i_expkey.inc
@@ -17,7 +17,7 @@ end;
 

 procedure reginshotkey;

 var

-  hkrec:HOTKEYDESC;

+  hkrec:THOTKEYDESC;

 begin

   FillChar(hkrec,SizeOf(hkrec),0);

   with hkrec do

diff --git a/plugins/Watrack/templates/i_macro.inc b/plugins/Watrack/templates/i_macro.inc
index 68c0be6e33..23d04799a6 100644
--- a/plugins/Watrack/templates/i_macro.inc
+++ b/plugins/Watrack/templates/i_macro.inc
@@ -33,14 +33,14 @@ begin
     mFreeMem(vars[i].alias);

 end;

 

-function MacroHelpDlg(Dialog:HWnd;hMessage:UINT;wParam:WPARAM;lParam:LPARAM):integer; stdcall;

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

 const

   Changed:bool=false;

 var

   i:integer;

   itemw:LV_ITEMW;

   lvc:LV_COLUMN;

-  wnd:hwnd;

+  wnd:HWND;

   ws:PWideChar;

   s:pAnsiChar;

   rc:TRECT;

diff --git a/plugins/Watrack/templates/i_tmpl_dlg.inc b/plugins/Watrack/templates/i_tmpl_dlg.inc
index 185f91d608..c5534131ea 100644
--- a/plugins/Watrack/templates/i_tmpl_dlg.inc
+++ b/plugins/Watrack/templates/i_tmpl_dlg.inc
@@ -1,5 +1,5 @@
 {}

-function DlgProcOptions(Dialog:HWnd;hMessage:UINT;wParam:WPARAM;lParam:LPARAM):integer; stdcall;

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

 begin

   result:=0;

   case hMessage of

diff --git a/plugins/Watrack/watrack.dpr b/plugins/Watrack/watrack.dpr
index ca63bb7fa8..27d9547c1e 100644
--- a/plugins/Watrack/watrack.dpr
+++ b/plugins/Watrack/watrack.dpr
@@ -37,7 +37,7 @@ uses
 const

   MenuDisablePos = 500050000;

 

-function MirandaPluginInfoEx(mirandaVersion:DWORD):PPLUGININFOEX; cdecl;

+function MirandaPluginInfoEx(mirandaVersion:dword):PPLUGININFOEX; cdecl;

 begin

   result:=@PluginInfo;

   PluginInfo.cbSize     :=SizeOf(TPLUGININFOEX);

@@ -585,7 +585,7 @@ begin
   IsMultiThread:=true;

 

   // Register WATrack events

-  dbetd.cbSize     :=DBEVENTTYPEDESCR_SIZE;

+  dbetd.cbSize     :=SizeOf(TDBEVENTTYPEDESCR);

   dbetd.module     :=PluginShort;

   dbetd.textService:=nil;

   dbetd.iconService:=nil;