Miranda API sync with small compilation fixes

git-svn-id: http://svn.miranda-ng.org/main/trunk@8083 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 50 insertions, 47 deletions

diff --git a/include/delphi/m_core.inc b/include/delphi/m_core.inc
index 7ee88e52c0..1383fbf9cf 100644
--- a/include/delphi/m_core.inc
+++ b/include/delphi/m_core.inc
@@ -53,7 +53,10 @@ const
   DBVTF_VARIABLELENGTH = $80; // ?

 

 type

-  MCONTACT = DWORD;

+  HCONTACT  = THANDLE;

+  THCONTACT = HCONTACT;

+  MCONTACT  = DWORD;

+type

   HDBEVENT = THANDLE;

   PDBVARIANT = ^TDBVARIANT;

   TDBVARIANT = record

@@ -124,7 +127,7 @@ modules are free to define their own, beginning at 2000
 DBEVENTINFO.timestamp is in GMT, as returned by time(). There are services

 db/time/x below with useful stuff for dealing with it.

 }

-function db_event_add(hContact:THANDLE; dbei:PDBEVENTINFO):THANDLE; stdcall;

+function db_event_add(hContact:HCONTACT; dbei:PDBEVENTINFO):THANDLE; stdcall;

                  external CoreDLL name 'db_event_add';

 

 {

@@ -132,7 +135,7 @@ Gets the number of events in the chain belonging to a contact in the database.
 Returns the number of events in the chain owned by hContact or -1 if hContact

 is invalid. They can be retrieved using the db_event_first/last() services.

 }

-function db_event_count(hContact:THANDLE):int; stdcall;

+function db_event_count(hContact:HCONTACT):int; stdcall;

                  external CoreDLL name 'db_event_count';

 

 {

@@ -141,7 +144,7 @@ hDbEvent should have been returned by db_event_add/first/last/next/prev()
 Returns 0 on success, or nonzero if hDbEvent was invalid

 Triggers a db/event/deleted event just *before* the event is deleted

 }

-function db_event_delete(hContact:THANDLE; hDbEvent:THANDLE):int; stdcall;

+function db_event_delete(hContact:HCONTACT; hDbEvent:THANDLE):int; stdcall;

                  external CoreDLL name 'db_event_delete';

 

 {

@@ -149,7 +152,7 @@ Retrieves a handle to the first event in the chain for hContact
 Returns the handle, or NULL if hContact is invalid or has no events

 Events in a chain are sorted chronologically automatically

 }

-function db_event_first(hContact:THANDLE):THANDLE; stdcall;

+function db_event_first(hContact:HCONTACT):THANDLE; stdcall;

                  external CoreDLL name 'db_event_first';

 

 {

@@ -163,7 +166,7 @@ should be checked individually with db_event_next() and db_event_get()
 This service is designed for startup, reloading all the events that remained

 unread from last time

 }

-function db_event_firstUnread(hContact:THANDLE):THANDLE; stdcall;

+function db_event_firstUnread(hContact:HCONTACT):THANDLE; stdcall;

                  external CoreDLL name 'db_event_firstUnread';

 

 {

@@ -200,7 +203,7 @@ success
 This service is exceptionally slow. Use only when you have no other choice at

 all.

 }

-function db_event_getContact(hDbEvent:THANDLE):THANDLE; stdcall;

+function db_event_getContact(hDbEvent:THANDLE):HCONTACT; stdcall;

                  external CoreDLL name 'db_event_getContact';

 

 {

@@ -208,7 +211,7 @@ Retrieves a handle to the last event in the chain for hContact
 Returns the handle, or NULL if hContact is invalid or has no events

 Events in a chain are sorted chronologically automatically

 }

-function db_event_last(hDbEvent:THANDLE):THANDLE; stdcall;

+function db_event_last(hContact:HCONTACT):THANDLE; stdcall;

                  external CoreDLL name 'db_event_last';

 

 {

@@ -219,7 +222,7 @@ is invalid.
 This is the one database write operation that does not trigger an event.

 Modules should not save flags states for any length of time.

 }

-function db_event_markRead(hContact, hDbEvent:THANDLE):int; stdcall;

+function db_event_markRead(hContact:HCONTACT; hDbEvent:THANDLE):int; stdcall;

                  external CoreDLL name 'db_event_markRead';

 

 {

@@ -252,7 +255,7 @@ You can specify szProto to find only its contacts
 Returns a handle to the first contact in the db on success, or NULL if there

 are no contacts in the db.

 }

-function db_find_first(const szModule:pAnsiChar=nil):THANDLE; stdcall;

+function db_find_first(const szModule:pAnsiChar=nil):HCONTACT; stdcall;

                  external CoreDLL name 'db_find_first';

 

 {

@@ -262,53 +265,53 @@ You can specify szProto to find only its contacts
 Returns a handle to the contact after hContact in the db on success or NULL if

 hContact was the last contact in the db or hContact was invalid.

 }

-function db_find_next(hContact:THANDLE; const szModule:pAnsiChar=nil):THANDLE; stdcall;

+function db_find_next(hContact:HCONTACT; const szModule:pAnsiChar=nil):HCONTACT; stdcall;

                  external CoreDLL name 'db_find_next';

 

 (******************************************************************************

  * DATABASE SETTINGS

  *)

 

-function db_get(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; dbv:PDBVARIANT):int_ptr; stdcall;

+function db_get(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; dbv:PDBVARIANT):int_ptr; stdcall;

                  external CoreDLL name 'db_get';

-function db_get_b(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; errorValue:int):int; stdcall;

+function db_get_b(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; errorValue:int):int; stdcall;

                  external CoreDLL name 'db_get_b';

-function db_get_w(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; errorValue:int):int; stdcall;

+function db_get_w(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; errorValue:int):int; stdcall;

                  external CoreDLL name 'db_get_w';

-function db_get_dw(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; errorValue:dword):dword; stdcall;

+function db_get_dw(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; errorValue:dword):dword; stdcall;

                  external CoreDLL name 'db_get_dw';

-function db_get_s(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; dbv:PDBVARIANT; const nType:int=DBVT_ASCIIZ):int_ptr; stdcall;

+function db_get_s(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; dbv:PDBVARIANT; const nType:int=DBVT_ASCIIZ):int_ptr; stdcall;

                  external CoreDLL name 'db_get_s';

-function db_get_sa(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar):pAnsiChar; stdcall;

+function db_get_sa(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar):pAnsiChar; stdcall;

                  external CoreDLL name 'db_get_sa';

-function db_get_wsa(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar):pWideChar; stdcall;

+function db_get_wsa(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar):pWideChar; stdcall;

                  external CoreDLL name 'db_get_wsa';

 

-function db_get_static(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; szDest:pAnsiChar; destLen:int):int; stdcall;

+function db_get_static(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; szDest:pAnsiChar; destLen:int):int; stdcall;

                  external CoreDLL name 'db_get_static';

-function db_get_static_utf(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; szDest:pAnsiChar; destLen:int):int; stdcall;

+function db_get_static_utf(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; szDest:pAnsiChar; destLen:int):int; stdcall;

                  external CoreDLL name 'db_get_static_utf';

-function db_get_wstatic(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; szDest:pWideChar; destLen:int):int; stdcall;

+function db_get_wstatic(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; szDest:pWideChar; destLen:int):int; stdcall;

                  external CoreDLL name 'db_get_wstatic';

 

-function db_set(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; dbv:PDBVARIANT):int_ptr; stdcall;

+function db_set(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; dbv:PDBVARIANT):int_ptr; stdcall;

                  external CoreDLL name 'db_set';

-function db_set_b(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:byte):int_ptr; stdcall;

+function db_set_b(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:byte):int_ptr; stdcall;

                  external CoreDLL name 'db_set_b';

-function db_set_w(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:word):int_ptr; stdcall;

+function db_set_w(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:word):int_ptr; stdcall;

                  external CoreDLL name 'db_set_w';

-function db_set_dw(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:dword):int_ptr; stdcall;

+function db_set_dw(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:dword):int_ptr; stdcall;

                  external CoreDLL name 'db_set_dw';

-function db_set_s(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pAnsiChar):int_ptr; stdcall;

+function db_set_s(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pAnsiChar):int_ptr; stdcall;

                  external CoreDLL name 'db_set_s';

-function db_set_ws(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pWideChar):int_ptr; stdcall;

+function db_set_ws(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pWideChar):int_ptr; stdcall;

                  external CoreDLL name 'db_set_ws';

-function db_set_utf(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pAnsiChar):int_ptr; stdcall;

+function db_set_utf(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pAnsiChar):int_ptr; stdcall;

                  external CoreDLL name 'db_set_utf';

-function db_set_blob(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:pointer; len:uint):int_ptr; stdcall;

+function db_set_blob(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:pointer; len:uint):int_ptr; stdcall;

                  external CoreDLL name 'db_set_blob';

 

-function db_unset(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar):int_ptr; stdcall;

+function db_unset(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar):int_ptr; stdcall;

                   external CoreDLL name 'db_unset';

 

 function db_set_resident(const szModule:pAnsiChar; const szSetting:pAnsiChar; bEnable:int):int; stdcall;

@@ -317,36 +320,36 @@ function db_set_resident(const szModule:pAnsiChar; const szSetting:pAnsiChar; bE
 // deprecated Aliases

 function DBFreeVariant(dbv:PDBVARIANT):int_ptr; stdcall;

                  external CoreDLL name 'db_free';

-function DBDeleteContactSetting(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar):int_ptr; stdcall;

+function DBDeleteContactSetting(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar):int_ptr; stdcall;

                  external CoreDLL name 'db_unset';

-function DBGetContactSettingByte(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; errorValue:int):int; stdcall;

+function DBGetContactSettingByte(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; errorValue:int):int; stdcall;

                  external CoreDLL name 'db_get_b';

-function DBGetContactSettingWord(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; errorValue:int):int; stdcall;

+function DBGetContactSettingWord(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; errorValue:int):int; stdcall;

                  external CoreDLL name 'db_get_w';

-function DBGetContactSettingDWord(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; errorValue:dword):dword; stdcall;

+function DBGetContactSettingDWord(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; errorValue:dword):dword; stdcall;

                  external CoreDLL name 'db_get_dw';

-function DBGetContactSetting(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; dbv:PDBVARIANT):int_ptr; stdcall;

+function DBGetContactSetting(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; dbv:PDBVARIANT):int_ptr; stdcall;

                  external CoreDLL name 'db_get';

-function DBGetContactSettingStr(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; dbv:PDBVARIANT; const nType:int=DBVT_ASCIIZ):int_ptr; stdcall;

+function DBGetContactSettingStr(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; dbv:PDBVARIANT; const nType:int=DBVT_ASCIIZ):int_ptr; stdcall;

                  external CoreDLL name 'db_get_s';

-function DBGetContactSettingString(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar):pAnsiChar; stdcall;

+function DBGetContactSettingString(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar):pAnsiChar; stdcall;

                  external CoreDLL name 'db_get_sa';

-function DBGetContactSettingWString(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar):pWideChar; stdcall;

+function DBGetContactSettingWString(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar):pWideChar; stdcall;

                  external CoreDLL name 'db_get_wsa';

 

-function DBWriteContactSettingByte(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:byte):int_ptr; stdcall;

+function DBWriteContactSettingByte(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:byte):int_ptr; stdcall;

                  external CoreDLL name 'db_set_b';

-function DBWriteContactSettingWord(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:word):int_ptr; stdcall;

+function DBWriteContactSettingWord(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:word):int_ptr; stdcall;

                  external CoreDLL name 'db_set_w';

-function DBWriteContactSettingDWord(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:dword):int_ptr; stdcall;

+function DBWriteContactSettingDWord(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:dword):int_ptr; stdcall;

                  external CoreDLL name 'db_set_dw';

-function DBWriteContactSettingString(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pAnsiChar):int_ptr; stdcall;

+function DBWriteContactSettingString(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pAnsiChar):int_ptr; stdcall;

                  external CoreDLL name 'db_set_s';

-function DBWriteContactSettingWString(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pWideChar):int_ptr; stdcall;

+function DBWriteContactSettingWString(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pWideChar):int_ptr; stdcall;

                  external CoreDLL name 'db_set_ws';

-function DBWriteContactSettingUTF8String(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pAnsiChar):int_ptr; stdcall;

+function DBWriteContactSettingUTF8String(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pAnsiChar):int_ptr; stdcall;

                  external CoreDLL name 'db_set_utf';

-function DBWriteContactSettingBlob(hContact:THANDLE; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:pointer; len:uint):int_ptr; stdcall;

+function DBWriteContactSettingBlob(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:pointer; len:uint):int_ptr; stdcall;

                  external CoreDLL name 'db_set_blob';

 

 ///////////////////////////////////////////////////////////////////////////////

@@ -428,7 +431,7 @@ procedure KillModuleServices(hInst:HINST); stdcall;
 procedure KillObjectServices(var ptr); stdcall;

                  external CoreDLL name 'KillObjectServices';

 

-function CallContactService(hContact:THANDLE;const name:PAnsiChar;wParam:WPARAM;lParam:LPARAM):int_ptr; cdecl;

+function CallContactService(hContact:HCONTACT;const name:PAnsiChar;wParam:WPARAM;lParam:LPARAM):int_ptr; cdecl;

                  external CoreDLL name 'CallContactService';

 function CallProtoService(const szModule:PAnsiChar;const szService:PAnsiChar;wParam:WPARAM;lParam:LPARAM):int_ptr; cdecl;

                  external CoreDLL name 'CallProtoService';

@@ -678,7 +681,7 @@ function mir_vsnwprintf(buffer:pWideChar;count:size_t;fmt:pWideChar;va:va_list):
 ///////////////////////////////////////////////////////////////////////////////

 // protocol functions

 

-function ProtoBroadcastAck(const szModule: PAnsiChar; hContact: THandle; type_: int; result_: int; hProcess: THandle; lParam: LPARAM): int_ptr; stdcall;

+function ProtoBroadcastAck(const szModule:PAnsiChar; hContact:HCONTACT; type_:int; result_:int; hProcess:THANDLE; lParam:LPARAM): int_ptr; stdcall;

                  external CoreDLL name 'ProtoBroadcastAck';

 

 function ProtoServiceExists(const szModule, szName:PAnsiChar):int; stdcall;