diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/delphi/m_avatars.inc | 17 | ||||
| -rw-r--r-- | include/delphi/m_core.inc | 4 | ||||
| -rw-r--r-- | include/delphi/m_crypto.inc | 12 | ||||
| -rw-r--r-- | include/delphi/m_helpers.inc | 4 | ||||
| -rw-r--r-- | include/delphi/m_protocols.inc | 2 |
5 files changed, 12 insertions, 27 deletions
diff --git a/include/delphi/m_avatars.inc b/include/delphi/m_avatars.inc index 32982f9293..64494e64c8 100644 --- a/include/delphi/m_avatars.inc +++ b/include/delphi/m_avatars.inc @@ -68,21 +68,6 @@ const AVS_NOTREADY = 4096;
type
- PavatarCacheEntryW = ^TavatarCacheEntryW;
- TavatarCacheEntryW = record
- cbSize : dword; // set to sizeof(struct)
- hContact : TMCONTACT; // contacts handle, 0, if it is a protocol avatar
- hbmPic : HBITMAP; // bitmap handle of the picture itself
- dwFlags : dword; // see above for flag values
- bmHeight : long; // bitmap dimensions
- bmWidth : long;
- t_lastAccess: dword; // last access time (currently unused, but plugins should still
- // use it whenever they access the avatar. may be
- // used in the future to implement cache expiration
- lpDIBSection: pointer;
- szFilename : array[0..MAX_PATH-1] of WideChar; // filename of the avatar (absolute path)
- end;
-
PavatarCacheEntry = ^TavatarCacheEntry;
TavatarCacheEntry = record
cbSize : dword; // set to sizeof(struct)
@@ -95,7 +80,7 @@ type // use it whenever they access the avatar. may be
// used in the future to implement cache expiration
lpDIBSection: pointer;
- szFilename : array[0..MAX_PATH-1] of AnsiChar; // filename of the avatar (absolute path)
+ szFilename : array[0..MAX_PATH-1] of WideChar; // filename of the avatar (absolute path)
end;
const
diff --git a/include/delphi/m_core.inc b/include/delphi/m_core.inc index 586237f2fc..20558e72ca 100644 --- a/include/delphi/m_core.inc +++ b/include/delphi/m_core.inc @@ -810,9 +810,9 @@ procedure mir_hmac_sha1(hashout:SHA1Hash; const key:pbyte; keyLen:size_t; ///////////////////////////////////////////////////////////////////////////////
// strings
-function mir_base64_decode(str:PAnsiChar; var resultSize:int):pByte; stdcall;
+function mir_base64_decode(str:PAnsiChar; var resultSize:int):PByte; stdcall;
external CoreDLL name 'mir_base64_decode';
-function mir_base64_encode(str:pByte; dataSize:int):PAnsiChar; stdcall;
+function mir_base64_encode(str: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/include/delphi/m_crypto.inc b/include/delphi/m_crypto.inc index c949bda009..82e96b356a 100644 --- a/include/delphi/m_crypto.inc +++ b/include/delphi/m_crypto.inc @@ -33,8 +33,8 @@ type // get/set the instance key
getKeyLength:function():size_t; stdcall;
- getKey :function(pKey:pByte; cbKeyLen:size_t):ByteBool; stdcall;
- setKey :function(const pKey:pByte; cbKeyLen:size_t):ByteBool; stdcall;
+ getKey :function(pKey:PByte; cbKeyLen:size_t):ByteBool; stdcall;
+ setKey :function(const pKey:PByte; cbKeyLen:size_t):ByteBool; stdcall;
generateKey:function():ByteBool; stdcall; // creates a new key inside
purgeKey :procedure(); stdcall; // purges a key from memory
@@ -44,12 +44,12 @@ type setPassword :procedure(const pszPassword:PAnsiChar); stdcall;
// result must be freed using mir_free or assigned to mir_ptr<BYTE>
- encodeString:function(const src:PAnsiChar; var cbResultLen:size_t):pByte; stdcall;
- encodeBuffer:function(const src:pointer; cbLen:size_t; var cbResultLen:size_t):pByte; stdcall;
+ encodeString:function(const src:PAnsiChar; var cbResultLen:size_t):PByte; stdcall;
+ encodeBuffer:function(const src:pointer; cbLen:size_t; var cbResultLen:size_t):PByte; stdcall;
// result must be freed using mir_free or assigned to ptrA/ptrT
- decodeString:function(const pBuf:pByte; bufLen:size_t; var cbResultLen:size_t):PAnsiChar; stdcall;
- decodeBuffer:function(const pBuf:pByte; bufLen:size_t; var cbResultLen:size_t):pointer; stdcall;
+ decodeString:function(const pBuf:PByte; bufLen:size_t; var cbResultLen:size_t):PAnsiChar; stdcall;
+ decodeBuffer:function(const pBuf:PByte; bufLen:size_t; var cbResultLen:size_t):pointer; stdcall;
end;
/////////////////////////////////////////////////////////////////////////////////////////
diff --git a/include/delphi/m_helpers.inc b/include/delphi/m_helpers.inc index 4f0c28e39f..87a56d34c9 100644 --- a/include/delphi/m_helpers.inc +++ b/include/delphi/m_helpers.inc @@ -346,12 +346,12 @@ end; function mir_utf8decodeA(const src:PAnsiChar):PAnsiChar;
type
- ppWideChar = ^pWidechar;
+ pPWideChar = ^PWidechar;
var
tmp:PAnsiChar;
begin
tmp:=mir_strdup(src);
- mir_utf8decode(tmp,ppWideChar(nil)^);
+ mir_utf8decode(tmp,pPWideChar(nil)^);
result:=tmp;
end;
diff --git a/include/delphi/m_protocols.inc b/include/delphi/m_protocols.inc index 348e65af3d..7fd40cd657 100644 --- a/include/delphi/m_protocols.inc +++ b/include/delphi/m_protocols.inc @@ -199,7 +199,7 @@ const { determines if a protocol module is loaded or not
wParam=0
lParam=(LPARAM)(const AnsiChar*)szName
- Returns a pointer to the PROTOACCOUNT if the protocol is loaded, or
+ Returns a pointer to the PROTOCOLDESCRIPTOR if the protocol is loaded, or
NULL if it isn't.
}
MS_PROTO_ISPROTOCOLLOADED:PAnsiChar = 'Proto/IsProtocolLoaded';
|