diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-08-16 15:07:08 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-08-16 15:07:08 +0000 |
| commit | ff74f51ef8b2d1a46b27e7a6749f0667dbd76497 (patch) | |
| tree | 2e42b9d12b821869a6126ba30ae3f764f5c4b00c /plugins/Actman30 | |
| parent | 35489ce3659220b4ebd25d1b3ab0258115cf10a4 (diff) | |
custom base64 functions removed from all pascal plugins
git-svn-id: http://svn.miranda-ng.org/main/trunk@5720 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Actman30')
| -rw-r--r-- | plugins/Actman30/actman.dpr | 1 | ||||
| -rw-r--r-- | plugins/Actman30/iac_global.pas | 6 | ||||
| -rw-r--r-- | plugins/Actman30/make.bat | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/plugins/Actman30/actman.dpr b/plugins/Actman30/actman.dpr index 2f22cda9e2..b4a2cf1566 100644 --- a/plugins/Actman30/actman.dpr +++ b/plugins/Actman30/actman.dpr @@ -38,7 +38,6 @@ uses dbsettings,
mirutils,
syswin,
- base64,
question,
mApiCardM,
global,
diff --git a/plugins/Actman30/iac_global.pas b/plugins/Actman30/iac_global.pas index 64a8604b2c..58d15007ea 100644 --- a/plugins/Actman30/iac_global.pas +++ b/plugins/Actman30/iac_global.pas @@ -94,7 +94,7 @@ function ImportContactINI(node:pointer):THANDLE; implementation
-uses Common, global, dbsettings, base64, mirutils;
+uses Common, global, dbsettings, mirutils;
//----- tBaseAction code -----
const
@@ -308,6 +308,7 @@ var dbv:TDBVARIANT;
tmp:pWideChar;
is_chat:boolean;
+ bufLen:int;
begin
with xmlparser do
begin
@@ -336,7 +337,8 @@ begin DBVT_UTF8 : WideToUTF8(tmp,dbv.szVal.A);
DBVT_WCHAR : dbv.szVal.W:=tmp;
DBVT_BLOB : begin
- Base64Decode(FastWideToAnsi(tmp,pAnsiChar(dbv.pbVal)),dbv.pbVal);
+ dbv.pbVal := mir_base64_decode(FastWideToAnsi(tmp,pAnsiChar(dbv.pbVal)),bufLen);
+ dbv.cpbVal := bufLen;
end;
end;
end;
diff --git a/plugins/Actman30/make.bat b/plugins/Actman30/make.bat index 36cbb97ab5..6e10afe21f 100644 --- a/plugins/Actman30/make.bat +++ b/plugins/Actman30/make.bat @@ -2,7 +2,7 @@ set myopts=-dMiranda
set dprname=actman.dpr
-for /R %%I in (*.rc) do ..\delphi\brcc32.exe %myopts% %%I -fo%%~npI.res >nul
+for /R %%I in (*.rc) do brcc32.exe %myopts% %%I -fo%%~npI.res >nul
if /i '%1' == 'fpc' (
..\FPC\bin\fpc.exe %myopts% %dprname% %2 %3 %4 %5 %6 %7 %8 %9
|