diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-06-21 22:00:16 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-06-21 22:00:16 +0000 |
| commit | b81ce648978e75bc7db4cc3b8aa7d1b9fcb9239b (patch) | |
| tree | de3eb9058f630682a355ac5135b2efb60256b4ca /plugins/Utils.pas | |
| parent | ff758bb8a00f34eb77fd385b18afea24388a915f (diff) | |
MS_UTILS_REPLACEVARS -> Utils_ReplaceVars
git-svn-id: http://svn.miranda-ng.org/main/trunk@14316 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Utils.pas')
| -rw-r--r-- | plugins/Utils.pas/mirutils.pas | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/plugins/Utils.pas/mirutils.pas b/plugins/Utils.pas/mirutils.pas index 16d92a3cec..0b5fe5be68 100644 --- a/plugins/Utils.pas/mirutils.pas +++ b/plugins/Utils.pas/mirutils.pas @@ -146,19 +146,11 @@ function ParseVarString(astr:PAnsiChar;aContact:TMCONTACT=0;extra:PAnsiChar=nil) var
tfi:TFORMATINFO;
tmp,pc:PAnsiChar;
- dat:TREPLACEVARSDATA;
begin
if (astr=nil) or (astr^=#0) then exit;
- if ServiceExists(MS_UTILS_REPLACEVARS)<>0 then
- begin
- FillChar(dat,SizeOf(TREPLACEVARSDATA),0);
- dat.cbSize :=SizeOf(TREPLACEVARSDATA);
- pc:=PAnsiChar(CallService(MS_UTILS_REPLACEVARS,wparam(astr),lparam(@dat)));
- astr:=pc;
- end
- else
- pc:=nil;
+ pc:=Utils_ReplaceVars(astr);
+ astr:=pc;
if isVarsInstalled then
begin
@@ -185,20 +177,11 @@ function ParseVarString(astr:PWideChar;aContact:TMCONTACT=0;extra:PWideChar=nil) var
tfi:TFORMATINFO;
tmp,pc:PWideChar;
- dat:TREPLACEVARSDATA;
begin
if (astr=nil) or (astr^=#0) then exit;
- if ServiceExists(MS_UTILS_REPLACEVARS)<>0 then
- begin
- FillChar(dat,SizeOf(TREPLACEVARSDATA),0);
- dat.cbSize :=SizeOf(TREPLACEVARSDATA);
- dat.dwflags:=RVF_UNICODE;
- pc:=PWideChar(CallService(MS_UTILS_REPLACEVARS,wparam(astr),lparam(@dat)));
- astr:=pc;
- end
- else
- pc:=nil;
+ pc:=Utils_ReplaceVarsW(astr);
+ astr:=pc;
if isVarsInstalled then
begin
|