diff options
| -rw-r--r-- | plugins/Actman/i_inoutxm.inc | 2 | ||||
| -rw-r--r-- | plugins/Actman30/iac_contact.pas | 6 | ||||
| -rw-r--r-- | plugins/ExternalAPI/delphi/m_actman.inc | 25 | ||||
| -rw-r--r-- | plugins/Watrack/formats/fmt_ogg.pas | 18 |
4 files changed, 30 insertions, 21 deletions
diff --git a/plugins/Actman/i_inoutxm.inc b/plugins/Actman/i_inoutxm.inc index 65c9ba9936..41e705f418 100644 --- a/plugins/Actman/i_inoutxm.inc +++ b/plugins/Actman/i_inoutxm.inc @@ -817,7 +817,7 @@ begin DBVT_BLOB : begin
p1:=mir_base64_encode(cws.pbVal,cws.cpbVal);
AddAttr(node,ioCUID,FastAnsiToWide(p1,p));
- mFreeMem(p1);
+ mir_free(p1);
mFreeMem(p);
end;
end;
diff --git a/plugins/Actman30/iac_contact.pas b/plugins/Actman30/iac_contact.pas index c0a0740995..c7927a8266 100644 --- a/plugins/Actman30/iac_contact.pas +++ b/plugins/Actman30/iac_contact.pas @@ -7,7 +7,7 @@ implementation uses
windows, messages, commctrl,
m_api, global, iac_global, common,
- mircontacts, dlgshare, syswin, inouttext, base64,
+ mircontacts, dlgshare, syswin, inouttext,
wrapper, mirutils, dbsettings;
{$include i_cnst_contact.inc}
@@ -146,9 +146,9 @@ begin end;
DBVT_WCHAR : node.AddTextW('id',cws.szVal.W);
DBVT_BLOB : begin
- p1:=Base64Encode(cws.pbVal,cws.cpbVal);
+ p1:=mir_base64_encode(cws.pbVal,cws.cpbVal);
node.AddText('id',p1);
- mFreeMem(p1);
+ mir_free(p1);
end;
end;
end;
diff --git a/plugins/ExternalAPI/delphi/m_actman.inc b/plugins/ExternalAPI/delphi/m_actman.inc index 768c70ea53..8498732ba8 100644 --- a/plugins/ExternalAPI/delphi/m_actman.inc +++ b/plugins/ExternalAPI/delphi/m_actman.inc @@ -4,14 +4,6 @@ // defined in interfaces.inc
//const MIID_ACTMANAGER:MUUID='{9584DA04-FB4F-40c1-9325-E4F9CAAFCB5D}';
-// Old Actman compatibility
-const
- DBBranch = 'ActMan';
-const
- ACCF_DISABLED = $10000000; // action disabled
- ACCF_OVERLOAD = $01000000; // imported action overwrite old
- ACCF_IMPORTED = $08000000;
-
// new and common Actman data
const
AutoStartName:PWideChar = '#Autostart';
@@ -20,6 +12,23 @@ const ACCF_EXPORT = $08000000; // action to export (UA export)
ACCF_IMPORT = ACCF_EXPORT; // (UA import)
+//----- Old Actman compatibility -----
+const
+ DBBranch = 'ActMan';
+const
+ ACCF_DISABLED = $10000000; // action disabled
+ ACCF_OVERLOAD = $01000000; // imported action overwrite old
+ ACCF_IMPORTED = ACCF_EXPORT;
+ ACCF_VOLATILE = $04000000; // don't save in DB
+ ACCF_ID = $02000000; // for MS_ACT_SELECT, lParam is ID (else name)
+ ACCF_CLEAR = $01000000; // clear other flags, else - set
+ ACCF_FLAGS = ACCF_DISABLED or ACCF_EXPORT or ACCF_IMPORTED or ACCF_VOLATILE;
+const
+ ACTM_ACT = $10000000; // do not check, internal
+ ACTM_ACTS = $20000000; // do not check, internal
+ ACTM_RELOAD = $00000004;
+//----- End of compatibility block -----
+
type
pChain = ^tChain;
tChain = record
diff --git a/plugins/Watrack/formats/fmt_ogg.pas b/plugins/Watrack/formats/fmt_ogg.pas index 2e36f6d8df..d0ba567d08 100644 --- a/plugins/Watrack/formats/fmt_ogg.pas +++ b/plugins/Watrack/formats/fmt_ogg.pas @@ -3,14 +3,14 @@ unit fmt_OGG; {$include compilers.inc}
interface
-uses wat_api, m_api;
+uses wat_api;
-function ReadOGG(var Info:tSongInfo):boolean; cdecl;
-function ReadSPX(var Info:tSongInfo):boolean; cdecl;
-function ReadfLaC(var Info:tSongInfo):boolean; cdecl;
+function ReadOGG(var Info:wat_api.tSongInfo):boolean; cdecl;
+function ReadSPX(var Info:wat_api.tSongInfo):boolean; cdecl;
+function ReadfLaC(var Info:wat_api.tSongInfo):boolean; cdecl;
implementation
-uses windows,common,io,tags,srv_format,utils;
+uses windows,common,io,tags,srv_format,utils, m_api;
const
OGGSign = $5367674F; //OggS
@@ -109,7 +109,7 @@ type MD5:array [0..15] of byte;
end;
-procedure OGGGetComment(ptr:PAnsiChar;size:integer;var Info:tSongInfo);
+procedure OGGGetComment(ptr:PAnsiChar;size:integer;var Info:wat_api.tSongInfo);
var
alen,len,values:dword;
clen:int;
@@ -185,7 +185,7 @@ begin end;
end;
-function ReadSPX(var Info:tSongInfo):boolean; cdecl;
+function ReadSPX(var Info:wat_api.tSongInfo):boolean; cdecl;
var
f:THANDLE;
OGGHdr:tOGGHdr;
@@ -243,7 +243,7 @@ begin result:=0;
end;
-function ReadOGG(var Info:tSongInfo):boolean; cdecl;
+function ReadOGG(var Info:wat_api.tSongInfo):boolean; cdecl;
var
f:THANDLE;
OGGHdr:tOGGHdr;
@@ -368,7 +368,7 @@ begin CloseHandle(f);
end;
-function ReadfLaC(var Info:tSongInfo):boolean; cdecl;
+function ReadfLaC(var Info:wat_api.tSongInfo):boolean; cdecl;
var
f:THANDLE;
data64:int64;
|