diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-01-24 15:08:57 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-01-24 15:08:57 +0000 |
| commit | 4da4d41930745da5146b1524765c2d15e4dad127 (patch) | |
| tree | 61f774aed0da03a29aa66a6b8679046677af85f9 | |
| parent | 687bf8cee6aee6cc11439bd62fd90172a83ef313 (diff) | |
fix for unneeded data conversion & wrong data type in mir_base64_encode
git-svn-id: http://svn.miranda-ng.org/main/trunk@7857 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | include/delphi/m_core.inc | 2 | ||||
| -rw-r--r-- | plugins/Actman/i_inoutxm.inc | 2 | ||||
| -rw-r--r-- | plugins/Watrack/proto/proto.pas | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/delphi/m_core.inc b/include/delphi/m_core.inc index 3ba25248fb..75e903d3d0 100644 --- a/include/delphi/m_core.inc +++ b/include/delphi/m_core.inc @@ -742,7 +742,7 @@ procedure mir_hmac_sha1(hashout:SHA1Hash; const key:pbyte; keyLen:size_t; function mir_base64_decode(str:pAnsiChar; var resultSize:int):pByte; stdcall;
external CoreDLL name 'mir_base64_decode';
-function mir_base64_encode(str:pAnsiChar; dataSize:int):pAnsiChar; stdcall;
+function mir_base64_encode(data:PByte; dataSize:int):pAnsiChar; stdcall;
external CoreDLL name 'mir_base64_encode';
function mir_base64_encodebuf(data:PByte; dataSize:int; output:pAnsiChar; outputLen:int):pAnsiChar; stdcall;
external CoreDLL name 'mir_base64_encodebuf';
diff --git a/plugins/Actman/i_inoutxm.inc b/plugins/Actman/i_inoutxm.inc index 70a6428edd..bbde13483a 100644 --- a/plugins/Actman/i_inoutxm.inc +++ b/plugins/Actman/i_inoutxm.inc @@ -815,7 +815,7 @@ begin end;
DBVT_WCHAR : AddAttr(node,ioCUID,cws.szVal.W);
DBVT_BLOB : begin
- p1:=mir_base64_encode(pAnsiChar(cws.pbVal),cws.cpbVal);
+ p1:=mir_base64_encode(cws.pbVal,cws.cpbVal);
AddAttr(node,ioCUID,FastAnsiToWide(p1,p));
mFreeMem(p1);
mFreeMem(p);
diff --git a/plugins/Watrack/proto/proto.pas b/plugins/Watrack/proto/proto.pas index dc73e17707..f1c6eff06b 100644 --- a/plugins/Watrack/proto/proto.pas +++ b/plugins/Watrack/proto/proto.pas @@ -300,7 +300,7 @@ begin data:=PByte(s);
dataSize:=(StrLenW(textpos)+3+1)*SizeOf(PWideChar);
end;
- encodedStr:=mir_base64_encode(pAnsiChar(data),dataSize);
+ encodedStr:=mir_base64_encode(data,dataSize);
mGetMem(encbuf,Length(encodedStr)+1+Length(wpAnswer));
StrCopy(PAnsiChar(encbuf),wpAnswer);
StrCopy(PAnsiChar(encbuf)+Length(wpAnswer),encodedStr);
|