diff options
author | Alexey Kulakov <panda75@bk.ru> | 2014-02-02 09:39:36 +0000 |
---|---|---|
committer | Alexey Kulakov <panda75@bk.ru> | 2014-02-02 09:39:36 +0000 |
commit | 7c53c3c262dd67bbe9bcac3971621face2455f82 (patch) | |
tree | dc3ac8c5fb55a284a82a2b55968bf6d6d3de19b5 /include/delphi | |
parent | 5abedf89d15719fb5e2ba394363ad85264ac2f58 (diff) |
Miranda API update
mRadio:refactoring
git-svn-id: http://svn.miranda-ng.org/main/trunk@8000 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'include/delphi')
-rw-r--r-- | include/delphi/m_avatars.inc | 2 | ||||
-rw-r--r-- | include/delphi/m_core.inc | 23 | ||||
-rw-r--r-- | include/delphi/m_utils.inc | 2 |
3 files changed, 25 insertions, 2 deletions
diff --git a/include/delphi/m_avatars.inc b/include/delphi/m_avatars.inc index 595f65dd70..74526af386 100644 --- a/include/delphi/m_avatars.inc +++ b/include/delphi/m_avatars.inc @@ -261,7 +261,7 @@ const {
fired when the contacts avatar is changed by the contact
wParam = hContact
- lParam = struct CONTACTAVATARCHANGENOTIFICATION *cacn
+ lParam = struct CONTACTAVATARCHANGEDNOTIFICATION *cacn
the event CAN pass a NULL pointer in lParam which means that the contact deleted its avatar
}
ME_AV_CONTACTAVATARCHANGED:PAnsiChar = 'SV_Avatars/ContactAvatarChanged';
diff --git a/include/delphi/m_core.inc b/include/delphi/m_core.inc index 75e903d3d0..b02b09e61d 100644 --- a/include/delphi/m_core.inc +++ b/include/delphi/m_core.inc @@ -422,6 +422,7 @@ function CallContactService(hContact:THANDLE;const name:PAnsiChar;wParam:WPARAM; function CallProtoService(const szModule:PAnsiChar;const szService:PAnsiChar;wParam:WPARAM;lParam:LPARAM):int_ptr; cdecl;
external CoreDLL name 'CallProtoService';
+
///////////////////////////////////////////////////////////////////////////////
// http
@@ -685,6 +686,22 @@ procedure ProtoConstructor(pThis:pointer{PPROTO_INTERFACE}; const pszModuleName: procedure ProtoDestructor(pThis:pointer{PPROTO_INTERFACE}); stdcall;
external CoreDLL name 'ProtoDestructor';
+{!!
+typedef void (__cdecl PROTO_INTERFACE::*ProtoThreadFunc)(void*);
+procedure ProtoForkThread(PROTO_INTERFACE *pThis, ProtoThreadFunc, void *param);
+function ProtoForkThreadEx(PROTO_INTERFACE *pThis, ProtoThreadFunc, void *param, UINT* threadID):THANDLE;
+
+typedef int (__cdecl PROTO_INTERFACE::*ProtoEventFunc)(WPARAM, LPARAM);
+procedure ProtoHookEvent(PROTO_INTERFACE *pThis, const char* szName, ProtoEventFunc pFunc);
+function ProtoCreateHookableEvent(PROTO_INTERFACE *pThis, const char* szService):THANDLE;
+
+typedef INT_PTR (__cdecl PROTO_INTERFACE::*ProtoServiceFunc)(WPARAM, LPARAM);
+procedure ProtoCreateService(PROTO_INTERFACE *pThis, const char* szService, ProtoServiceFunc);
+
+typedef INT_PTR (__cdecl PROTO_INTERFACE::*ProtoServiceFuncParam)(WPARAM, LPARAM, LPARAM);
+procedure ProtoCreateServiceParam(PROTO_INTERFACE *pThis, const char* szService, ProtoServiceFuncParam, LPARAM);
+}
+
procedure ProtoLogA(pThis:pointer{PPROTO_INTERFACE}; szFormat :pAnsiChar; args:va_list); stdcall;
external CoreDLL name 'ProtoLogA';
procedure ProtoLogW(pThis:pointer{PPROTO_INTERFACE}; wszFormat:pWideChar; args:va_list); stdcall;
@@ -707,6 +724,7 @@ function ProtoGetAvatarFileFormat(const szFileName:PWideChar):int; stdcall; function ProtoGetBufferFormat(const buf:PByte; var ext:PWideChar):int; stdcall;
external CoreDLL name 'ProtoGetBufferFormat';
+
///////////////////////////////////////////////////////////////////////////////
// sha1 functions
@@ -737,12 +755,13 @@ procedure mir_hmac_sha1(hashout:SHA1Hash; const key:pbyte; keyLen:size_t; const dataIn:pbyte; dataLen:size_t); stdcall;
external CoreDLL name 'mir_hmac_sha1';
+
///////////////////////////////////////////////////////////////////////////////
// strings
function mir_base64_decode(str:pAnsiChar; var resultSize:int):pByte; stdcall;
external CoreDLL name 'mir_base64_decode';
-function mir_base64_encode(data: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';
@@ -757,6 +776,7 @@ function ltrim(str:pAnsiChar):pAnsiChar; stdcall; external CoreDLL name 'ltrim';
function ltrimw(str:pWideChar):pWideChar; stdcall;
external CoreDLL name 'ltrimw';
+
// returns pointer to the trimmed portion of string
function ltrimp(str:pAnsiChar):pAnsiChar; stdcall;
external CoreDLL name 'ltrimp';
@@ -784,6 +804,7 @@ function bin2hex(data:pointer; dataLen:size_t; pDest:pAnsiChar):pAnsiChar; stdca function bin2hexW(data:pointer; dataLen:size_t; pDest:pWideChar):pWideChar; stdcall;
external CoreDLL name 'bin2hexW';
+
///////////////////////////////////////////////////////////////////////////////
// text conversion functions
diff --git a/include/delphi/m_utils.inc b/include/delphi/m_utils.inc index 8abaf313dc..5b67bffb2b 100644 --- a/include/delphi/m_utils.inc +++ b/include/delphi/m_utils.inc @@ -361,6 +361,8 @@ const {
variables known by the core:
----------------------------
+ folders comes without trailing slash
+
%miranda_profile% -> same as MS_DB_GETPROFILEPATH, base folder for all profiles
%miranda_userdata% -> the active profile folder (home of the .dat file and all
profile data)
|