From 0269e9306300f5ca12d5120a5a0f3051adfc4302 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 24 Feb 2014 19:46:11 +0000 Subject: old/unused types removed from Pascal sources git-svn-id: http://svn.miranda-ng.org/main/trunk@8267 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- include/delphi/m_addcontact.inc | 2 +- include/delphi/m_avatars.inc | 10 ++-- include/delphi/m_awaymsg.inc | 2 +- include/delphi/m_chat.inc | 2 +- include/delphi/m_clist.inc | 32 ++++++------ include/delphi/m_clistint.inc | 36 +++++++------- include/delphi/m_clui.inc | 14 +++--- include/delphi/m_contacts.inc | 2 +- include/delphi/m_core.inc | 97 ++++++++++++++++++------------------- include/delphi/m_database.inc | 16 +++--- include/delphi/m_email.inc | 2 +- include/delphi/m_extraicons.inc | 2 +- include/delphi/m_file.inc | 8 +-- include/delphi/m_helpers.inc | 24 ++++----- include/delphi/m_history.inc | 4 +- include/delphi/m_ignore.inc | 10 ++-- include/delphi/m_message.inc | 10 ++-- include/delphi/m_msg_buttonsbar.inc | 2 +- include/delphi/m_popup.inc | 6 +-- include/delphi/m_protocols.inc | 10 ++-- include/delphi/m_protoint.inc | 42 ++++++++-------- include/delphi/m_protomod.inc | 4 +- include/delphi/m_protosvc.inc | 10 ++-- include/delphi/m_timezones.inc | 10 ++-- include/delphi/m_url.inc | 2 +- include/delphi/m_utils.inc | 8 +-- 26 files changed, 182 insertions(+), 185 deletions(-) (limited to 'include/delphi') diff --git a/include/delphi/m_addcontact.inc b/include/delphi/m_addcontact.inc index 7ec3e6b733..fc19913b8a 100644 --- a/include/delphi/m_addcontact.inc +++ b/include/delphi/m_addcontact.inc @@ -32,7 +32,7 @@ type PADDCONTACTSTRUCT = ^TADDCONTACTSTRUCT; TADDCONTACTSTRUCT = record handleType: int; - handle : THandle; // HDBEVENT, HCONTACT, SearchResult + handle : THandle; // HDBEVENT, MCONTACT, SearchResult szProto : PAnsiChar; // used by search result only psr : Pointer; // @PROTOSEARCHRESULT end; diff --git a/include/delphi/m_avatars.inc b/include/delphi/m_avatars.inc index dc203c110b..49e88725de 100644 --- a/include/delphi/m_avatars.inc +++ b/include/delphi/m_avatars.inc @@ -71,7 +71,7 @@ type PavatarCacheEntryW = ^TavatarCacheEntryW; TavatarCacheEntryW = record cbSize : DWORD; // set to sizeof(struct) - hContact : HCONTACT; // contacts handle, 0, if it is a protocol avatar + hContact : MCONTACT; // 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 @@ -86,7 +86,7 @@ type PavatarCacheEntry = ^TavatarCacheEntry; TavatarCacheEntry = record cbSize : DWORD; // set to sizeof(struct) - hContact : HCONTACT; // contacts handle, 0, if it is a protocol avatar + hContact : MCONTACT; // 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 @@ -120,7 +120,7 @@ type TavatarDrawRequest = record cbSize : DWORD; // set this to sizeof(AVATARDRAWREQUEST) - mandatory, // service will return failure code if cbSize is wrong - hContact : HCONTACT; // the contact for which the avatar should be drawn. + hContact : MCONTACT; // the contact for which the avatar should be drawn. // set it to 0 to draw a protocol picture hTargetDC : HDC; // target device context rcDraw : TRECT; // target rectangle. The avatar will be centered @@ -243,7 +243,7 @@ const type TContactAvatarChangedNotificationW = record cbSize :int; // sizeof() - hContact:HCONTACT; // this might have to be set by the caller too + hContact:MCONTACT; // this might have to be set by the caller too format :int; // PA_FORMAT_* filename:array [0..MAX_PATH-1] of WideChar; // full path to filename which contains the avatar hash :array [0..127] of WideChar; // avatar hash (always an empty string by now) @@ -251,7 +251,7 @@ type TContactAvatarChangedNotification = record cbSize :int; // sizeof() - hContact:HCONTACT; // this might have to be set by the caller too + hContact:MCONTACT; // this might have to be set by the caller too format :int; // PA_FORMAT_* filename:array [0..MAX_PATH-1] of AnsiChar; // full path to filename which contains the avatar hash :array [0..127] of AnsiChar; // avatar hash (always an empty string by now) diff --git a/include/delphi/m_awaymsg.inc b/include/delphi/m_awaymsg.inc index f5c083f795..021597c8ca 100644 --- a/include/delphi/m_awaymsg.inc +++ b/include/delphi/m_awaymsg.inc @@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. const { - wParam : HCONTACT + wParam : MCONTACT lParam : 0 Affect : Show the away/na/etc message for a contact Returns: 0 on success, non zero on failure, see notes diff --git a/include/delphi/m_chat.inc b/include/delphi/m_chat.inc index 1705b659a3..627ff7cf86 100644 --- a/include/delphi/m_chat.inc +++ b/include/delphi/m_chat.inc @@ -516,7 +516,7 @@ type iCount :int; // count of users in the nicklist pszUsers :PAnsiChar; // space separated string containing the UID's of the users in the user list. // NOTE. Use Mirandas mmi_free() on the returned string. - hContact :HCONTACT; // hContact for the session (can be NULL) + hContact :MCONTACT; // hContact for the session (can be NULL) end; const diff --git a/include/delphi/m_clist.inc b/include/delphi/m_clist.inc index ed2672d04e..879e3bb3b3 100644 --- a/include/delphi/m_clist.inc +++ b/include/delphi/m_clist.inc @@ -154,7 +154,7 @@ const MS_CLIST_SHOWHIDEMENUITEM:PAnsiChar = 'CList/ShowHideMenuItem'; { - wParam : HCONTACT + wParam : MCONTACT lParam : 0 Affect : the context menu for a contact is about to be built, see notes Notes : modules should use this to change menu items that are specific @@ -189,10 +189,10 @@ const MS_CLIST_SETDOUBLECLICKACTION:PAnsiChar = 'CList/SetDoubleClickAction'; { - wParam : HCONTACT + wParam : MCONTACT lParam : Affect : Register with this event to be notified of a double click on the CList - against a HCONTACT, you will not be notified if there is a pending CList event + against a MCONTACT, you will not be notified if there is a pending CList event that the double click clears, (i.e. flashing icon is presented to be clicked) Version: 0.3.0.0 } @@ -202,7 +202,7 @@ const GCDNF_UNICODE = 2; // will return TCHAR* instead of AnsiChar* GCDNF_NOCACHE = 4; // will not use the cache { - wParam : HCONTACT + wParam : MCONTACT lParam : flags Affect : Gets the string that the contact list will use to represent a contact Returns: Always a pointer @@ -227,7 +227,7 @@ type PCLISTEVENT = ^TCLISTEVENT; TCLISTEVENT = record cbSize : int; // size in bytes - hContact : HCONTACT; // handle to the contact to put the icon by + hContact : MCONTACT; // handle to the contact to put the icon by hIcon : HICON; // icon to flash! flags : DWORD; hDBEvent : THANDLE; // caller defined, but should be unique for hContact @@ -267,7 +267,7 @@ const MS_CLIST_ADDEVENT:PAnsiChar = 'CList/AddEvent'; { - wParam : HCONTACT + wParam : MCONTACT lParam : HDBEVENT Affect : Remove an event from the contact list queue Returns: 0 on success, [non zero] on failure @@ -275,15 +275,15 @@ const MS_CLIST_REMOVEEVENT:PAnsiChar = 'Clist/RemoveEvent'; { - wParam : HCONTACT + wParam : MCONTACT lParam : iEvent Affect : Get the details of an event in the queue, see notes Returns: A CLISTEVENT* or NULL(0) on failure Notes : Returns the iEvent'1st/2nd/3rd/nth elemented queried, e.g. iEvent=0 will get the event that will be returned if the - user double clicks on that HCONTACT + user double clicks on that MCONTACT - - Use HCONTACT=NULL, iEvent=0 for example to get the event + Use MCONTACT=NULL, iEvent=0 for example to get the event the user will get if they double click on the tray. Version: v0.1.2.1+ } @@ -312,7 +312,7 @@ const MS_CLIST_MENUDRAWITEM:PAnsiChar = 'CList/MenuDrawItem'; { - wParam : HCONTACT + wParam : MCONTACT lParam : 0 Affect : Built the context menu for a specific contact Returns: A HMENU handle identifying the menu, this should be DestroyMenu()ed @@ -332,7 +332,7 @@ const IMAGE_GROUPSHUT = 12; { - wParam : HCONTACT + wParam : MCONTACT lParam : 0 Affect : Get the icon that should be associated with a contact Returns: an index into the contact list imagelist, if the icon @@ -343,7 +343,7 @@ const MS_CLIST_GETCONTACTICON:PAnsiChar = 'CList/GetContactIcon'; { - wParam : HCONTACT + wParam : MCONTACT lParam : ICON_ID Affect : The icon of a contact in the contact list has changed, ICON_ID is an index to what image has changed @@ -390,7 +390,7 @@ const MPCF_MAINMENU = 2; // test commands from the main menu { wParam : MAKEWPARAM(LOWORD(wParam of WM_COMMAND),flags) - lParam : HCONTACT + lParam : MCONTACT Affect : Process a menu selection from a menu, see notes Returns: True if it processed the command, False otherwise notes : hContact is the currently selected contact, it is not used @@ -587,7 +587,7 @@ const MS_CLIST_SETHIDEOFFLINE:PAnsiChar = 'CList/SetHideOffline'; { - wParam : HCONTACT + wParam : MCONTACT lParam : 0 Affect : Do the message processing associated with the double clicking a contact Returns: 0 on success, [non zero] on failure @@ -596,7 +596,7 @@ const MS_CLIST_CONTACTDOUBLECLICKED:PAnsiChar = 'CList/ContactDoubleClicked'; { - wParam : HCONTACT + wParam : MCONTACT lParam : Pointer to an array of PAnsiChar's containing files/dirs Affect : Do the processing when some files are droppeed on a contact, see notes Returns: 0 on success, [non zero] on failure @@ -606,7 +606,7 @@ const MS_CLIST_CONTACTFILESDROPPED:PAnsiChar = 'CList/ContactFilesDropped'; { - wParam : HCONTACT + wParam : MCONTACT lParam : HGROUP Affect : Change the group a contact belongs to, see notes Returns: 0 on success, [non zero] on failure diff --git a/include/delphi/m_clistint.inc b/include/delphi/m_clistint.inc index dd50b18885..48524db3df 100644 --- a/include/delphi/m_clistint.inc +++ b/include/delphi/m_clistint.inc @@ -133,7 +133,7 @@ type case boolean of false: ( iImage:int; - hContact:HCONTACT); + hContact:MCONTACT); true : ( groupId:word; group :pClcGroup;); @@ -292,7 +292,7 @@ type type PClcCacheEntryBase = ^ClcCacheEntryBase; ClcCacheEntryBase = record - hContact:HCONTACT; + hContact:MCONTACT; name :TCHAR; group :TCHAR; isHidden:int; @@ -348,10 +348,10 @@ type pfnAddInfoItemToGroup : function (var group:ClcGroup; flags:int; pszText:TChar):int; cdecl; pfnAddItemToGroup : function (var group:ClcGroup; iAboveItem:int):int; cdecl; pfnAddContactToGroup : function (var dat:ClcData; var group:ClcGroup; - hContact:HCONTACT):int; cdecl; - pfnAddContactToTree : procedure (hwnd:HWND; var dat:ClcData; hContact:HCONTACT; + hContact:MCONTACT):int; cdecl; + pfnAddContactToTree : procedure (hwnd:HWND; var dat:ClcData; hContact:MCONTACT; updateTotalCount:int; checkHideOffline:int); cdecl; - pfnDeleteItemFromTree : procedure (hwnd:HWND; hItem:HCONTACT); cdecl; + pfnDeleteItemFromTree : procedure (hwnd:HWND; hItem:MCONTACT); cdecl; pfnRebuildEntireList : procedure (hwnd:HWND; var dat:ClcData); cdecl; pfnGetGroupContentsCount : function (var group:ClcGroup; visibleOnly:int):int; cdecl; pfnSortCLC : procedure (hwnd:HWND; var dat:ClcData; useInsertionSort:int); cdecl; @@ -383,7 +383,7 @@ type pfnClcStatusToPf2 : function (status:int):int; cdecl; pfnIsHiddenMode : function (var dat:ClcData; status:int):int; cdecl; pfnHideInfoTip : procedure (hwnd:HWND; var dat:ClcData); cdecl; - pfnNotifyNewContact : procedure (hwnd:HWND; hContact:HCONTACT); cdecl; + pfnNotifyNewContact : procedure (hwnd:HWND; hContact:MCONTACT); cdecl; pfnGetDefaultExStyle : function :DWORD; cdecl; pfnGetDefaultFontSetting : procedure (i:int; var lf:LOGFONT; var colour:COLORREF); cdecl; pfnGetFontSetting : procedure (i:int; var lf:LOGFONT; var colour:COLORREF); cdecl; @@ -399,22 +399,22 @@ type pfnRowHitTest : function (var dat:ClcData; y:int):int; cdecl; (* clistevents.c *) - pfnEventsProcessContactDoubleClick : function (hContact:HCONTACT):int; cdecl; + pfnEventsProcessContactDoubleClick : function (hContact:MCONTACT):int; cdecl; pfnEventsProcessTrayDoubleClick : function (_para1:int):int; cdecl; (* clistmod.c *) - pfnIconFromStatusMode : function (szProto:PAnsiChar; status:int; hContact:HCONTACT):int; cdecl; + pfnIconFromStatusMode : function (szProto:PAnsiChar; status:int; hContact:MCONTACT):int; cdecl; pfnShowHide : function (_para1:WPARAM; _para2:LPARAM):int; cdecl; pfnGetStatusModeDescription : function (mode:int; flags:int):TChar; cdecl; (* clistsettings.c *) - pfnGetCacheEntry : function (hContact:HCONTACT):PClcCacheEntry; cdecl; - pfnCreateCacheItem : function (hContact:HCONTACT):PClcCacheEntry; cdecl; + pfnGetCacheEntry : function (hContact:MCONTACT):PClcCacheEntry; cdecl; + pfnCreateCacheItem : function (hContact:MCONTACT):PClcCacheEntry; cdecl; pfnCheckCacheItem : procedure (_para1:PClcCacheEntry); cdecl; pfnFreeCacheItem : procedure (_para1:PClcCacheEntry); cdecl; - pfnGetContactDisplayName : function (hContact:HCONTACT; mode:int):TChar; cdecl; - pfnInvalidateDisplayNameCacheEntry : procedure (hContact:HCONTACT); cdecl; + pfnGetContactDisplayName : function (hContact:MCONTACT; mode:int):TChar; cdecl; + pfnInvalidateDisplayNameCacheEntry : procedure (hContact:MCONTACT); cdecl; (* clisttray.c *) pfnTrayIconUpdateWithImageList : procedure (iImage:int; szNewTip:TChar; @@ -437,7 +437,7 @@ type pfnOnCreateClc : procedure ; cdecl; (* contact.c *) - pfnChangeContactIcon : procedure (hContact:HCONTACT; iIcon:int; add:int); cdecl; + pfnChangeContactIcon : procedure (hContact:MCONTACT; iIcon:int; add:int); cdecl; pfnLoadContactTree : procedure ; cdecl; pfnCompareContacts : function (var contact1:ClcContact; var contact2:ClcContact):int; cdecl; pfnSortContacts : procedure ; cdecl; @@ -466,9 +466,9 @@ type pfnFreeEvent : procedure (_para1:PCListEvent); cdecl; pfnAddEvent : function (_para1:PCLISTEVENT):PCListEvent; cdecl; - pfnGetEvent : function (hContact:HCONTACT; idx:int):PCLISTEVENT; cdecl; + pfnGetEvent : function (hContact:MCONTACT; idx:int):PCLISTEVENT; cdecl; - pfnRemoveEvent : function (hContact:HCONTACT; hDbEvent:THANDLE):int; cdecl; + pfnRemoveEvent : function (hContact:MCONTACT; hDbEvent:THANDLE):int; cdecl; pfnGetImlIconIndex : function (hIcon:HICON):int; cdecl; (************************************************************************************* @@ -509,7 +509,7 @@ type szTip : TChar; bTrayMenuOnScreen : BOOL; - pfnGetIconFromStatusMode : function (hContact:HCONTACT; szProto:PAnsiChar; + pfnGetIconFromStatusMode : function (hContact:MCONTACT; szProto:PAnsiChar; status:int):HICON; cdecl; pfnInitTray : procedure ; cdecl; @@ -540,13 +540,13 @@ type * version 7 additions (0.11.0.x) - extra images *************************************************************************************) pfnReloadExtraIcons: procedure; cdecl; - pfnSetAllExtraIcons: procedure(hContact:HCONTACT); cdecl; + pfnSetAllExtraIcons: procedure(hContact:MCONTACT); cdecl; (************************************************************************************* * Miranda NG additions *************************************************************************************) - pfnGetContactIcon: function(hContact:HCONTACT):int; cdecl; + pfnGetContactIcon: function(hContact:MCONTACT):int; cdecl; pfnTrayCalcChanged:function(szChangedProto:pAnsiChar; averageMode:int; iProtoCount:int):int; cdecl; pfnGetAverageMode:function(pNetProtoCount:pint):int; cdecl; end; diff --git a/include/delphi/m_clui.inc b/include/delphi/m_clui.inc index febf121332..af9e206b88 100644 --- a/include/delphi/m_clui.inc +++ b/include/delphi/m_clui.inc @@ -58,7 +58,7 @@ const MS_CLUI_GROUPADDED:PAnsiChar = 'CLUI/GroupCreated'; { - wParam : HCONTACT + wParam : MCONTACT lParam : ICON_ID Affect : Change the icon for a contact, see notes Returns: 0 on success, [non zero] on failure @@ -67,7 +67,7 @@ const MS_CLUI_CONTACTSETICON:PAnsiChar = 'CLUI/ContactSetIcon'; { - wParam : HCONTACT + wParam : MCONTACT lParam : 0 Affect : Remove a contact from the list, see notes Returns: 0 on success, [non zereo] on failure @@ -78,7 +78,7 @@ const MS_CLUI_CONTACTDELETED:PAnsiChar = 'CLUI/ContactDeleted'; { - wParam : HCONTACT + wParam : MCONTACT lParam : ICON_ID Affect : Add a contact to the list, see note returns: 0 on success, [non zero] on failure @@ -103,7 +103,7 @@ const MS_CLUI_CONTACTADDED:PAnsiChar = 'CLUI/ContactAdded'; { - wParam : HCONTACT + wParam : MCONTACT lParam : 0 Affect : Reename a contact in the lists, see notes Returns: 0 on success, [non zero] on failure @@ -177,7 +177,7 @@ const MS_CLUI_GETCAPS:PAnsiChar = 'CLUI/GetCaps'; { - wParam : HCONTACT + wParam : MCONTACT lParam : MAKELPARAM(screenX, screenY) Affect : A contact is being dragged outside the main window Return : return [non zero] to show the drag cursor as "accepting" the drag @@ -187,7 +187,7 @@ const ME_CLUI_CONTACTDRAGGING:PAnsiChar = 'CLUI/ContactDragging'; { - wParam : HCONTACT + wParam : MCONTACT lParam : MAKELPARAM(screenX, screenY) Affect : a contact has just been dropped outside the main window, see notes Notes : return non zero to stop other hooks processing this event. @@ -196,7 +196,7 @@ const ME_CLUI_CONTACTDROPPED:PAnsiChar = 'CLUI/ContactDropped'; { - wParam : HCONTACT + wParam : MCONTACT lParam : 0 Affect : A contact that *was* being dragged outside the main window has gone back to the main window diff --git a/include/delphi/m_contacts.inc b/include/delphi/m_contacts.inc index 930574d3cd..8b39de0230 100644 --- a/include/delphi/m_contacts.inc +++ b/include/delphi/m_contacts.inc @@ -23,7 +23,7 @@ type TCONTACTINFO = record cbSize : int; dwFlag : Byte; - hContact: HCONTACT; + hContact: MCONTACT; szProto : PAnsiChar; _type : Byte; retval: record // in C this is a nameless union diff --git a/include/delphi/m_core.inc b/include/delphi/m_core.inc index 03940fbad9..d6d543405b 100644 --- a/include/delphi/m_core.inc +++ b/include/delphi/m_core.inc @@ -53,10 +53,7 @@ const DBVTF_VARIABLELENGTH = $80; // ? type - MCONTACT = DWORD; - HCONTACT = MCONTACT; - THCONTACT = HCONTACT; -type + MCONTACT = DWORD; HDBEVENT = THANDLE; PDBVARIANT = ^TDBVARIANT; TDBVARIANT = record @@ -127,7 +124,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:HCONTACT; dbei:PDBEVENTINFO):THANDLE; stdcall; +function db_event_add(hContact:MCONTACT; dbei:PDBEVENTINFO):THANDLE; stdcall; external CoreDLL name 'db_event_add'; { @@ -135,7 +132,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:HCONTACT):int; stdcall; +function db_event_count(hContact:MCONTACT):int; stdcall; external CoreDLL name 'db_event_count'; { @@ -144,7 +141,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:HCONTACT; hDbEvent:THANDLE):int; stdcall; +function db_event_delete(hContact:MCONTACT; hDbEvent:THANDLE):int; stdcall; external CoreDLL name 'db_event_delete'; { @@ -152,7 +149,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:HCONTACT):THANDLE; stdcall; +function db_event_first(hContact:MCONTACT):THANDLE; stdcall; external CoreDLL name 'db_event_first'; { @@ -166,7 +163,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:HCONTACT):THANDLE; stdcall; +function db_event_firstUnread(hContact:MCONTACT):THANDLE; stdcall; external CoreDLL name 'db_event_firstUnread'; { @@ -203,7 +200,7 @@ success This service is exceptionally slow. Use only when you have no other choice at all. } -function db_event_getContact(hDbEvent:THANDLE):HCONTACT; stdcall; +function db_event_getContact(hDbEvent:THANDLE):MCONTACT; stdcall; external CoreDLL name 'db_event_getContact'; { @@ -211,7 +208,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(hContact:HCONTACT):THANDLE; stdcall; +function db_event_last(hContact:MCONTACT):THANDLE; stdcall; external CoreDLL name 'db_event_last'; { @@ -222,7 +219,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:HCONTACT; hDbEvent:THANDLE):int; stdcall; +function db_event_markRead(hContact:MCONTACT; hDbEvent:THANDLE):int; stdcall; external CoreDLL name 'db_event_markRead'; { @@ -255,7 +252,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):HCONTACT; stdcall; +function db_find_first(const szModule:pAnsiChar=nil):MCONTACT; stdcall; external CoreDLL name 'db_find_first'; { @@ -265,53 +262,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:HCONTACT; const szModule:pAnsiChar=nil):HCONTACT; stdcall; +function db_find_next(hContact:MCONTACT; const szModule:pAnsiChar=nil):MCONTACT; stdcall; external CoreDLL name 'db_find_next'; (****************************************************************************** * DATABASE SETTINGS *) -function db_get(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; dbv:PDBVARIANT):int_ptr; stdcall; +function db_get(hContact:MCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; dbv:PDBVARIANT):int_ptr; stdcall; external CoreDLL name 'db_get'; -function db_get_b(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; errorValue:int):int; stdcall; +function db_get_b(hContact:MCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; errorValue:int):int; stdcall; external CoreDLL name 'db_get_b'; -function db_get_w(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; errorValue:int):int; stdcall; +function db_get_w(hContact:MCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; errorValue:int):int; stdcall; external CoreDLL name 'db_get_w'; -function db_get_dw(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; errorValue:dword):dword; stdcall; +function db_get_dw(hContact:MCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; errorValue:dword):dword; stdcall; external CoreDLL name 'db_get_dw'; -function db_get_s(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; dbv:PDBVARIANT; const nType:int=DBVT_ASCIIZ):int_ptr; stdcall; +function db_get_s(hContact:MCONTACT; 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:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar):pAnsiChar; stdcall; +function db_get_sa(hContact:MCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar):pAnsiChar; stdcall; external CoreDLL name 'db_get_sa'; -function db_get_wsa(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar):pWideChar; stdcall; +function db_get_wsa(hContact:MCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar):pWideChar; stdcall; external CoreDLL name 'db_get_wsa'; -function db_get_static(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; szDest:pAnsiChar; destLen:int):int; stdcall; +function db_get_static(hContact:MCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; szDest:pAnsiChar; destLen:int):int; stdcall; external CoreDLL name 'db_get_static'; -function db_get_static_utf(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; szDest:pAnsiChar; destLen:int):int; stdcall; +function db_get_static_utf(hContact:MCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; szDest:pAnsiChar; destLen:int):int; stdcall; external CoreDLL name 'db_get_static_utf'; -function db_get_wstatic(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; szDest:pWideChar; destLen:int):int; stdcall; +function db_get_wstatic(hContact:MCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; szDest:pWideChar; destLen:int):int; stdcall; external CoreDLL name 'db_get_wstatic'; -function db_set(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; dbv:PDBVARIANT):int_ptr; stdcall; +function db_set(hContact:MCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; dbv:PDBVARIANT):int_ptr; stdcall; external CoreDLL name 'db_set'; -function db_set_b(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:byte):int_ptr; stdcall; +function db_set_b(hContact:MCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:byte):int_ptr; stdcall; external CoreDLL name 'db_set_b'; -function db_set_w(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:word):int_ptr; stdcall; +function db_set_w(hContact:MCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:word):int_ptr; stdcall; external CoreDLL name 'db_set_w'; -function db_set_dw(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:dword):int_ptr; stdcall; +function db_set_dw(hContact:MCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:dword):int_ptr; stdcall; external CoreDLL name 'db_set_dw'; -function db_set_s(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pAnsiChar):int_ptr; stdcall; +function db_set_s(hContact:MCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pAnsiChar):int_ptr; stdcall; external CoreDLL name 'db_set_s'; -function db_set_ws(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pWideChar):int_ptr; stdcall; +function db_set_ws(hContact:MCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pWideChar):int_ptr; stdcall; external CoreDLL name 'db_set_ws'; -function db_set_utf(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pAnsiChar):int_ptr; stdcall; +function db_set_utf(hContact:MCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pAnsiChar):int_ptr; stdcall; external CoreDLL name 'db_set_utf'; -function db_set_blob(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:pointer; len:uint):int_ptr; stdcall; +function db_set_blob(hContact:MCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:pointer; len:uint):int_ptr; stdcall; external CoreDLL name 'db_set_blob'; -function db_unset(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar):int_ptr; stdcall; +function db_unset(hContact:MCONTACT; 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; @@ -320,36 +317,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:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar):int_ptr; stdcall; +function DBDeleteContactSetting(hContact:MCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar):int_ptr; stdcall; external CoreDLL name 'db_unset'; -function DBGetContactSettingByte(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; errorValue:int):int; stdcall; +function DBGetContactSettingByte(hContact:MCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; errorValue:int):int; stdcall; external CoreDLL name 'db_get_b'; -function DBGetContactSettingWord(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; errorValue:int):int; stdcall; +function DBGetContactSettingWord(hContact:MCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; errorValue:int):int; stdcall; external CoreDLL name 'db_get_w'; -function DBGetContactSettingDWord(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; errorValue:dword):dword; stdcall; +function DBGetContactSettingDWord(hContact:MCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; errorValue:dword):dword; stdcall; external CoreDLL name 'db_get_dw'; -function DBGetContactSetting(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; dbv:PDBVARIANT):int_ptr; stdcall; +function DBGetContactSetting(hContact:MCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; dbv:PDBVARIANT):int_ptr; stdcall; external CoreDLL name 'db_get'; -function DBGetContactSettingStr(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; dbv:PDBVARIANT; const nType:int=DBVT_ASCIIZ):int_ptr; stdcall; +function DBGetContactSettingStr(hContact:MCONTACT; 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:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar):pAnsiChar; stdcall; +function DBGetContactSettingString(hContact:MCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar):pAnsiChar; stdcall; external CoreDLL name 'db_get_sa'; -function DBGetContactSettingWString(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar):pWideChar; stdcall; +function DBGetContactSettingWString(hContact:MCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar):pWideChar; stdcall; external CoreDLL name 'db_get_wsa'; -function DBWriteContactSettingByte(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:byte):int_ptr; stdcall; +function DBWriteContactSettingByte(hContact:MCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:byte):int_ptr; stdcall; external CoreDLL name 'db_set_b'; -function DBWriteContactSettingWord(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:word):int_ptr; stdcall; +function DBWriteContactSettingWord(hContact:MCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:word):int_ptr; stdcall; external CoreDLL name 'db_set_w'; -function DBWriteContactSettingDWord(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:dword):int_ptr; stdcall; +function DBWriteContactSettingDWord(hContact:MCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:dword):int_ptr; stdcall; external CoreDLL name 'db_set_dw'; -function DBWriteContactSettingString(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pAnsiChar):int_ptr; stdcall; +function DBWriteContactSettingString(hContact:MCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pAnsiChar):int_ptr; stdcall; external CoreDLL name 'db_set_s'; -function DBWriteContactSettingWString(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pWideChar):int_ptr; stdcall; +function DBWriteContactSettingWString(hContact:MCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pWideChar):int_ptr; stdcall; external CoreDLL name 'db_set_ws'; -function DBWriteContactSettingUTF8String(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pAnsiChar):int_ptr; stdcall; +function DBWriteContactSettingUTF8String(hContact:MCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; const val:pAnsiChar):int_ptr; stdcall; external CoreDLL name 'db_set_utf'; -function DBWriteContactSettingBlob(hContact:HCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:pointer; len:uint):int_ptr; stdcall; +function DBWriteContactSettingBlob(hContact:MCONTACT; const szModule:pAnsiChar; const szSetting:pAnsiChar; val:pointer; len:uint):int_ptr; stdcall; external CoreDLL name 'db_set_blob'; /////////////////////////////////////////////////////////////////////////////// @@ -431,7 +428,7 @@ procedure KillModuleServices(hInst:HINST); stdcall; procedure KillObjectServices(var ptr); stdcall; external CoreDLL name 'KillObjectServices'; -function CallContactService(hContact:HCONTACT;const name:PAnsiChar;wParam:WPARAM;lParam:LPARAM):int_ptr; cdecl; +function CallContactService(hContact:MCONTACT;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'; @@ -681,7 +678,7 @@ function mir_vsnwprintf(buffer:pWideChar;count:size_t;fmt:pWideChar;va:va_list): /////////////////////////////////////////////////////////////////////////////// // protocol functions -function ProtoBroadcastAck(const szModule:PAnsiChar; hContact:HCONTACT; type_:int; result_:int; hProcess:THANDLE; lParam:LPARAM): int_ptr; stdcall; +function ProtoBroadcastAck(const szModule:PAnsiChar; hContact:MCONTACT; type_:int; result_:int; hProcess:THANDLE; lParam:LPARAM): int_ptr; stdcall; external CoreDLL name 'ProtoBroadcastAck'; function ProtoServiceExists(const szModule, szName:PAnsiChar):int; stdcall; diff --git a/include/delphi/m_database.inc b/include/delphi/m_database.inc index 7a5cda29b5..16d562c21f 100644 --- a/include/delphi/m_database.inc +++ b/include/delphi/m_database.inc @@ -332,10 +332,10 @@ const //************************** EVENTS ******************************** { - wParam : HCONTACT + wParam : MCONTACT lParam : HDBCONTACT Affect : Called when a new event has been added to the event chain - for a contact, HCONTACT contains the contact who added the event, + for a contact, MCONTACT contains the contact who added the event, HDBCONTACT a handle to what was added. see notes notes : since events are sorted chronologically, you can not guarantee @@ -361,14 +361,14 @@ const ME_DB_EVENT_FILTER_ADD:PAnsiChar = 'DB/Event/FilterAdd'; { - wParam : HCONTACT + wParam : MCONTACT lParam : HANDLE Affect : Called when an event is marked read } ME_DB_EVENT_MARKED_READ:PAnsiChar = 'DB/Event/Marked/Read'; { - wParam : HCONTACT + wParam : MCONTACT lParam : HANDLE Affect : Called when an event is about to be deleted from the event chain for a contact, see notes @@ -378,15 +378,15 @@ const ME_DB_EVENT_DELETED:PAnsiChar = 'DB/Event/Deleted'; { - wParam : HCONTACT + wParam : MCONTACT lParam : 0 Affect : Called when a new contact has been added to the database, - HCONTACT contains a handle to the new contact. + MCONTACT contains a handle to the new contact. } ME_DB_CONTACT_ADDED:PAnsiChar = 'DB/Contact/Added'; { - wParam : HCONTACT + wParam : MCONTACT lParam : 0 Affect : Called when a contact is about to be deleted Returns: Returning nonzero from your hook will not stop the deletion @@ -395,7 +395,7 @@ const ME_DB_CONTACT_DELETED:PAnsiChar = 'DB/Contact/Deleted'; { - wParam : HCONTACT + wParam : MCONTACT lParam : Pointer to a TDBCONTACTWRITESETTING Affect : Calleed when a contact has one of it's settings changed hContact is a valid handle to the contact that has changed, diff --git a/include/delphi/m_email.inc b/include/delphi/m_email.inc index 38c0b49392..9e35352259 100644 --- a/include/delphi/m_email.inc +++ b/include/delphi/m_email.inc @@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. const { - wParam : HCONTACT + wParam : MCONTACT lParam : 0 Affects: Send an e-mail to the specified contact, see notes Returns: Returns 0 on success or nonzero on failure diff --git a/include/delphi/m_extraicons.inc b/include/delphi/m_extraicons.inc index 92351cf8f6..369c1e6270 100644 --- a/include/delphi/m_extraicons.inc +++ b/include/delphi/m_extraicons.inc @@ -92,7 +92,7 @@ type TEXTRAICON = record cbSize :int; hExtraIcon:THANDLE; // Value returned by MS_EXTRAICON_REGISTER - hContact :HCONTACT; // Contact to set the extra icon + hContact :MCONTACT; // Contact to set the extra icon // The icon to be set. This depends on the type of the extra icon: case boolean of false:(hImage :THANDLE); // Value returned by MS_CLIST_EXTRA_ADD_ICON (if EXTRAICON_TYPE_CALLBACK) diff --git a/include/delphi/m_file.inc b/include/delphi/m_file.inc index 760ade5646..27a8e582b9 100644 --- a/include/delphi/m_file.inc +++ b/include/delphi/m_file.inc @@ -56,27 +56,27 @@ const MS_FILE_SENDSPECIFICFILEST:PAnsiChar = 'SRFile/SendSpecificFilesT'; { - wParam : HCONTACT + wParam : MCONTACT lParam : Pointer to a buffer Affects: returns the received files folder for a contact, the buffer should be at least MAX_PATH long (defined with WinAPI), the returned path may not exist -- see notes Returns: Returns 0 on success [non zero] on failure - Notes : If HCONTACT is NULL(0) the path returned is the path + Notes : If MCONTACT is NULL(0) the path returned is the path without the postfix contact name. Version: v0.1.2.2+ } MS_FILE_GETRECEIVEDFILESFOLDER:PAnsiChar = 'SRFile/GetReceivedFilesFolder'; { - wParam : HCONTACT + wParam : MCONTACT lParam : file selection dialog's window Notes : notifies a caller about file send start } ME_FILEDLG_SUCCEEDED:PAnsiChar = 'SRFile/Dlg/Succeeded'; { - wParam : HCONTACT + wParam : MCONTACT lParam : file selection dialog's window Notes : notifies a caller about file send cancellation } diff --git a/include/delphi/m_helpers.inc b/include/delphi/m_helpers.inc index 966bf0577d..13537c7c9d 100644 --- a/include/delphi/m_helpers.inc +++ b/include/delphi/m_helpers.inc @@ -16,12 +16,12 @@ function Netlib_Send(hConn: THandle; const buf: PAnsiChar; len: int; flags: int) function Netlib_Recv(hConn: THandle; const buf: PAnsiChar; len: int; flags: int): int_ptr; procedure Netlib_Log(hNetLib: THandle; const sz: PAnsiChar); -function WindowList_Add (hList:THandle; hWnd:HWND; hContact:HCONTACT): int_ptr; +function WindowList_Add (hList:THandle; hWnd:HWND; hContact:MCONTACT): int_ptr; function WindowList_Remove (hList:THandle; hWnd:THandle): int_ptr; -function WindowList_Find (hList:THandle; hContact:HCONTACT): int_ptr; +function WindowList_Find (hList:THandle; hContact:MCONTACT): int_ptr; function WindowList_Broadcast(hList:THandle; message: int; wParam: WPARAM; lParam: LPARAM): int_ptr; -function Utils_SaveWindowPosition (hWnd:THandle; hContact:HCONTACT; const szModule, szNamePrefix: PAnsiChar): int_ptr; -function Utils_RestoreWindowPosition(hWnd:THandle; hContact:HCONTACT; Flags: int; const szModule, szNamePrefix: PAnsiChar): int_ptr; +function Utils_SaveWindowPosition (hWnd:THandle; hContact:MCONTACT; const szModule, szNamePrefix: PAnsiChar): int_ptr; +function Utils_RestoreWindowPosition(hWnd:THandle; hContact:MCONTACT; Flags: int; const szModule, szNamePrefix: PAnsiChar): int_ptr; function mir_hashstr (const key:pAnsiChar):uint; {inline;} function mir_hashstrW(const key:pWideChar):uint; {inline;} @@ -42,8 +42,8 @@ function CreateProtoServiceFunction(const szModule, szService: PAnsiChar; servic function Srmm_AddIcon (sid: PStatusIconData):int_ptr; procedure Srmm_RemoveIcon(sid: PStatusIconData); -procedure Srmm_ModifyIcon(hContact:HCONTACT; sid:PStatusIconData); -function Srmm_GetNthIcon(hContact:HCONTACT; index:int):pStatusIconData; +procedure Srmm_ModifyIcon(hContact:MCONTACT; sid:PStatusIconData); +function Srmm_GetNthIcon(hContact:MCONTACT; index:int):pStatusIconData; function LoadSkinnedIcon (id: int): HICON; function LoadSkinnedIconHandle(id: int): THandle; @@ -185,7 +185,7 @@ begin end; -function WindowList_Add(hList: THandle; hWnd: hWnd; hContact: HCONTACT): int_ptr; +function WindowList_Add(hList: THandle; hWnd: hWnd; hContact: MCONTACT): int_ptr; var wle: TWINDOWLISTENTRY; begin @@ -201,7 +201,7 @@ begin Result := CallService(MS_UTILS_REMOVEFROMWINDOWLIST, hList, hWnd); end; -function WindowList_Find(hList: THandle; hContact: HCONTACT): int_ptr; +function WindowList_Find(hList: THandle; hContact: MCONTACT): int_ptr; {$IFDEF AllowInline}inline;{$ENDIF} begin Result := CallService(MS_UTILS_FINDWINDOWINLIST, hList, hContact); @@ -217,7 +217,7 @@ begin Result := CallService(MS_UTILS_BROADCASTTOWINDOWLIST, hList, tLparam(@Msg)); end; -function Utils_SaveWindowPosition(hWnd:THandle; hContact:HCONTACT; const szModule, szNamePrefix: PAnsiChar): int_ptr; +function Utils_SaveWindowPosition(hWnd:THandle; hContact:MCONTACT; const szModule, szNamePrefix: PAnsiChar): int_ptr; var swp: TSAVEWINDOWPOS; begin @@ -228,7 +228,7 @@ begin Result := CallService(MS_UTILS_SAVEWINDOWPOSITION, 0, lParam(@swp)); end; -function Utils_RestoreWindowPosition(hWnd:THandle; hContact:HCONTACT; Flags:int; const szModule, szNamePrefix: PAnsiChar): int_ptr; +function Utils_RestoreWindowPosition(hWnd:THandle; hContact:MCONTACT; Flags:int; const szModule, szNamePrefix: PAnsiChar): int_ptr; var swp: TSAVEWINDOWPOS; begin @@ -356,13 +356,13 @@ begin CallService(MS_MSG_REMOVEICON, 0, LPARAM(sid)); end; -procedure Srmm_ModifyIcon(hContact:HCONTACT; sid:PStatusIconData); +procedure Srmm_ModifyIcon(hContact:MCONTACT; sid:PStatusIconData); {$IFDEF AllowInline}inline;{$ENDIF} begin CallService(MS_MSG_GETNTHICON, hContact, LPARAM(sid)); end; -function Srmm_GetNthIcon(hContact:HCONTACT; index:int):PStatusIconData; +function Srmm_GetNthIcon(hContact:MCONTACT; index:int):PStatusIconData; {$IFDEF AllowInline}inline;{$ENDIF} begin result:=PStatusIconData(CallService(MS_MSG_GETNTHICON, hContact, index)); diff --git a/include/delphi/m_history.inc b/include/delphi/m_history.inc index 006528de95..b51d34ffeb 100644 --- a/include/delphi/m_history.inc +++ b/include/delphi/m_history.inc @@ -25,10 +25,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. const { - wParam : HCONTACT + wParam : MCONTACT lParam : 0 Affects: Show's the history dialog box for a contact, see notes - Notes : HCONTACT can be NULL(0) to show system messages + Notes : MCONTACT can be NULL(0) to show system messages } MS_HISTORY_SHOWCONTACTHISTORY:PAnsiChar = 'History/ShowContactHistory'; diff --git a/include/delphi/m_ignore.inc b/include/delphi/m_ignore.inc index 9880e9bf33..4c6cb1fc02 100644 --- a/include/delphi/m_ignore.inc +++ b/include/delphi/m_ignore.inc @@ -37,11 +37,11 @@ const IGNOREEVENT_TYPINGNOTIFY = 7; // 0.7+ { - wParam : HCONTACT + wParam : MCONTACT lParam : IGNOREEVENT_* Affects: Determines if a message type to a contact should be ignored, see notes Returns: 0 if the message type MUST be shown [non zero] if it MUST be ignored - Notes : HCONTACT can be NULL(0) to see what to do with a contact + Notes : MCONTACT can be NULL(0) to see what to do with a contact that isn't on the list (or is unknown in some way) don't use the IGNOREEVENT_ALL type! Version: v0.1.0.1+ @@ -49,7 +49,7 @@ const MS_IGNORE_ISIGNORED:PAnsiChar = 'Ignore/IsIgnored'; { - wParam : HCONTACT + wParam : MCONTACT lParam : IGNOREEVENT_* constant Affects: Ignore future messages from a contact, see notes Returns: 0 on success, [nonzero] on failure @@ -61,11 +61,11 @@ const MS_IGNORE_IGNORE:PAnsiChar = 'Ignore/Ignore'; { - wParam : HCONTACT + wParam : MCONTACT lParam : IGNOREEVENT_* Affects: Receive future messages from a contact -- of the given type, see notes Returns: 0 on success, non zero on failure - Notes : Use NULL(0) for HCONTACT to retrieve the setting for an unknown contact + Notes : Use NULL(0) for MCONTACT to retrieve the setting for an unknown contact Version: v0.1.0.1+ } MS_IGNORE_UNIGNORE:PAnsiChar = 'Ignore/Unignore'; diff --git a/include/delphi/m_message.inc b/include/delphi/m_message.inc index 19ae286e38..a4e1bdb66f 100644 --- a/include/delphi/m_message.inc +++ b/include/delphi/m_message.inc @@ -57,7 +57,7 @@ type PMessageWindowEventData = ^TMessageWindowEventData; TMessageWindowEventData = record cbSize : int; - hContact : HCONTACT; + hContact : MCONTACT; hwndWindow: HWND; // top level window for the contact szModule : PAnsiChar; // used to get plugin type (which means you could use // local if needed) @@ -87,7 +87,7 @@ type PMessageWindowInputData = ^TMessageWindowInputData; TMessageWindowInputData = record cbSize : int; - hContact: HCONTACT; + hContact: MCONTACT; uFlags : int; // see uflags above end; @@ -102,7 +102,7 @@ type PMessageWindowOutputData = ^TMessageWindowOutputData; TMessageWindowOutputData = record cbSize : int; - hContact : HCONTACT; + hContact : MCONTACT; uFlags : int; // should be same as input data unless 0, then it // will be the actual type hwndWindow: HWND; // top level window for the contact or NULL if no window exists @@ -131,7 +131,7 @@ type MessageWindowEvent = record cbSize :int; seq :int; // number returned by PSS_MESSAGE - hContact :HCONTACT; + hContact :MCONTACT; dbei :PDBEVENTINFO; // database event written on the basis of message sent end; @@ -161,7 +161,7 @@ type cbSize :int; uType :uint; // see popup types above uFlags :uint; // used to indicate in which window the popup was requested - hContact :HCONTACT; + hContact :MCONTACT; hwnd :HWND; // window where the popup was requested hMenu :HMENU; // The handle to the menu pt :TPOINT; // The point, in screen coords diff --git a/include/delphi/m_msg_buttonsbar.inc b/include/delphi/m_msg_buttonsbar.inc index cc982b9f92..45abb43564 100644 --- a/include/delphi/m_msg_buttonsbar.inc +++ b/include/delphi/m_msg_buttonsbar.inc @@ -80,7 +80,7 @@ type pszModule :PAnsiChar; // button owners name dwButtonId:DWORD; // registered button ID hwndFrom :HWND; // button parents HWND - hContact :HCONTACT; + hContact :MCONTACT; flags :DWORD; // BBCF_ flags end; diff --git a/include/delphi/m_popup.inc b/include/delphi/m_popup.inc index 804140f6d6..0008878eba 100644 --- a/include/delphi/m_popup.inc +++ b/include/delphi/m_popup.inc @@ -56,7 +56,7 @@ type type PPOPUPDATA = ^TPOPUPDATA; TPOPUPDATA = record - lchContact : HCONTACT; + lchContact : MCONTACT; lchIcon : HICON; lpszContactName : array [0..MAX_CONTACTNAME-1] of AnsiChar; lpszText : array [0..MAX_SECONDLINE -1] of AnsiChar; @@ -81,7 +81,7 @@ type type PPOPUPDATAW = ^TPOPUPDATAW; TPOPUPDATAW = record - lchContact : HCONTACT; + lchContact : MCONTACT; lchIcon : HICON; lpwzContactName : array [0..MAX_CONTACTNAME-1] of WideChar; lpwzText : array [0..MAX_SECONDLINE -1] of WideChar; @@ -354,7 +354,7 @@ type szTitle :TChar; szText :TChar; PluginData :pointer; - hContact :HCONTACT; + hContact :MCONTACT; end; POPUPDATACLASS = TPOPUPDATACLASS; diff --git a/include/delphi/m_protocols.inc b/include/delphi/m_protocols.inc index 70b8465012..fcea7499fd 100644 --- a/include/delphi/m_protocols.inc +++ b/include/delphi/m_protocols.inc @@ -32,7 +32,7 @@ type PCCSDATA = ^TCCSDATA; TCCSDATA = record - hContact : HCONTACT; + hContact : MCONTACT; szProtoService: PAnsiChar; // a PS_* constant wParam : WPARAM; lParam : LPARAM; @@ -52,7 +52,7 @@ type TACKDATA = record cbSize : int; szModule: PAnsiChar; // the name of the protocol module which initiated this ack - hContact: HCONTACT; + hContact: MCONTACT; _type : int; // an ACKTYPE_* constant _result : int; // an ACKRESULT_* constant hProcess: THANDLE; // caller defined seq, I mean process code @@ -123,7 +123,7 @@ type PPROTOFILETRANSFERSTATUS = ^TPROTOFILETRANSFERSTATUS; TPROTOFILETRANSFERSTATUS = record cbSize : size_t; - hContact : HCONTACT; + hContact : MCONTACT; flags : dword; // one of PFTS_* constants files : ^TCHAR; totalFiles : int; @@ -389,7 +389,7 @@ type PPROTO_AVATAR_INFORMATIONW = ^TPROTO_AVATAR_INFORMATIONW; TPROTO_AVATAR_INFORMATIONW = record cbSize : int; // sizeof() - hContact: HCONTACT; // this might have to be set by the caller too + hContact: MCONTACT; // this might have to be set by the caller too format : int; // PA_FORMAT_* // full path to filename which contains the avatar filename: array[0..(MAX_PATH)-1] of WideChar; @@ -398,7 +398,7 @@ type PPROTO_AVATAR_INFORMATION = ^TPROTO_AVATAR_INFORMATION; TPROTO_AVATAR_INFORMATION = record cbSize : int; // sizeof() - hContact: HCONTACT; // this might have to be set by the caller too + hContact: MCONTACT; // this might have to be set by the caller too format : int; // PA_FORMAT_* // full path to filename which contains the avatar filename: array[0..(MAX_PATH)-1] of AnsiChar; diff --git a/include/delphi/m_protoint.inc b/include/delphi/m_protoint.inc index 4d5a9efeaf..40325831bd 100644 --- a/include/delphi/m_protoint.inc +++ b/include/delphi/m_protoint.inc @@ -55,21 +55,21 @@ type ////////////////////////////////////////////////////////////////////////////////////// // Virtual functions - AddToList :function(intf:PPROTO_INTERFACE;flags:int; var psr:TPROTOSEARCHRESULT):HCONTACT; cdecl; - AddToListByEvent:function(intf:PPROTO_INTERFACE;flags:int; iContact:int; hDbEvent:THANDLE):HCONTACT; cdecl; + AddToList :function(intf:PPROTO_INTERFACE;flags:int; var psr:TPROTOSEARCHRESULT):MCONTACT; cdecl; + AddToListByEvent:function(intf:PPROTO_INTERFACE;flags:int; iContact:int; hDbEvent:THANDLE):MCONTACT; cdecl; Authorize :function(intf:PPROTO_INTERFACE;hDbEvent:THANDLE):int; cdecl; AuthDeny :function(intf:PPROTO_INTERFACE;hDbEvent:THANDLE;const szReason:TChar):int; cdecl; - AuthRecv :function(intf:PPROTO_INTERFACE;hContact:HCONTACT;var ptr:TPROTORECVEVENT):int; cdecl; - AuthRequest:function(intf:PPROTO_INTERFACE;hContact:HCONTACT;szMessage:TChar):int; cdecl; + AuthRecv :function(intf:PPROTO_INTERFACE;hContact:MCONTACT;var ptr:TPROTORECVEVENT):int; cdecl; + AuthRequest:function(intf:PPROTO_INTERFACE;hContact:MCONTACT;szMessage:TChar):int; cdecl; - FileAllow :function(intf:PPROTO_INTERFACE;hContact:HCONTACT;hTransfer:THANDLE; szPath:PROTOCHAR):THANDLE; cdecl; - FileCancel:function(intf:PPROTO_INTERFACE;hContact:HCONTACT;hTransfer:THANDLE):int; cdecl; - FileDeny :function(intf:PPROTO_INTERFACE;hContact:HCONTACT;hTransfer:THANDLE; var szReason:PROTOCHAR):int; cdecl; + FileAllow :function(intf:PPROTO_INTERFACE;hContact:MCONTACT;hTransfer:THANDLE; szPath:PROTOCHAR):THANDLE; cdecl; + FileCancel:function(intf:PPROTO_INTERFACE;hContact:MCONTACT;hTransfer:THANDLE):int; cdecl; + FileDeny :function(intf:PPROTO_INTERFACE;hContact:MCONTACT;hTransfer:THANDLE; var szReason:PROTOCHAR):int; cdecl; FileResume:function(intf:PPROTO_INTERFACE;hTransfer:THANDLE;var action:Integer; var szFilename:PROTOCHAR):int; cdecl; - GetCaps:function(intf:PPROTO_INTERFACE;_type:int;hContact:HCONTACT=0):dword_ptr; cdecl; - GetInfo:function(intf:PPROTO_INTERFACE;hContact:HCONTACT;infoType:int):int; cdecl; + GetCaps:function(intf:PPROTO_INTERFACE;_type:int;hContact:MCONTACT=0):dword_ptr; cdecl; + GetInfo:function(intf:PPROTO_INTERFACE;hContact:MCONTACT;infoType:int):int; cdecl; SearchBasic :function(intf:PPROTO_INTERFACE;id:PAnsiChar):THANDLE; cdecl; SearchByEmail :function(intf:PPROTO_INTERFACE;email:PAnsiChar):THANDLE; cdecl; @@ -77,24 +77,24 @@ type SearchAdvanced :function(intf:PPROTO_INTERFACE;owner:HWND):HWND; cdecl; CreateExtendedSearchUI:function(intf:PPROTO_INTERFACE;owner:HWND):HWND; cdecl; - RecvContacts:function(intf:PPROTO_INTERFACE;hContact:HCONTACT;var ptr:TPROTORECVEVENT):int; cdecl; - RecvFile :function(intf:PPROTO_INTERFACE;hContact:HCONTACT;var ptr:TPROTORECVEVENT):int; cdecl; - RecvMessage :function(intf:PPROTO_INTERFACE;hContact:HCONTACT;var ptr:TPROTORECVEVENT):int; cdecl; - RecvUrl :function(intf:PPROTO_INTERFACE;hContact:HCONTACT;var ptr:TPROTORECVEVENT):int; cdecl; + RecvContacts:function(intf:PPROTO_INTERFACE;hContact:MCONTACT;var ptr:TPROTORECVEVENT):int; cdecl; + RecvFile :function(intf:PPROTO_INTERFACE;hContact:MCONTACT;var ptr:TPROTORECVEVENT):int; cdecl; + RecvMessage :function(intf:PPROTO_INTERFACE;hContact:MCONTACT;var ptr:TPROTORECVEVENT):int; cdecl; + RecvUrl :function(intf:PPROTO_INTERFACE;hContact:MCONTACT;var ptr:TPROTORECVEVENT):int; cdecl; - SendContacts:function(intf:PPROTO_INTERFACE;hContact:HCONTACT;flags:int; nContacts:int; var hContactsList:THANDLE):int; cdecl; - SendFile :function(intf:PPROTO_INTERFACE;hContact:HCONTACT;szDescription:PROTOCHAR; var ppszFiles:PROTOCHAR):THANDLE; cdecl; - SendMessage :function(intf:PPROTO_INTERFACE;hContact:HCONTACT;flags:int; const msg:PAnsiChar):int; cdecl; - SendUrl :function(intf:PPROTO_INTERFACE;hContact:HCONTACT;flags:int; const url:PAnsiChar):int; cdecl; + SendContacts:function(intf:PPROTO_INTERFACE;hContact:MCONTACT;flags:int; nContacts:int; var hContactsList:THANDLE):int; cdecl; + SendFile :function(intf:PPROTO_INTERFACE;hContact:MCONTACT;szDescription:PROTOCHAR; var ppszFiles:PROTOCHAR):THANDLE; cdecl; + SendMessage :function(intf:PPROTO_INTERFACE;hContact:MCONTACT;flags:int; const msg:PAnsiChar):int; cdecl; + SendUrl :function(intf:PPROTO_INTERFACE;hContact:MCONTACT;flags:int; const url:PAnsiChar):int; cdecl; - SetApparentMode:function(intf:PPROTO_INTERFACE;hContact:HCONTACT;mode:int):int; cdecl; + SetApparentMode:function(intf:PPROTO_INTERFACE;hContact:MCONTACT;mode:int):int; cdecl; SetStatus :function(intf:PPROTO_INTERFACE;iNewStatus:int):int; cdecl; - GetAwayMsg :function(intf:PPROTO_INTERFACE;hContact:HCONTACT):THANDLE; cdecl; - RecvAwayMsg:function(intf:PPROTO_INTERFACE;hContact:HCONTACT;mode:int;var evt:TPROTORECVEVENT):int; cdecl; + GetAwayMsg :function(intf:PPROTO_INTERFACE;hContact:MCONTACT):THANDLE; cdecl; + RecvAwayMsg:function(intf:PPROTO_INTERFACE;hContact:MCONTACT;mode:int;var evt:TPROTORECVEVENT):int; cdecl; SetAwayMsg :function(intf:PPROTO_INTERFACE;iStatus:int; const msg:PAnsiChar):int; cdecl; - UserIsTyping:function(intf:PPROTO_INTERFACE;hContact:HCONTACT; _type:int):int; cdecl; + UserIsTyping:function(intf:PPROTO_INTERFACE;hContact:MCONTACT; _type:int):int; cdecl; OnEvent:function(intf:PPROTO_INTERFACE;iEventType:TPROTOEVENTTYPE;wParam:WPARAM;lParam:LPARAM):int; cdecl; end; diff --git a/include/delphi/m_protomod.inc b/include/delphi/m_protomod.inc index 6a9b3622cd..0fe4d463c9 100644 --- a/include/delphi/m_protomod.inc +++ b/include/delphi/m_protomod.inc @@ -44,7 +44,7 @@ const MS_PROTO_REGISTERMODULE:PAnsiChar = 'Proto/RegisterModule'; { - wParam : HCONTACT + wParam : MCONTACT lParam : protocol_name_string Affect : Add the given protocol module to the chain for a contact, see notes Returns: 0 success, [non zero] on failure @@ -54,7 +54,7 @@ const MS_PROTO_ADDTOCONTACT:PAnsiChar = 'Proto/AddToContact'; { - wParam : HCONTACT + wParam : MCONTACT lParam : protocol_name_string Affect : Remove the given protocol name from the chain for the given contact Returns: 0 on success, [non zero] on failure diff --git a/include/delphi/m_protosvc.inc b/include/delphi/m_protosvc.inc index 4ec06e3775..f08315bc40 100644 --- a/include/delphi/m_protosvc.inc +++ b/include/delphi/m_protosvc.inc @@ -484,12 +484,12 @@ type wParam : flags lParam : Pointer to a TPROTOSEARCHRESULT structure Affect : Adds a search result to the contact list, see notes - Returns: A handle to the new contact (HCONTACT) or NULL(0) on failure + Returns: A handle to the new contact (MCONTACT) or NULL(0) on failure Notes : The pointer MUST be a result returned by a search function since there maybe extra protocol-spec data required by the protocol. - the protocol module should not allow duplicate contains to be added, - but if such a request *is* received it should return a HCONTACT + but if such a request *is* received it should return a MCONTACT to the original user, - If flags is PALF_TEMPORARY set, the contact should be added @@ -503,7 +503,7 @@ const wParam : MAKEWPARAM(flags, iContact) lParam : HDBEVENT Affects: Add a contact to the contact list given an auth/added/contacts events, see notes - Returns: A HCONTACT or NULL(0) on failure + Returns: A MCONTACT or NULL(0) on failure Notes : HDBEVENT must be either EVENTTYPE_AUTHREQ or EVENTTYPE_ADDED flags are the same as PS_ADDTOLIST, - @@ -672,7 +672,7 @@ const flags which may have SGIF_MINIMAL set to only get "basic" information, such as nickname, email address. - PCCSDATA(lParam)^.hContact has the HCONTACT handle to get user + PCCSDATA(lParam)^.hContact has the MCONTACT handle to get user information for. Will update all the information in the database and then @@ -757,7 +757,7 @@ const CCSDATA: Yes wParam : 0 lParam : 0 - Affect : Send a request to retrieve HCONTACT's mode message, see notes + Affect : Send a request to retrieve MCONTACT's mode message, see notes Returns: a hProcess which will be ack'd later, NULL(0) on failure Notes : the reply will come in a form of an ack : diff --git a/include/delphi/m_timezones.inc b/include/delphi/m_timezones.inc index b669d7386e..4e929c9303 100644 --- a/include/delphi/m_timezones.inc +++ b/include/delphi/m_timezones.inc @@ -43,17 +43,17 @@ type cbSize:size_t; createByName :function (tszName:TChar; dwFlags:dword):THANDLE; cdecl; - createByContact:function (hContact:HCONTACT; szModule:pAnsiChar; dwFlags:dword):THANDLE; - storeByContact :procedure(hContact:HCONTACT; szModule:pAnsiChar; hTZ:THANDLE); cdecl; + createByContact:function (hContact:MCONTACT; szModule:pAnsiChar; dwFlags:dword):THANDLE; + storeByContact :procedure(hContact:MCONTACT; szModule:pAnsiChar; hTZ:THANDLE); cdecl; printDateTime:function(hTZ:THANDLE; szFormat:TChar; szDest:TChar; cbDest:int; dwFlags:dword):int; cdecl; printTimeStamp:function(hTZ:THANDLE; ts:mir_time; szFormat:TChar; szDest:TChar; cbDest:int; dwFlags:dword):int; cdecl; - prepareList :function (hContact:HCONTACT; szModule:pAnsiChar; hWnd:HWND; dwFlags:dword):int; cdecl; - selectListItem :function (hContact:HCONTACT; szModule:pAnsiChar; hWnd:HWND; dwFlags:dword):int; cdecl; - storeListResults:procedure(hContact:HCONTACT; szModule:pAnsiChar; hWnd:HWND; dwFlags:dword); cdecl; + prepareList :function (hContact:MCONTACT; szModule:pAnsiChar; hWnd:HWND; dwFlags:dword):int; cdecl; + selectListItem :function (hContact:MCONTACT; szModule:pAnsiChar; hWnd:HWND; dwFlags:dword):int; cdecl; + storeListResults:procedure(hContact:MCONTACT; szModule:pAnsiChar; hWnd:HWND; dwFlags:dword); cdecl; getTimeZoneTime:function(hTZ:THANDLE; var st:SYSTEMTIME):int; cdecl; timeStampToTimeZoneTimeStamp:function(hTZ:THANDLE; ts:mir_time):time_t; cdecl; diff --git a/include/delphi/m_url.inc b/include/delphi/m_url.inc index a1a43458ba..47f866f56b 100644 --- a/include/delphi/m_url.inc +++ b/include/delphi/m_url.inc @@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. const { - wParam : HCONTACT + wParam : MCONTACT lParam : 0 Affects: bring up the send URL dialogbox for a user Returns: 0 on success, nonzero on failure, see notes diff --git a/include/delphi/m_utils.inc b/include/delphi/m_utils.inc index effcad304d..2712ea4b11 100644 --- a/include/delphi/m_utils.inc +++ b/include/delphi/m_utils.inc @@ -78,13 +78,13 @@ type TWINDOWLISTENTRY = record hList : THANDLE; hWnd : HWND; - hContact: HCONTACT; + hContact: MCONTACT; end; PSAVEWINDOWPOS = ^TSAVEWINDOWPOS; TSAVEWINDOWPOS = record hWnd : HWND; - hContact : HCONTACT; + hContact : MCONTACT; szModule : PAnsiChar; // module name eto store the settings in szNamePrefix: PAnsiChar; // text to prefix on 'x', 'width', etc end; @@ -188,7 +188,7 @@ const { wParam : Handle to the window list to look in - lParam : Handle to a HCONTACT to find in the window list + lParam : Handle to a MCONTACT to find in the window list Affect : Find a window handle given the hContact Returns: The found window handle or NULL(0) on failure } @@ -349,7 +349,7 @@ type TREPLACEVARSDATA = record cbSize :int; dwFlags :dword; - hContact :HCONTACT; + hContact :MCONTACT; variables:PREPLACEVARSARRAY; end; -- cgit v1.2.3