old/unused types removed from Pascal sources

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

4 files changed, 93 insertions, 93 deletions

diff --git a/plugins/Utils.pas/contact.pas b/plugins/Utils.pas/contact.pas
index 697c603591..3d0289cb34 100644
--- a/plugins/Utils.pas/contact.pas
+++ b/plugins/Utils.pas/contact.pas
@@ -6,7 +6,7 @@ interface
 uses windows, m_api;

 

 procedure FillContactList(list:hwnd; filter:boolean=true;format:pWideChar=nil);

-function FindContact(list:hwnd;contact:HCONTACT):integer;

+function FindContact(list:hwnd;contact:MCONTACT):integer;

 

 implementation

 

@@ -17,7 +17,7 @@ const
 

 procedure FillContactList(list:hwnd; filter:boolean=true;format:pWideChar=nil);

 var

-  hContact:THCONTACT;

+  hContact:MCONTACT;

   buf:array [0..511] of WideChar;

   buf1:array [0..63] of WideChar;

   p:PWideChar;

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

 end;

 

-function FindContact(list:hwnd;contact:HCONTACT):integer;

+function FindContact(list:hwnd;contact:MCONTACT):integer;

 var

   j:integer;

 begin

diff --git a/plugins/Utils.pas/dbsettings.pas b/plugins/Utils.pas/dbsettings.pas
index dfbdd8ee69..d8c2566c5d 100644
--- a/plugins/Utils.pas/dbsettings.pas
+++ b/plugins/Utils.pas/dbsettings.pas
@@ -4,78 +4,78 @@ interface
 

 uses windows,m_api;

 

-function DBReadByte (hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:byte =0):byte;

-function DBReadWord (hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:word =0):word;

-function DBReadDWord(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:dword=0):dword;

+function DBReadByte (hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:byte =0):byte;

+function DBReadWord (hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:word =0):word;

+function DBReadDWord(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:dword=0):dword;

 

-function DBReadSetting   (hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;dbv:PDBVARIANT):int_ptr;

-function DBReadSettingStr(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;dbv:PDBVARIANT):int_ptr;

+function DBReadSetting   (hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;dbv:PDBVARIANT):int_ptr;

+function DBReadSettingStr(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;dbv:PDBVARIANT):int_ptr;

 

-function DBReadStringLength(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar):integer;

-function DBReadString (hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;

+function DBReadStringLength(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar):integer;

+function DBReadString (hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;

          default:PAnsiChar=nil;enc:integer=DBVT_ASCIIZ):PAnsiChar;

-function DBReadUTF8   (hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:PAnsiChar=nil):PAnsiChar;

-function DBReadUnicode(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:PWideChar=nil):PWideChar;

+function DBReadUTF8   (hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:PAnsiChar=nil):PAnsiChar;

+function DBReadUnicode(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:PWideChar=nil):PWideChar;

 

-function DBReadStruct (hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;

+function DBReadStruct (hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;

          ptr:pointer;size:dword):uint_ptr;

-function DBWriteStruct(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;

+function DBWriteStruct(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;

          ptr:pointer;size:dword):Integer;

 

-function DBWriteSetting(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;dbv:PDBVARIANT):int_ptr;

-function DBWriteByte (hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:Byte ):int_ptr;

-function DBWriteWord (hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:Word ):int_ptr;

-function DBWriteDWord(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:dword):int_ptr;

+function DBWriteSetting(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;dbv:PDBVARIANT):int_ptr;

+function DBWriteByte (hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:Byte ):int_ptr;

+function DBWriteWord (hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:Word ):int_ptr;

+function DBWriteDWord(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:dword):int_ptr;

 

-function DBWriteString (hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;

+function DBWriteString (hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;

          val:PAnsiChar;enc:integer=DBVT_ASCIIZ):int_ptr;

-function DBWriteUTF8   (hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:PAnsiChar):int_ptr;

-function DBWriteUnicode(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:PWideChar):int_ptr;

+function DBWriteUTF8   (hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:PAnsiChar):int_ptr;

+function DBWriteUnicode(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:PWideChar):int_ptr;

 

 //function DBFreeVariant(dbv:PDBVARIANT):int_ptr;

-function DBDeleteSetting(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar):int_ptr;

+function DBDeleteSetting(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar):int_ptr;

 

-function DBDeleteGroup(hContact:HCONTACT;szModule:PAnsiChar;prefix:pAnsiChar=nil):int_ptr;

+function DBDeleteGroup(hContact:MCONTACT;szModule:PAnsiChar;prefix:pAnsiChar=nil):int_ptr;

 

 function DBDeleteModule(szModule:PAnsiChar):integer; // 0.8.0+

 

-function DBGetSettingType(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar):integer;

+function DBGetSettingType(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar):integer;

 

 implementation

 

 uses common;

 

-function DBReadByte(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:byte=0):byte;

+function DBReadByte(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:byte=0):byte;

   {$IFDEF AllowInline}inline;{$ENDIF}

 begin

   result:=db_get_b(hContact, szModule, szSetting, default);

 end;

 

-function DBReadWord(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:word=0):word;

+function DBReadWord(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:word=0):word;

   {$IFDEF AllowInline}inline;{$ENDIF}

 begin

   result:=db_get_w(hContact, szModule, szSetting, default);

 end;

 

-function DBReadDWord(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:dword=0):dword;

+function DBReadDWord(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:dword=0):dword;

   {$IFDEF AllowInline}inline;{$ENDIF}

 begin

   result:=db_get_dw(hContact, szModule, szSetting, default);

 end;

 

-function DBReadSetting(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;dbv:PDBVARIANT):int_ptr;

+function DBReadSetting(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;dbv:PDBVARIANT):int_ptr;

   {$IFDEF AllowInline}inline;{$ENDIF}

 begin

   result:=db_get(hContact, szModule, szSetting, dbv);

 end;

 

-function DBReadSettingStr(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;dbv:PDBVARIANT):int_ptr;

+function DBReadSettingStr(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;dbv:PDBVARIANT):int_ptr;

   {$IFDEF AllowInline}inline;{$ENDIF}

 begin

   result:=db_get_s(hContact, szModule, szSetting, dbv, DBVT_ASCIIZ);

 end;

 

-function DBReadStringLength(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar):integer;

+function DBReadStringLength(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar):integer;

 var

   dbv:TDBVARIANT;

   i:int_ptr;

@@ -90,7 +90,7 @@ begin
   DBFreeVariant(@dbv);

 end;

 

-function DBReadString(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;

+function DBReadString(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;

          default:PAnsiChar=nil;enc:integer=DBVT_ASCIIZ):PAnsiChar;

 var

   dbv:TDBVARIANT;

@@ -109,13 +109,13 @@ begin
   DBFreeVariant(@dbv);

 end;

 

-function DBReadUTF8(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:PAnsiChar=nil):PAnsiChar;

+function DBReadUTF8(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:PAnsiChar=nil):PAnsiChar;

   {$IFDEF AllowInline}inline;{$ENDIF}

 begin

   result:=DBReadString(hContact,szModule,szSetting,default,DBVT_UTF8);

 end;

 

-function DBReadUnicode(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:PWideChar=nil):PWideChar;

+function DBReadUnicode(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:PWideChar=nil):PWideChar;

 var

   dbv:TDBVARIANT;

   i:int_ptr;

@@ -133,7 +133,7 @@ begin
   DBFreeVariant(@dbv);

 end;

 

-function DBReadStruct(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;

+function DBReadStruct(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;

          ptr:pointer;size:dword):uint_ptr;

 var

   dbv:TDBVariant;

@@ -154,57 +154,57 @@ begin
     result:=0;

 end;

 

-function DBWriteStruct(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;

+function DBWriteStruct(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;

          ptr:pointer;size:dword):Integer;

   {$IFDEF AllowInline}inline;{$ENDIF}

 begin

   result:=db_set_blob(hContact, szModule, szSetting, ptr, size);

 end;

 

-function DBWriteSetting(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;dbv:PDBVARIANT):int_ptr;

+function DBWriteSetting(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;dbv:PDBVARIANT):int_ptr;

   {$IFDEF AllowInline}inline;{$ENDIF}

 begin

   Result:=db_set(hContact, szModule, szSetting, dbv);

 end;

 

-function DBWriteByte(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:Byte):int_ptr;

+function DBWriteByte(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:Byte):int_ptr;

   {$IFDEF AllowInline}inline;{$ENDIF}

 begin

   result:=db_set_b(hContact, szModule, szSetting, val);

 end;

 

-function DBWriteWord(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:Word):int_ptr;

+function DBWriteWord(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:Word):int_ptr;

   {$IFDEF AllowInline}inline;{$ENDIF}

 begin

   result:=db_set_w(hContact, szModule, szSetting, val);

 end;

 

-function DBWriteDWord(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:dword):int_ptr;

+function DBWriteDWord(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:dword):int_ptr;

   {$IFDEF AllowInline}inline;{$ENDIF}

 begin

   result:=db_set_dw(hContact, szModule, szSetting, val);

 end;

 

-function DBWriteString(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;

+function DBWriteString(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;

          val:PAnsiChar;enc:integer=DBVT_ASCIIZ):int_ptr;

   {$IFDEF AllowInline}inline;{$ENDIF}

 begin

   result:=db_set_s(hContact, szModule, szSetting, val);

 end;

 

-function DBWriteUTF8(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:PAnsiChar):int_ptr;

+function DBWriteUTF8(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:PAnsiChar):int_ptr;

   {$IFDEF AllowInline}inline;{$ENDIF}

 begin

   result:=db_set_utf(hContact, szModule, szSetting, val);

 end;

 

-function DBWriteUnicode(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:PWideChar):int_ptr;

+function DBWriteUnicode(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:PWideChar):int_ptr;

   {$IFDEF AllowInline}inline;{$ENDIF}

 begin

   result:=db_set_ws(hContact, szModule, szSetting, val);

 end;

 

-function DBDeleteSetting(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar):int_ptr;

+function DBDeleteSetting(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar):int_ptr;

   {$IFDEF AllowInline}inline;{$ENDIF}

 begin

   result:=db_unset(hContact, szModule, szSetting);

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

 end;

 

-function DBDeleteGroup(hContact:HCONTACT;szModule:PAnsiChar;prefix:pAnsiChar=nil):int_ptr;

+function DBDeleteGroup(hContact:MCONTACT;szModule:PAnsiChar;prefix:pAnsiChar=nil):int_ptr;

 var

   ces:TDBCONTACTENUMSETTINGS;

   p:PAnsiChar;

@@ -314,7 +314,7 @@ begin
   CallService(MS_DB_MODULE_DELETE,0,lParam(szModule));

 end;

 

-function DBGetSettingType(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar):integer;

+function DBGetSettingType(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar):integer;

 var

   ldbv:TDBVARIANT;

 begin

diff --git a/plugins/Utils.pas/mirutils.pas b/plugins/Utils.pas/mirutils.pas
index 19285b56f7..ea35e86e51 100644
--- a/plugins/Utils.pas/mirutils.pas
+++ b/plugins/Utils.pas/mirutils.pas
@@ -20,10 +20,10 @@ function RegisterSingleIcon(resname,ilname,descr,group:PAnsiChar):int;
 

 // others

 

-function ConvertFileName(src:pAnsiChar;hContact:HCONTACT=0):pAnsiChar; overload;

-function ConvertFileName(src:pWideChar;hContact:HCONTACT=0):pWideChar; overload;

-function ConvertFileName(src:pAnsiChar;dst:pAnsiChar;hContact:HCONTACT=0):pAnsiChar; overload;

-function ConvertFileName(src:pWideChar;dst:pWideChar;hContact:HCONTACT=0):pWideChar; overload;

+function ConvertFileName(src:pAnsiChar;hContact:MCONTACT=0):pAnsiChar; overload;

+function ConvertFileName(src:pWideChar;hContact:MCONTACT=0):pWideChar; overload;

+function ConvertFileName(src:pAnsiChar;dst:pAnsiChar;hContact:MCONTACT=0):pAnsiChar; overload;

+function ConvertFileName(src:pWideChar;dst:pWideChar;hContact:MCONTACT=0):pWideChar; overload;

 

 procedure ShowPopupW(text:pWideChar;title:pWideChar=nil);

 function GetAddonFileName(prefix,altname,path:PAnsiChar;ext:PAnsiChar):PAnsiChar;

@@ -31,31 +31,31 @@ function TranslateA2W(sz:PAnsiChar):PWideChar;
 function MirandaCP:integer;

 

 function isVarsInstalled:bool;

-function ParseVarString(astr:pAnsiChar;aContact:HCONTACT=0;extra:pAnsiChar=nil):pAnsiChar; overload;

-function ParseVarString(astr:pWideChar;aContact:HCONTACT=0;extra:pWideChar=nil):pWideChar; overload;

+function ParseVarString(astr:pAnsiChar;aContact:MCONTACT=0;extra:pAnsiChar=nil):pAnsiChar; overload;

+function ParseVarString(astr:pWideChar;aContact:MCONTACT=0;extra:pWideChar=nil):pWideChar; overload;

 function ShowVarHelp(dlg:HWND;id:integer=0):integer;

 

-function  IsChat(hContact:HCONTACT):bool;

-procedure SendToChat(hContact:HCONTACT;pszText:PWideChar);

-

-function LoadContact(group,setting:PAnsiChar):HCONTACT;

-function SaveContact(hContact:HCONTACT;group,setting:PAnsiChar):integer;

-

-function SetCListSelContact(hContact:HCONTACT):HCONTACT;

-function GetCListSelContact:HCONTACT; {$IFDEF DELPHI_10_UP}inline;{$ENDIF}

-function GetContactProtoAcc(hContact:HCONTACT):PAnsiChar;

-function  IsMirandaUser(hContact:HCONTACT):integer; // >0=Miranda; 0=Not miranda; -1=unknown

-procedure ShowContactDialog(hContact:HCONTACT;DblClk:boolean=true;anystatus:boolean=true);

-function  FindContactHandle(proto:pAnsiChar;const dbv:TDBVARIANT;is_chat:boolean=false):HCONTACT;

-function  WndToContact(wnd:hwnd):HCONTACT; overload;

-function  WndToContact:HCONTACT; overload;

-function  GetContactStatus(hContact:HCONTACT):integer;

+function  IsChat(hContact:MCONTACT):bool;

+procedure SendToChat(hContact:MCONTACT;pszText:PWideChar);

+

+function LoadContact(group,setting:PAnsiChar):MCONTACT;

+function SaveContact(hContact:MCONTACT;group,setting:PAnsiChar):integer;

+

+function SetCListSelContact(hContact:MCONTACT):MCONTACT;

+function GetCListSelContact:MCONTACT; {$IFDEF DELPHI_10_UP}inline;{$ENDIF}

+function GetContactProtoAcc(hContact:MCONTACT):PAnsiChar;

+function  IsMirandaUser(hContact:MCONTACT):integer; // >0=Miranda; 0=Not miranda; -1=unknown

+procedure ShowContactDialog(hContact:MCONTACT;DblClk:boolean=true;anystatus:boolean=true);

+function  FindContactHandle(proto:pAnsiChar;const dbv:TDBVARIANT;is_chat:boolean=false):MCONTACT;

+function  WndToContact(wnd:hwnd):MCONTACT; overload;

+function  WndToContact:MCONTACT; overload;

+function  GetContactStatus(hContact:MCONTACT):integer;

 // -2 - deleted account, -1 - disabled account, 0 - hidden

 // 1 - metacontact, 2 - submetacontact, positive - active

 // proto - ASSIGNED buffer

-function  IsContactActive(hContact:HCONTACT;proto:pAnsiChar=nil):integer;

+function  IsContactActive(hContact:MCONTACT;proto:pAnsiChar=nil):integer;

 

-function CreateGroupW(name:pWideChar;hContact:HCONTACT):integer;

+function CreateGroupW(name:pWideChar;hContact:MCONTACT):integer;

 

 function MakeGroupMenu(idxfrom:integer=100):HMENU;

 function GetNewGroupName(parent:HWND):pWideChar;

@@ -95,7 +95,7 @@ begin
   SendMessage(btn,BM_SETIMAGE,IMAGE_ICON,result);

 end;

 

-function ConvertFileName(src:pWideChar;dst:pWideChar;hContact:HCONTACT=0):pWideChar; overload;

+function ConvertFileName(src:pWideChar;dst:pWideChar;hContact:MCONTACT=0):pWideChar; overload;

 var

   pc:pWideChar;

 begin

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

 end;

 

-function ConvertFileName(src:pWideChar;hContact:HCONTACT=0):pWideChar; overload;

+function ConvertFileName(src:pWideChar;hContact:MCONTACT=0):pWideChar; overload;

 var

   buf1:array [0..511] of WideChar;

 begin

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

 end;

 

-function ConvertFileName(src:pAnsiChar;dst:pAnsiChar;hContact:HCONTACT=0):pAnsiChar; overload;

+function ConvertFileName(src:pAnsiChar;dst:pAnsiChar;hContact:MCONTACT=0):pAnsiChar; overload;

 var

   pc:pAnsiChar;

 begin

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

 end;

 

-function ConvertFileName(src:pAnsiChar;hContact:HCONTACT=0):pAnsiChar; overload;

+function ConvertFileName(src:pAnsiChar;hContact:MCONTACT=0):pAnsiChar; overload;

 var

   buf1:array [0..511] of AnsiChar;

 begin

@@ -165,7 +165,7 @@ begin
   result:=MirCP;

 end;

 

-function IsChat(hContact:HCONTACT):bool;

+function IsChat(hContact:MCONTACT):bool;

 begin

   result:=DBReadByte(hContact,

     PAnsiChar(CallService(MS_PROTO_GETCONTACTBASEPROTO,hContact,0)),

@@ -178,7 +178,7 @@ begin
   result:=ServiceExists(MS_VARS_FORMATSTRING)<>0;

 end;

 

-function ParseVarString(astr:pAnsiChar;aContact:HCONTACT=0;extra:pAnsiChar=nil):pAnsiChar;

+function ParseVarString(astr:pAnsiChar;aContact:MCONTACT=0;extra:pAnsiChar=nil):pAnsiChar;

 var

   tfi:TFORMATINFO;

   tmp,pc:pAnsiChar;

@@ -217,7 +217,7 @@ begin
   mir_free(pc);

 end;

 

-function ParseVarString(astr:pWideChar;aContact:HCONTACT=0;extra:pWideChar=nil):pWideChar;

+function ParseVarString(astr:pWideChar;aContact:MCONTACT=0;extra:pWideChar=nil):pWideChar;

 var

   tfi:TFORMATINFO;

   tmp,pc:pWideChar;

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

 end;

 

-function GetContactProtoAcc(hContact:HCONTACT):PAnsiChar;

+function GetContactProtoAcc(hContact:MCONTACT):PAnsiChar;

 begin

   if ServiceExists(MS_PROTO_GETCONTACTBASEACCOUNT)<>0 then

     result:=PAnsiChar(CallService(MS_PROTO_GETCONTACTBASEACCOUNT,hContact,0))

@@ -322,7 +322,7 @@ begin
     result:=PAnsiChar(CallService(MS_PROTO_GETCONTACTBASEPROTO,hContact,0));

 end;

 

-function IsMirandaUser(hContact:HCONTACT):integer; // >0=Miranda; 0=Not miranda; -1=unknown

+function IsMirandaUser(hContact:MCONTACT):integer; // >0=Miranda; 0=Not miranda; -1=unknown

 var

   sz:PAnsiChar;

 begin

@@ -337,7 +337,7 @@ begin
     result:=-1;

 end;

 

-function SetCListSelContact(hContact:HCONTACT):HCONTACT;

+function SetCListSelContact(hContact:MCONTACT):MCONTACT;

 var

   wnd:HWND;

 begin

@@ -348,12 +348,12 @@ begin
 //  SendMessage(wnd,CLM_ENSUREVISIBLE,hContact,0);

 end;

 

-function GetCListSelContact:HCONTACT;

+function GetCListSelContact:MCONTACT;

 begin

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

 end;

 

-function LoadContact(group,setting:PAnsiChar):HCONTACT;

+function LoadContact(group,setting:PAnsiChar):MCONTACT;

 var

   p,proto:pAnsiChar;

   section:array [0..63] of AnsiChar;

@@ -378,7 +378,7 @@ begin
     mFreeMem(dbv.szVal.W);

 end;

 

-function SaveContact(hContact:HCONTACT;group,setting:PAnsiChar):integer;

+function SaveContact(hContact:MCONTACT;group,setting:PAnsiChar):integer;

 var

   p,proto,uid:pAnsiChar;

   cws:TDBVARIANT;

@@ -420,9 +420,9 @@ begin
   end;

 end;

 

-function WndToContact(wnd:hwnd):HCONTACT; overload;

+function WndToContact(wnd:hwnd):MCONTACT; overload;

 var

-  hContact:THCONTACT;

+  hContact:MCONTACT;

   mwid:TMessageWindowInputData;

   mwod:TMessageWindowOutputData;

 begin

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

 end;

 

-function WndToContact:HCONTACT; overload;

+function WndToContact:MCONTACT; overload;

 var

   wnd:HWND;

 begin

@@ -465,7 +465,7 @@ begin
     result:=GetCListSelContact;

 end;

 

-function GetContactStatus(hContact:HCONTACT):integer;

+function GetContactStatus(hContact:MCONTACT):integer;

 var

   szProto:PAnsiChar;

 begin

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

 end;

 

-procedure ShowContactDialog(hContact:HCONTACT;DblClk:boolean=true;anystatus:boolean=true);

+procedure ShowContactDialog(hContact:MCONTACT;DblClk:boolean=true;anystatus:boolean=true);

 var

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

 begin

@@ -609,7 +609,7 @@ begin
   CallServiceSync(MS_GC_EVENT,0,lparam(@gce));

 end;

 

-procedure SendToChat(hContact:HCONTACT;pszText:PWideChar);

+procedure SendToChat(hContact:MCONTACT;pszText:PWideChar);

 var

   gci:TGC_INFO;

   pszModule:PAnsiChar;

@@ -633,11 +633,11 @@ begin
   end;

 end;

 

-function FindContactHandle(proto:pAnsiChar;const dbv:TDBVARIANT;is_chat:boolean=false):HCONTACT;

+function FindContactHandle(proto:pAnsiChar;const dbv:TDBVARIANT;is_chat:boolean=false):MCONTACT;

 var

   uid:pAnsiChar;

   ldbv:TDBVARIANT;

-  hContact:THCONTACT;

+  hContact:MCONTACT;

   pw:pWideChar;

 begin

   result:=0;

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

 end;

 

-function IsContactActive(hContact:HCONTACT;proto:pAnsiChar=nil):integer;

+function IsContactActive(hContact:MCONTACT;proto:pAnsiChar=nil):integer;

 var

   p:PPROTOACCOUNT;

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

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

 

 // Import plugin function adaptation

-function CreateGroupW(name:pWideChar;hContact:HCONTACT):integer;

+function CreateGroupW(name:pWideChar;hContact:MCONTACT):integer;

 var

   groupId:integer;

   groupIdStr:array [0..10] of AnsiChar;

diff --git a/plugins/Utils.pas/sparam.pas b/plugins/Utils.pas/sparam.pas
index 80a7b150db..43007b2c86 100644
--- a/plugins/Utils.pas/sparam.pas
+++ b/plugins/Utils.pas/sparam.pas
@@ -50,7 +50,7 @@ function SetParamLabel   (Dialog:HWND; lbl:pWideChar):HWND;
 

 procedure ClearParam    (flags:dword; var param);

 function  DuplicateParam(flags:dword; var sparam,dparam):dword;

-function  TranslateParam(param:uint_ptr;flags:dword;hContact:HCONTACT):uint_ptr;

+function  TranslateParam(param:uint_ptr;flags:dword;hContact:MCONTACT):uint_ptr;

 

 function CreateResultBlock(parent:HWND;x,y,width:integer;flags:dword=0):THANDLE;

 function ClearResultFields(Dialog:HWND):HWND;

@@ -651,7 +651,7 @@ begin
   result:=flags;

 end;

 

-function TranslateParam(param:uint_ptr;flags:dword;hContact:HCONTACT):uint_ptr;

+function TranslateParam(param:uint_ptr;flags:dword;hContact:MCONTACT):uint_ptr;

 var

   tmp1:pWideChar;

 begin