From e5921864a7020e65ddee7d5c83fb3ed0f9ddc106 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 6 Nov 2013 16:02:51 +0000 Subject: compilation fix git-svn-id: http://svn.miranda-ng.org/main/trunk@6807 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Actman30/editwrapper.res | Bin 492 -> 0 bytes plugins/Actman30/hooks/hooks.res | Bin 0 -> 688 bytes plugins/Actman30/iac_global.pas | 8 +++++--- plugins/Actman30/tasks/tasks.res | Bin 0 -> 1288 bytes plugins/Actman30/tmp/FreeImage.ppu | Bin 199403 -> 0 bytes plugins/Actman30/tmp/PsAPI.ppu | Bin 23713 -> 0 bytes plugins/Actman30/tmp/ask.res | Bin 456 -> 0 bytes plugins/Actman30/tmp/commctrl.ppu | Bin 503113 -> 0 bytes plugins/Actman30/tmp/common.ppu | Bin 55446 -> 0 bytes plugins/Actman30/tmp/dbsettings.ppu | Bin 26337 -> 0 bytes plugins/Actman30/tmp/global.ppu | Bin 2051 -> 0 bytes plugins/Actman30/tmp/io.ppu | Bin 7789 -> 0 bytes plugins/Actman30/tmp/mApiCard.res | Bin 1052 -> 0 bytes plugins/Actman30/tmp/mApiCardM.ppu | Bin 9968 -> 0 bytes plugins/Actman30/tmp/m_api.ppu | Bin 607276 -> 0 bytes plugins/Actman30/tmp/memini.ppu | Bin 10884 -> 0 bytes plugins/Actman30/tmp/mirutils.ppu | Bin 20647 -> 0 bytes plugins/Actman30/tmp/question.ppu | Bin 3314 -> 0 bytes plugins/Actman30/tmp/syswin.ppu | Bin 12797 -> 0 bytes plugins/Actman30/tmp/wrapper.ppu | Bin 15405 -> 0 bytes plugins/Actman30/ua/ua.res | Bin 0 -> 3944 bytes 21 files changed, 5 insertions(+), 3 deletions(-) delete mode 100644 plugins/Actman30/editwrapper.res create mode 100644 plugins/Actman30/hooks/hooks.res create mode 100644 plugins/Actman30/tasks/tasks.res delete mode 100644 plugins/Actman30/tmp/FreeImage.ppu delete mode 100644 plugins/Actman30/tmp/PsAPI.ppu delete mode 100644 plugins/Actman30/tmp/ask.res delete mode 100644 plugins/Actman30/tmp/commctrl.ppu delete mode 100644 plugins/Actman30/tmp/common.ppu delete mode 100644 plugins/Actman30/tmp/dbsettings.ppu delete mode 100644 plugins/Actman30/tmp/global.ppu delete mode 100644 plugins/Actman30/tmp/io.ppu delete mode 100644 plugins/Actman30/tmp/mApiCard.res delete mode 100644 plugins/Actman30/tmp/mApiCardM.ppu delete mode 100644 plugins/Actman30/tmp/m_api.ppu delete mode 100644 plugins/Actman30/tmp/memini.ppu delete mode 100644 plugins/Actman30/tmp/mirutils.ppu delete mode 100644 plugins/Actman30/tmp/question.ppu delete mode 100644 plugins/Actman30/tmp/syswin.ppu delete mode 100644 plugins/Actman30/tmp/wrapper.ppu create mode 100644 plugins/Actman30/ua/ua.res (limited to 'plugins/Actman30') diff --git a/plugins/Actman30/editwrapper.res b/plugins/Actman30/editwrapper.res deleted file mode 100644 index a0019a92ae..0000000000 Binary files a/plugins/Actman30/editwrapper.res and /dev/null differ diff --git a/plugins/Actman30/hooks/hooks.res b/plugins/Actman30/hooks/hooks.res new file mode 100644 index 0000000000..1cf202f414 Binary files /dev/null and b/plugins/Actman30/hooks/hooks.res differ diff --git a/plugins/Actman30/iac_global.pas b/plugins/Actman30/iac_global.pas index 11bfbba275..1d7957a3bc 100644 --- a/plugins/Actman30/iac_global.pas +++ b/plugins/Actman30/iac_global.pas @@ -12,7 +12,7 @@ var const IcoLibPrefix = 'action_type_'; const - NoDescription:PWideChar='No Description'; + NoDescription:PWideChar='No description'; const protostr = ''; const @@ -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/tasks/tasks.res b/plugins/Actman30/tasks/tasks.res new file mode 100644 index 0000000000..bc72f06406 Binary files /dev/null and b/plugins/Actman30/tasks/tasks.res differ diff --git a/plugins/Actman30/tmp/FreeImage.ppu b/plugins/Actman30/tmp/FreeImage.ppu deleted file mode 100644 index f25e2c85ec..0000000000 Binary files a/plugins/Actman30/tmp/FreeImage.ppu and /dev/null differ diff --git a/plugins/Actman30/tmp/PsAPI.ppu b/plugins/Actman30/tmp/PsAPI.ppu deleted file mode 100644 index ef67c967e3..0000000000 Binary files a/plugins/Actman30/tmp/PsAPI.ppu and /dev/null differ diff --git a/plugins/Actman30/tmp/ask.res b/plugins/Actman30/tmp/ask.res deleted file mode 100644 index 15a00e0218..0000000000 Binary files a/plugins/Actman30/tmp/ask.res and /dev/null differ diff --git a/plugins/Actman30/tmp/commctrl.ppu b/plugins/Actman30/tmp/commctrl.ppu deleted file mode 100644 index 4456f8e7b5..0000000000 Binary files a/plugins/Actman30/tmp/commctrl.ppu and /dev/null differ diff --git a/plugins/Actman30/tmp/common.ppu b/plugins/Actman30/tmp/common.ppu deleted file mode 100644 index 43cef92527..0000000000 Binary files a/plugins/Actman30/tmp/common.ppu and /dev/null differ diff --git a/plugins/Actman30/tmp/dbsettings.ppu b/plugins/Actman30/tmp/dbsettings.ppu deleted file mode 100644 index 7ce66f7110..0000000000 Binary files a/plugins/Actman30/tmp/dbsettings.ppu and /dev/null differ diff --git a/plugins/Actman30/tmp/global.ppu b/plugins/Actman30/tmp/global.ppu deleted file mode 100644 index 46e10fc2cc..0000000000 Binary files a/plugins/Actman30/tmp/global.ppu and /dev/null differ diff --git a/plugins/Actman30/tmp/io.ppu b/plugins/Actman30/tmp/io.ppu deleted file mode 100644 index 73b9a58bd5..0000000000 Binary files a/plugins/Actman30/tmp/io.ppu and /dev/null differ diff --git a/plugins/Actman30/tmp/mApiCard.res b/plugins/Actman30/tmp/mApiCard.res deleted file mode 100644 index 7d6ed320b9..0000000000 Binary files a/plugins/Actman30/tmp/mApiCard.res and /dev/null differ diff --git a/plugins/Actman30/tmp/mApiCardM.ppu b/plugins/Actman30/tmp/mApiCardM.ppu deleted file mode 100644 index 8db033ec05..0000000000 Binary files a/plugins/Actman30/tmp/mApiCardM.ppu and /dev/null differ diff --git a/plugins/Actman30/tmp/m_api.ppu b/plugins/Actman30/tmp/m_api.ppu deleted file mode 100644 index 94ef17fde8..0000000000 Binary files a/plugins/Actman30/tmp/m_api.ppu and /dev/null differ diff --git a/plugins/Actman30/tmp/memini.ppu b/plugins/Actman30/tmp/memini.ppu deleted file mode 100644 index 34fa7338bb..0000000000 Binary files a/plugins/Actman30/tmp/memini.ppu and /dev/null differ diff --git a/plugins/Actman30/tmp/mirutils.ppu b/plugins/Actman30/tmp/mirutils.ppu deleted file mode 100644 index 1627956ef1..0000000000 Binary files a/plugins/Actman30/tmp/mirutils.ppu and /dev/null differ diff --git a/plugins/Actman30/tmp/question.ppu b/plugins/Actman30/tmp/question.ppu deleted file mode 100644 index a00b7fa2c2..0000000000 Binary files a/plugins/Actman30/tmp/question.ppu and /dev/null differ diff --git a/plugins/Actman30/tmp/syswin.ppu b/plugins/Actman30/tmp/syswin.ppu deleted file mode 100644 index bd3a2a4040..0000000000 Binary files a/plugins/Actman30/tmp/syswin.ppu and /dev/null differ diff --git a/plugins/Actman30/tmp/wrapper.ppu b/plugins/Actman30/tmp/wrapper.ppu deleted file mode 100644 index 2fe9202853..0000000000 Binary files a/plugins/Actman30/tmp/wrapper.ppu and /dev/null differ diff --git a/plugins/Actman30/ua/ua.res b/plugins/Actman30/ua/ua.res new file mode 100644 index 0000000000..8316b81f51 Binary files /dev/null and b/plugins/Actman30/ua/ua.res differ -- cgit v1.2.3