From ff74f51ef8b2d1a46b27e7a6749f0667dbd76497 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 16 Aug 2013 15:07:08 +0000 Subject: custom base64 functions removed from all pascal plugins git-svn-id: http://svn.miranda-ng.org/main/trunk@5720 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Actman/actman.dpr | 1 - plugins/Actman/i_inoutxm.inc | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'plugins/Actman') diff --git a/plugins/Actman/actman.dpr b/plugins/Actman/actman.dpr index 5428411585..d7e073ff1b 100644 --- a/plugins/Actman/actman.dpr +++ b/plugins/Actman/actman.dpr @@ -43,7 +43,6 @@ uses dbsettings, mirutils, syswin, - base64, question, mApiCardM, global, diff --git a/plugins/Actman/i_inoutxm.inc b/plugins/Actman/i_inoutxm.inc index febe8e55d2..bbde13483a 100644 --- a/plugins/Actman/i_inoutxm.inc +++ b/plugins/Actman/i_inoutxm.inc @@ -215,6 +215,7 @@ var tmpbuf:array [0..63] of AnsiChar; dbv:TDBVARIANT; is_chat:boolean; + bufLen:int; begin with xmlparser do begin @@ -242,7 +243,8 @@ begin DBVT_UTF8 : WideToUTF8(getAttrValue(node,ioCUID),dbv.szVal.A); DBVT_WCHAR : StrDupW(dbv.szVal.W,getAttrValue(node,ioCUID)); DBVT_BLOB : begin - Base64Decode(FastWideToAnsi(getAttrValue(node,ioCUID),pAnsiChar(dbv.pbVal)),dbv.pbVal); + dbv.pbVal := mir_base64_decode(FastWideToAnsi(getAttrValue(node,ioCUID),pAnsiChar(dbv.pbVal)), bufLen); + dbv.cpbVal := bufLen; end; end; end; @@ -813,7 +815,7 @@ begin end; DBVT_WCHAR : AddAttr(node,ioCUID,cws.szVal.W); DBVT_BLOB : begin - p1:=Base64Encode(cws.pbVal,cws.cpbVal); + p1:=mir_base64_encode(cws.pbVal,cws.cpbVal); AddAttr(node,ioCUID,FastAnsiToWide(p1,p)); mFreeMem(p1); mFreeMem(p); -- cgit v1.2.3