From 1ef0329818e7ae30435f4c94d21862c7750f5601 Mon Sep 17 00:00:00 2001 From: Alexey Kulakov Date: Fri, 28 Mar 2014 20:15:45 +0000 Subject: Miranda API update Watrack: LastFM dialog crash fix git-svn-id: http://svn.miranda-ng.org/main/trunk@8780 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- include/delphi/m_button_int.inc | 15 ++++++------ include/delphi/m_clistint.inc | 4 ++-- include/delphi/m_crypto.inc | 8 +++---- include/delphi/m_database.inc | 2 +- include/delphi/m_db_int.inc | 4 ++-- include/delphi/m_metacontacts.inc | 48 ++------------------------------------- include/delphi/testdll.dpr | 2 +- 7 files changed, 20 insertions(+), 63 deletions(-) (limited to 'include') diff --git a/include/delphi/m_button_int.inc b/include/delphi/m_button_int.inc index cd44eb33d6..a81d21ae9b 100644 --- a/include/delphi/m_button_int.inc +++ b/include/delphi/m_button_int.inc @@ -45,13 +45,14 @@ type cHot:WideChar; hwndToolTips:HWND; - bIsPushBtn, // button has two states - bIsPushed, // is button pushed or not - bIsDefault, // default button - bIsFlat, // flat button - bIsThemed, // themed button - bIsSkinned: // skinned button - bool; + bIsPushBtn, // button has two states + bIsPushed, // is button pushed or not + bIsDefault, // default button + bIsFlat, // flat button + bIsThemed, // themed button + bIsSkinned, // skinned button + bSendOnDown: // sends BN_CLICKED on WM_LBUTTONDOWN + ByteBool; fnPainter:pfnPainterFunc; // custom button painter pAccPropServices:^IAccPropServices; diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc index cac3aa3c3d..74fb61e6c7 100644 --- a/include/delphi/m_clistint.inc +++ b/include/delphi/m_clistint.inc @@ -546,8 +546,8 @@ type * Miranda NG additions *************************************************************************************) - pfnGetContactIcon: function(hContact:TMCONTACT):int; cdecl; - pfnTrayCalcChanged:function(szChangedProto:PAnsiChar; averageMode:int; iProtoCount:int):int; cdecl; + pfnGetContactIcon: function(hContact:TMCONTACT):int; cdecl; + pfnTrayCalcChanged:function(szChangedProto:PAnsiChar; averageMode:int; iProtoCount:int):int; cdecl; pfnGetAverageMode:function(pNetProtoCount:pint):int; cdecl; pfnInitAutoRebuild:procedure(hwnd:HWND); cdecl; end; diff --git a/include/delphi/m_crypto.inc b/include/delphi/m_crypto.inc index 3320fde380..c949bda009 100644 --- a/include/delphi/m_crypto.inc +++ b/include/delphi/m_crypto.inc @@ -33,14 +33,14 @@ type // get/set the instance key getKeyLength:function():size_t; stdcall; - getKey :function(pKey:pByte; cbKeyLen:size_t):bool; stdcall; - setKey :function(const pKey:pByte; cbKeyLen:size_t):bool; stdcall; + getKey :function(pKey:pByte; cbKeyLen:size_t):ByteBool; stdcall; + setKey :function(const pKey:pByte; cbKeyLen:size_t):ByteBool; stdcall; - generateKey:function():bool; stdcall; // creates a new key inside + generateKey:function():ByteBool; stdcall; // creates a new key inside purgeKey :procedure(); stdcall; // purges a key from memory // sets the master password (in utf-8) - checkPassword:function (const pszPassword:PAnsiChar):bool; stdcall; + checkPassword:function (const pszPassword:PAnsiChar):ByteBool; stdcall; setPassword :procedure(const pszPassword:PAnsiChar); stdcall; // result must be freed using mir_free or assigned to mir_ptr diff --git a/include/delphi/m_database.inc b/include/delphi/m_database.inc index f89346053a..ae31b63b66 100644 --- a/include/delphi/m_database.inc +++ b/include/delphi/m_database.inc @@ -142,7 +142,7 @@ decode a blob and return the event text in the required format, its prototype is to a call of MS_DB_EVENT_GETTEXT (see below) wParam=0 lParam=(LPARAM)(DBEVENTTYPEDESCR*) -Always returns 0. +Returns -1 on error (e.g., event type already registred), 0 on success } type diff --git a/include/delphi/m_db_int.inc b/include/delphi/m_db_int.inc index ce63a3afdd..219f745c42 100644 --- a/include/delphi/m_db_int.inc +++ b/include/delphi/m_db_int.inc @@ -92,8 +92,8 @@ type FindFirstEvent:function(contactID:TMCONTACT):THANDLE; stdcall; FindFirstUnreadEvent:function(contactID:TMCONTACT):THANDLE; stdcall; FindLastEvent:function(contactID:TMCONTACT):THANDLE; stdcall; - FindNextEvent:function(contactID:TMCONTACT; hDbEvent:THANDLE):THANDLE; stdcall; - FindPrevEvent:function(contactID:TMCONTACT; hDbEvent:THANDLE):THANDLE; stdcall; + FindNextEvent:function(contactID:TMCONTACT;hDbEvent:THANDLE):THANDLE; stdcall; + FindPrevEvent:function(contactID:TMCONTACT;hDbEvent:THANDLE):THANDLE; stdcall; EnumModuleNames:function(pFunc:TDBMODULEENUMPROC; pParam:pointer):bool; stdcall; diff --git a/include/delphi/m_metacontacts.inc b/include/delphi/m_metacontacts.inc index 64a2fca992..fb0ba596ab 100644 --- a/include/delphi/m_metacontacts.inc +++ b/include/delphi/m_metacontacts.inc @@ -32,40 +32,6 @@ const returns a handle to the 'most online' contact } MS_MC_GETMOSTONLINECONTACT = 'MetaContacts/GetMostOnline'; - { forces the metacontact to send using a specific subcontact, using the subcontact's contact number - wParam=(HANDLE)hMetaContact - lParam=(dword)contact number - returns 0 on success } - MS_MC_FORCESENDCONTACTNUM = 'MetaContacts/ForceSendContact'; - - { forces the metacontact to send using a specific subcontact, using the subcontact's handle - wParam=(HANDLE)hMetaContact - lParam=(HANDLE)hSubcontact - returns 0 on success (will fail if 'force default' is in effect) } - MS_MC_FORCESENDCONTACT = 'MetaContacts/ForceSendContactByHandle'; - - { 'unforces' the metacontact to send using a specific subcontact - wParam=(HANDLE)hMetaContact - lParam=0 - returns 0 on success (will fail if 'force default' is in effect) } - MS_MC_UNFORCESENDCONTACT = 'MetaContacts/UnforceSendContact'; - - { 'forces' or 'unforces' (i.e. toggles) the metacontact to send using it's default contact - overrides (and clears) 'force send' above, and will even force use of offline contacts - will send ME_MC_FORCESEND or ME_MC_UNFORCESEND event - wParam=(HANDLE)hMetaContact - lParam=0 - returns 1(true) or 0(false) representing new state of 'force default' } - MS_MC_FORCEDEFAULT = 'MetaContacts/ForceSendDefault'; - - { method to get state of 'force' for a metacontact - wParam=(HANDLE)hMetaContact - lParam= (dword)&contact_number or NULL - if lparam supplied, the contact_number of the contatct 'in force' will be copied to the address it points to, - or if none is in force, the value INVALID_CONTACT_ID will be copied - (v0.8.0.8+ returns 1 if 'force default' is true with *lParam == default contact number, else returns 0 with *lParam as above) } - MS_MC_GETFORCESTATE = 'MetaContacts/GetForceState'; - { fired when a metacontact's default contact changes (fired upon creation of metacontact also, when default is initially set) wParam=(HANDLE)hMetaContact lParam=(HANDLE)hDefaultContact } @@ -78,16 +44,6 @@ const lParam=0 } ME_MC_SUBCONTACTSCHANGED = 'MetaContacts/SubcontactsChanged'; - { fired when a metacontact is forced to send using a specific subcontact - wParam=(HANDLE)hMetaContact - lParam=(HANDLE)hForceContact } - ME_MC_FORCESEND = 'MetaContacts/ForceSend'; - - { fired when a metacontact is 'unforced' to send using a specific subcontact - wParam=(HANDLE)hMetaContact - lParam=0 } - ME_MC_UNFORCESEND = 'MetaContacts/UnforceSend'; - { wParam=(HANDLE)hContact lParam=0 convert a given contact into a metacontact @@ -119,11 +75,11 @@ procedure db_mc_enable(bEnabled:bool); stdcall; external CoreDLL name 'db_mc_enable'; { returns true if a contact is a metacontact or false otherwise } -function db_mc_isMeta(hContact:TMCONTACT):LongBool; stdcall; +function db_mc_isMeta(hContact:TMCONTACT):bool; stdcall; external CoreDLL name 'db_mc_isMeta'; { returns true if a contact is a subcontact or false otherwise } -function db_mc_isSub(hContact:TMCONTACT):LongBool; stdcall; +function db_mc_isSub(hContact:TMCONTACT):bool; stdcall; external CoreDLL name 'db_mc_isSub'; { gets the handle for the default contact or 0 on error } diff --git a/include/delphi/testdll.dpr b/include/delphi/testdll.dpr index 972442dced..f19fd9ea40 100644 --- a/include/delphi/testdll.dpr +++ b/include/delphi/testdll.dpr @@ -6,7 +6,7 @@ uses var PluginInterfaces:array [0..1] of MUUID; -function MirandaPluginInfoEx(mirandaVersion:DWORD):PPLUGININFOEX; cdecl; +function MirandaPluginInfoEx(mirandaVersion:dword):PPLUGININFOEX; cdecl; begin result:=@PluginInfo; PluginInfo.cbSize :=SizeOf(TPLUGININFOEX); -- cgit v1.2.3