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 --- .../Chess4Net/MI/MirandaINC/m_addcontact.inc | 2 +- .../Chess4Net/MI/MirandaINC/m_awaymsg.inc | 2 +- .../Chess4Net/MI/MirandaINC/m_clist.inc | 30 +++---- .../!NotAdopted/Chess4Net/MI/MirandaINC/m_clui.inc | 14 ++-- .../Chess4Net/MI/MirandaINC/m_database.inc | 36 ++++---- .../Chess4Net/MI/MirandaINC/m_email.inc | 2 +- .../!NotAdopted/Chess4Net/MI/MirandaINC/m_file.inc | 8 +- .../Chess4Net/MI/MirandaINC/m_history.inc | 4 +- .../Chess4Net/MI/MirandaINC/m_ignore.inc | 10 +-- .../Chess4Net/MI/MirandaINC/m_message.inc | 2 +- .../Chess4Net/MI/MirandaINC/m_popup.inc | 4 +- .../Chess4Net/MI/MirandaINC/m_protocols.inc | 4 +- .../Chess4Net/MI/MirandaINC/m_protomod.inc | 4 +- .../Chess4Net/MI/MirandaINC/m_protosvc.inc | 10 +-- .../!NotAdopted/Chess4Net/MI/MirandaINC/m_url.inc | 2 +- .../Chess4Net/MI/MirandaINC/m_userinfo.inc | 6 +- .../Chess4Net/MI/MirandaINC/m_utils.inc | 2 +- plugins/Actman30/iac_contact.pas | 2 +- plugins/Actman30/iac_dbrw.pas | 4 +- plugins/Actman30/iac_global.pas | 8 +- plugins/Actman30/iac_inout.pas | 2 +- plugins/Actman30/ua/i_uaplaces.inc | 2 +- plugins/ExternalAPI/delphi/m_sessions.inc | 6 +- plugins/ExternalAPI/delphi/m_smileyadd.inc | 10 +-- plugins/ExternalAPI/delphi/m_spamfilter.inc | 2 +- plugins/ExternalAPI/delphi/m_tipper.inc | 2 +- plugins/ExternalAPI/delphi/m_variables.inc | 2 +- plugins/ExternalAPI/delphi/m_yamn.inc | 6 +- plugins/HistoryPlusPlus/historypp.dpr | 6 +- plugins/QuickSearch/i_ok.inc | 6 +- plugins/QuickSearch/sr_window.pas | 22 ++--- plugins/Utils.pas/contact.pas | 6 +- plugins/Utils.pas/dbsettings.pas | 84 +++++++++---------- plugins/Utils.pas/mirutils.pas | 92 ++++++++++----------- plugins/Utils.pas/sparam.pas | 4 +- plugins/Variables/src/help.cpp | 96 +++++++++++----------- plugins/Watrack/proto/proto.pas | 4 +- plugins/mRadio/i_myservice.inc | 8 +- plugins/mRadio/i_search.inc | 2 +- plugins/mRadio/i_service.inc | 2 +- plugins/mRadio/rglobal.pas | 6 +- 41 files changed, 265 insertions(+), 261 deletions(-) (limited to 'plugins') diff --git a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_addcontact.inc b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_addcontact.inc index 6bf08e8208..ad54b3b6d8 100644 --- a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_addcontact.inc +++ b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_addcontact.inc @@ -36,7 +36,7 @@ type PADDCONTACTSTRUCT = ^TADDCONTACTSTRUCT; TADDCONTACTSTRUCT = record handleType: Integer; - handle: THandle; // HDBEVENT, HCONTACT, SearchResult + handle: THandle; // HDBEVENT, MCONTACT, SearchResult szProto: PChar; // used by search result only psr: Pointer; // @PROTOSEARCHRESULT end; diff --git a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_awaymsg.inc b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_awaymsg.inc index 44be914423..c14b024b04 100644 --- a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_awaymsg.inc +++ b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_awaymsg.inc @@ -28,7 +28,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/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_clist.inc b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_clist.inc index 20a3fb0e29..ecf3e52bc7 100644 --- a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_clist.inc +++ b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_clist.inc @@ -232,7 +232,7 @@ const MS_CLIST_MODIFYMENUITEM = 'CList/ModifyMenuItem'; { - 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 @@ -257,17 +257,17 @@ const MS_CLIST_SETDOUBLECLICKACTION = '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 } ME_CLIST_DOUBLECLICKED = 'CList/DoubleClicked'; { - wParam : HCONTACT + wParam : MCONTACT lParam : flags Affect : Gets the string that the contact list will use to represent a contact Returns: Always a pointer @@ -303,7 +303,7 @@ const MS_CLIST_ADDEVENT = '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 @@ -311,15 +311,15 @@ const MS_CLIST_REMOVEEVENT = '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+ } @@ -348,7 +348,7 @@ const MS_CLIST_MENUDRAWITEM = 'CList/MenuDrawItem'; { - wParam : HCONTACT + wParam : MCONTACT lParam : 0 Affect : Built the context menu for a specific contact Returns: A HMENU handle identifying the menu, thhis should be DestroyMenu()ed @@ -366,7 +366,7 @@ const MS_CLIST_GETICONSIMAGELIST = 'CList/GetIconsImageList'; { - 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 @@ -377,7 +377,7 @@ const MS_CLIST_GETCONTACTICON = '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 @@ -405,7 +405,7 @@ const { wParam : MAKEWPARAM(LOWORD(wParam of WM_COMMAND),flags) - lParam : HCONTACT + lParam : MCONTACT Affect : Process a mennu 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 @@ -599,7 +599,7 @@ const MS_CLIST_SETHIDEOFFLINE = '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 @@ -608,7 +608,7 @@ const MS_CLIST_CONTACTDOUBLECLICKED = 'CList/ContactDoubleClicked'; { - wParam : HCONTACT + wParam : MCONTACT lParam : Pointer to an array of pchar'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 @@ -618,7 +618,7 @@ const MS_CLIST_CONTACTFILESDROPPED = '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/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_clui.inc b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_clui.inc index c62b40e458..5faec66f6a 100644 --- a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_clui.inc +++ b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_clui.inc @@ -68,7 +68,7 @@ const MS_CLUI_GROUPADDED = '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 @@ -77,7 +77,7 @@ const MS_CLUI_CONTACTSETICON = '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 @@ -88,7 +88,7 @@ const MS_CLUI_CONTACTDELETED = '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 @@ -113,7 +113,7 @@ const MS_CLUI_CONTACTADDED = '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 @@ -184,7 +184,7 @@ const MS_CLUI_GETCAPS = '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 @@ -194,7 +194,7 @@ const ME_CLUI_CONTACTDRAGGING = '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. @@ -203,7 +203,7 @@ const ME_CLUI_CONTACTDROPPED = '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/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_database.inc b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_database.inc index 678977979c..e559ad0780 100644 --- a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_database.inc +++ b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_database.inc @@ -37,7 +37,7 @@ const type - HCONTACT = Integer; + MCONTACT = Integer; HDBEVENT = Integer; PDBVARIANT = ^TDBVARIANT; @@ -383,7 +383,7 @@ const MS_DB_EVENT_GET = 'DB/Event/Get'; { - wParam : HCONTACT + wParam : MCONTACT lParam : HDBEVENT affect : Changes the flag for an event to mark it as read Returns: Returns the entire flag DWORD for the event after the change, or -1 @@ -405,21 +405,21 @@ const MS_DB_EVENT_GETCONTACT = 'DB/Event/GetContact'; { - wParam : HCONTACT + wParam : MCONTACT lParam : 0 Affect : Retrieves a handlee to the first event in the chain - for a HCONTACT - returns: Returns a handle, or NULL(0) if HCONTACT is invalid or has + for a MCONTACT + returns: Returns a handle, or NULL(0) if MCONTACT is invalid or has no events, events in a chain are sorted chronologically automatically } MS_DB_EVENT_FINDFIRST = 'DB/Event/FindFirst'; { - wParam : HCONTACT + wParam : MCONTACT lParam : 0 - Affect : Retrieves a handle to the first unreead event in a chain for a HCONTACT + Affect : Retrieves a handle to the first unreead event in a chain for a MCONTACT see notes - Returns: Returns a HDBEVENT handle or NULL(0) if the HCONTACT is invalid + Returns: Returns a HDBEVENT handle or NULL(0) if the MCONTACT is invalid or all it's events have beeen read. Notes : Events in a chain are sorted chronologically automatically, but this does not necessarily mean that all events after @@ -431,10 +431,10 @@ const MS_DB_EVENT_FINDFIRSTUNREAD = 'DB/Event/FindFirstUnread'; { - wParam : HCONTACT + wParam : MCONTACT lParam : 0; - Affects: Retrieves a handle to the lasts event in the chain for a HCONTACT - Returns: Returns a handle or NULL(0) if HCONTACT is invalid or has no events + Affects: Retrieves a handle to the lasts event in the chain for a MCONTACT + Returns: Returns a handle or NULL(0) if MCONTACT is invalid or has no events } MS_DB_EVENT_FINDLAST = 'DB/Event/FindLast'; @@ -577,10 +577,10 @@ const { - 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 @@ -606,7 +606,7 @@ const ME_DB_EVENT_FILTER_ADD = 'DB/Event/FilterAdd'; { - wParam : HCONTACT + wParam : MCONTACT lParam : HDBEVENT Affect : Called when an event is about to be deleted from the event chain for a contact, see notes @@ -618,15 +618,15 @@ const { - 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 = '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 @@ -635,7 +635,7 @@ const ME_DB_CONTACT_DELETED = '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/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_email.inc b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_email.inc index 71859ed208..f26847e53c 100644 --- a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_email.inc +++ b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_email.inc @@ -27,7 +27,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/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_file.inc b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_file.inc index e1e388fcdc..536f1d47f4 100644 --- a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_file.inc +++ b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_file.inc @@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. const { - wParam : HCONTACT + wParam : MCONTACT lParam : 0 Affects: Brings up the send file dialog for a contact, see notes Returns: 0 on success [non zero] on failure @@ -37,7 +37,7 @@ const MS_FILE_SENDFILE = 'SRFile/SendCommand'; { - wParam : HCONTACT + wParam : MCONTACT lParam : pointer to an array of PChar's the first nil item terminates the list -- see notes Affects: Brings up the send file dialog with specifieed files already chosen @@ -50,13 +50,13 @@ const MS_FILE_SENDSPECIFICFILES = 'SRFile/SendSpecificFiles'; { - 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+ } diff --git a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_history.inc b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_history.inc index af019ee255..0cb817ace5 100644 --- a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_history.inc +++ b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_history.inc @@ -27,10 +27,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 = 'History/ShowContactHistory'; diff --git a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_ignore.inc b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_ignore.inc index 4dd83c4cee..9ddcde2759 100644 --- a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_ignore.inc +++ b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_ignore.inc @@ -38,11 +38,11 @@ const IGNOREEVENT_YOUWEREADDED=6; // 0.3.3a+ { - 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+ @@ -50,7 +50,7 @@ const MS_IGNORE_ISIGNORED = '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 @@ -62,11 +62,11 @@ const MS_IGNORE_IGNORE = '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 = 'Ignore/Unignore'; diff --git a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_message.inc b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_message.inc index dec113bb53..777c1c4a0f 100644 --- a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_message.inc +++ b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_message.inc @@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. const { - wParam : HCONTACT + wParam : MCONTACT lParam : Pointer to a null terminated string Affects: brings up the send message dialog for a contact, see notes Returns: 0 on success, non zero on failure diff --git a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_popup.inc b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_popup.inc index 4d7632f25f..a91ef4df0c 100644 --- a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_popup.inc +++ b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_popup.inc @@ -38,7 +38,7 @@ type PPOPUPDATA = ^TPOPUPDATA; TPOPUPDATA = record - lchContact: HCONTACT; + lchContact: MCONTACT; lchIcon: THandle; lpszContactName: array[0..MAX_CONTACTNAME-1] of Char; lpszText: array[0..MAX_SECONDLINE-1] of Char; @@ -54,7 +54,7 @@ type PPOPUPDATA = ^TPOPUPDATA; TPOPUPDATA = record - lchContact: HCONTACT; + lchContact: MCONTACT; lchIcon: THandle; lpszContactName: array[0..MAX_CONTACTNAME-1] of Char; lpszText: array[0..MAX_SECONDLINE-1] of Char; diff --git a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_protocols.inc b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_protocols.inc index f198d40a8b..4d8012c180 100644 --- a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_protocols.inc +++ b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_protocols.inc @@ -156,7 +156,7 @@ const MS_PROTO_ISPROTOCOLLOADED = 'Proto/IsProtocolLoaded'; { - wParam : HCONTACT + wParam : MCONTACT lParam : Pointer to a null terminated string containing a name Affect : Determine whether the given contact has the given protocol in it's chain. @@ -165,7 +165,7 @@ const MS_PROTO_ISPROTOONCONTACT = 'Proto/IsProtoOnContact'; { - wParam : HCONTACT + wParam : MCONTACT lParam : 0 Affect : Gets the network-level protocol associated with a contact Returns: a PChar pointing to the ASCIIZ name of the protocol or NULL(0) diff --git a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_protomod.inc b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_protomod.inc index 312e0de687..f304b61a39 100644 --- a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_protomod.inc +++ b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_protomod.inc @@ -47,7 +47,7 @@ const MS_PROTO_REGISTERMODULE = '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 @@ -57,7 +57,7 @@ const MS_PROTO_ADDTOCONTACT = '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/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_protosvc.inc b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_protosvc.inc index 0b52f04600..daac49ea99 100644 --- a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_protosvc.inc +++ b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_protosvc.inc @@ -396,12 +396,12 @@ const 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 @@ -414,7 +414,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, - @@ -501,7 +501,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 @@ -582,7 +582,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/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_url.inc b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_url.inc index c991d2a68c..393dcacff2 100644 --- a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_url.inc +++ b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_url.inc @@ -28,7 +28,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/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_userinfo.inc b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_userinfo.inc index 4ea8a90563..1013d26e2f 100644 --- a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_userinfo.inc +++ b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_userinfo.inc @@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. const { - wParam : HCONTACT + wParam : MCONTACT lParam : 0 Affects: Show the user details dialog box for a contact, see notes Notes : I think this can be used to display "My User Details"... if NULL(0) is used @@ -37,7 +37,7 @@ const { wParam : 0 - lParam : HCONTACT + lParam : MCONTACT Affects: The details dialog box was opened for a contact maybe NULL(0) showing the user details -- see notes Notes : The module should do whatever initialisation they need and @@ -58,7 +58,7 @@ const lParam : pointer to an initialised OPTIONSDIALOGPAGE (see m_options.inc) Affects: Adds a page to the details dialog, see notes Notes : this service should only be called within the ME_USERINFO_INITIALISE - event -- when the pages get (WM_INITDIALOG lParam=HCONTACT) strings + event -- when the pages get (WM_INITDIALOG lParam=MCONTACT) strings in the passed dialog structure can be freed soon as the service returns icons must be kept around (not a problem if you're loading from resource). - diff --git a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_utils.inc b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_utils.inc index b0cabfff44..ff092421f4 100644 --- a/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_utils.inc +++ b/plugins/!NotAdopted/Chess4Net/MI/MirandaINC/m_utils.inc @@ -187,7 +187,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 Version: v0.1.0.1+ diff --git a/plugins/Actman30/iac_contact.pas b/plugins/Actman30/iac_contact.pas index 1ab918e43f..cb5350bd26 100644 --- a/plugins/Actman30/iac_contact.pas +++ b/plugins/Actman30/iac_contact.pas @@ -24,7 +24,7 @@ const type tContactAction = class(tBaseAction) private - contact:HCONTACT; + contact:MCONTACT; public constructor Create(uid:dword); // function Clone:tBaseAction; override; diff --git a/plugins/Actman30/iac_dbrw.pas b/plugins/Actman30/iac_dbrw.pas index 96a44b3f7f..eaf4daf02d 100644 --- a/plugins/Actman30/iac_dbrw.pas +++ b/plugins/Actman30/iac_dbrw.pas @@ -68,7 +68,7 @@ const type tDataBaseAction = class(tBaseAction) private - dbcontact:HCONTACT; + dbcontact:MCONTACT; dbmodule :PWideChar; dbsetting:PWideChar; dbvalue :PWideChar; // keep all in unicode (str to int translation fast) @@ -129,7 +129,7 @@ var ambuf,asbuf:array [0..127] of AnsiChar; ls,tmp:pWideChar; tmpa,tmpa1:pAnsiChar; - hContact:THCONTACT; + hContact:MCONTACT; proto:pAnsiChar; avalue:uint_ptr; begin diff --git a/plugins/Actman30/iac_global.pas b/plugins/Actman30/iac_global.pas index cba955d762..c6e96cd130 100644 --- a/plugins/Actman30/iac_global.pas +++ b/plugins/Actman30/iac_global.pas @@ -89,8 +89,8 @@ procedure InsertString(wnd:HWND;num:dword;str:PAnsiChar); function GetLink(hash:dword):pActModule; function GetLinkByName(name:pAnsiChar):pActModule; -function ImportContact (node:HXML ):HCONTACT; -function ImportContactINI(node:pointer):HCONTACT; +function ImportContact (node:HXML ):MCONTACT; +function ImportContactINI(node:pointer):MCONTACT; implementation @@ -301,7 +301,7 @@ const ioCUID = 'cuid'; ioCUIDType = 'cuidtype'; -function ImportContact(node:HXML):HCONTACT; +function ImportContact(node:HXML):MCONTACT; var proto:pAnsiChar; tmpbuf:array [0..63] of AnsiChar; @@ -352,7 +352,7 @@ begin end; end; -function ImportContactINI(node:pointer):HCONTACT; +function ImportContactINI(node:pointer):MCONTACT; { var proto:pAnsiChar; diff --git a/plugins/Actman30/iac_inout.pas b/plugins/Actman30/iac_inout.pas index c64b96e669..0ae2f0d7fc 100644 --- a/plugins/Actman30/iac_inout.pas +++ b/plugins/Actman30/iac_inout.pas @@ -85,7 +85,7 @@ var tmp:PWideChar; blob,p:PAnsiChar; w:PWideChar; - hContact:THCONTACT; + hContact:MCONTACT; wnd:HWND; fexist:bool; dbei:TDBEVENTINFO; diff --git a/plugins/Actman30/ua/i_uaplaces.inc b/plugins/Actman30/ua/i_uaplaces.inc index 4bd8d18bd0..b38d16290e 100644 --- a/plugins/Actman30/ua/i_uaplaces.inc +++ b/plugins/Actman30/ua/i_uaplaces.inc @@ -463,7 +463,7 @@ begin end; -function PreBuildMenu(mtype:tMenuType;hContact:HCONTACT=0):int; +function PreBuildMenu(mtype:tMenuType;hContact:MCONTACT=0):int; var i:integer; mi:TCListMenuItem; diff --git a/plugins/ExternalAPI/delphi/m_sessions.inc b/plugins/ExternalAPI/delphi/m_sessions.inc index 0cc18a0d33..21794e88ee 100644 --- a/plugins/ExternalAPI/delphi/m_sessions.inc +++ b/plugins/ExternalAPI/delphi/m_sessions.inc @@ -325,7 +325,7 @@ UI : displays the modes that the channel is in, the modes still have to be abs PROTO: sends a CHANNEL_DONE UI : the UI is now sure that no more messages are expected. -UI : sends a UI_TEXT message, with optional source HCONTACT and of course the message. +UI : sends a UI_TEXT message, with optional source MCONTACT and of course the message. PROTO: picks up on this message and transmits it, it must return a HPROCESS code that is later acknowledged. @@ -339,8 +339,8 @@ UI : sends UI_IAMTYPING PROTO: the protocol may or may not send this message to the other parties but it must process it, this message is also optional. -PROTO: sends UI_CONTACT_ISTYPING (source HCONTACT) -UI : an HCONTACT within the session is typing, the UI may elect to show this +PROTO: sends UI_CONTACT_ISTYPING (source MCONTACT) +UI : an MCONTACT within the session is typing, the UI may elect to show this message in a status bar, or with a visual effect. } diff --git a/plugins/ExternalAPI/delphi/m_smileyadd.inc b/plugins/ExternalAPI/delphi/m_smileyadd.inc index 4562f575f1..a620b1219a 100644 --- a/plugins/ExternalAPI/delphi/m_smileyadd.inc +++ b/plugins/ExternalAPI/delphi/m_smileyadd.inc @@ -41,7 +41,7 @@ type // If not found or NULL, "Standard" will be used flags :uint; // Flags (SAFLRE_*) that define the behaivior disableRedraw :BOOL; // Parameter have been depricated, have no effect on operation - hContact :HCONTACT; // Contact handle + hContact :MCONTACT; // Contact handle end; { @@ -71,7 +71,7 @@ type targetWParam : LPARAM; // Target WParam to be sent (LParam will be PAnsiChar to // select smiley) see the example file. hwndParent : HWND; // Parent window for smiley dialog - hContact : HCONTACT; // Contact handle + hContact : MCONTACT; // Contact handle end; { @@ -98,7 +98,7 @@ type // do not destroy! NULL if the buttonicon is not defined... NumberOfVisibleSmileys: int; // Number of visible smileys defined. NumberOfSmileys : int; // Number of total smileys defined - hContact : HCONTACT; //Contact handle + hContact : MCONTACT; //Contact handle end; const @@ -129,7 +129,7 @@ type numSmileys :uint; // Number of Smileys found, this parameter filled by SmileyAdd oflag :uint; // One of the SAFL_ flags specifies content of the parse results // this parameter filled by SmileyAdd - hContact :HCONTACT; // Contact handle + hContact :MCONTACT; // Contact handle end; type @@ -237,7 +237,7 @@ const type SMADD_CONT = record cbSize :uint; - hContact:HCONTACT; + hContact:MCONTACT; _type :int; // 0 - directory, 1 - file; path :TChar; // smiley category name for reference end; diff --git a/plugins/ExternalAPI/delphi/m_spamfilter.inc b/plugins/ExternalAPI/delphi/m_spamfilter.inc index 1e15f7fec4..b0245f6650 100644 --- a/plugins/ExternalAPI/delphi/m_spamfilter.inc +++ b/plugins/ExternalAPI/delphi/m_spamfilter.inc @@ -362,7 +362,7 @@ type // checked for spam. Can be NULL. dwFlags :DWORD; // Flags for the spam checking. (For more details see below.) case LongInt of - 0: (hContact: HCONTACT); // Handle to the sending contact (use pszUserName + 0: (hContact: MCONTACT); // Handle to the sending contact (use pszUserName // instead if no hContact is available) 1: (UserName: TChar); // Name of the user, e.g. nick (set SCDF_NO_CONTACT // in the flags to use this parameter) -> should diff --git a/plugins/ExternalAPI/delphi/m_tipper.inc b/plugins/ExternalAPI/delphi/m_tipper.inc index 452904113d..737ae5cad1 100644 --- a/plugins/ExternalAPI/delphi/m_tipper.inc +++ b/plugins/ExternalAPI/delphi/m_tipper.inc @@ -10,7 +10,7 @@ {$IFNDEF M_TIPPER} {$DEFINE M_TIPPER} type - TranslateFunc = function (hContact:HCONTACT;module:PAnsiChar;setting_or_prefix:PAnsiChar; + TranslateFunc = function (hContact:MCONTACT;module:PAnsiChar;setting_or_prefix:PAnsiChar; buff:pWideChar;bufflen:int):pWideChar; cdecl; type diff --git a/plugins/ExternalAPI/delphi/m_variables.inc b/plugins/ExternalAPI/delphi/m_variables.inc index 3d4f1ae940..233853d149 100644 --- a/plugins/ExternalAPI/delphi/m_variables.inc +++ b/plugins/ExternalAPI/delphi/m_variables.inc @@ -56,7 +56,7 @@ type szExtraText:TCHAR; // Extra, context-specific string (can be NULL) -> // The field "extratext" will be replaced by this // string. (Previously szSource). - hContact :HCONTACT; // Handle to contact (can be NULL) -> The field "subject" + hContact :MCONTACT; // Handle to contact (can be NULL) -> The field "subject" // represents this contact. pCount :int; // (output) Number of succesful parsed tokens, needs to // be set to 0 before the call diff --git a/plugins/ExternalAPI/delphi/m_yamn.inc b/plugins/ExternalAPI/delphi/m_yamn.inc index a44debb669..300f5a3dac 100644 --- a/plugins/ExternalAPI/delphi/m_yamn.inc +++ b/plugins/ExternalAPI/delphi/m_yamn.inc @@ -101,7 +101,7 @@ const // //Event is fired when there is a double click on a CList contact, //it is upto the caller to check for the protocol & status -//of the HCONTACT, it's not done for you anymore since it didn't make +//of the MCONTACT, it's not done for you anymore since it didn't make //sense to store all this information in memory, etc. MS_YAMN_CLISTCONTEXT = 'YAMN/Service/ClistContactContextMenu'; @@ -111,7 +111,7 @@ const // //Event is fired when there is a double click on a CList contact, //it is upto the caller to check for the protocol & status -//of the HCONTACT, it's not done for you anymore since it didn't make +//of the MCONTACT, it's not done for you anymore since it didn't make //sense to store all this information in memory, etc. MS_YAMN_CLISTCONTEXTAPP = 'YAMN/Service/ClistContactContextMenuApp'; @@ -121,7 +121,7 @@ const // //Event is fired when there is a double click on a CList contact, //it is upto the caller to check for the protocol & status -//of the HCONTACT, it's not done for you anymore since it didn't make +//of the MCONTACT, it's not done for you anymore since it didn't make //sense to store all this information in memory, etc. MS_YAMN_CLISTDBLCLICK = 'YAMN/Service/ClistContactDoubleclicked'; diff --git a/plugins/HistoryPlusPlus/historypp.dpr b/plugins/HistoryPlusPlus/historypp.dpr index 58939fab73..e8c4e2a2a7 100644 --- a/plugins/HistoryPlusPlus/historypp.dpr +++ b/plugins/HistoryPlusPlus/historypp.dpr @@ -517,10 +517,10 @@ begin end; end; -//wParam : HCONTACT +//wParam : MCONTACT //lParam : HDBCONTACT //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. function OnEventAdded(wParam: WPARAM; lParam: LPARAM): Integer; cdecl; begin @@ -528,7 +528,7 @@ begin NotifyAllForms(HM_MIEV_EVENTADDED,wParam,lParam); end; -//wParam : HCONTACT +//wParam : MCONTACT //lParam : HDBEVENT //Affect : Called when an event is about to be deleted from the event chain //for a contact, see notes diff --git a/plugins/QuickSearch/i_ok.inc b/plugins/QuickSearch/i_ok.inc index 40708b8901..cb4b161694 100644 --- a/plugins/QuickSearch/i_ok.inc +++ b/plugins/QuickSearch/i_ok.inc @@ -209,7 +209,7 @@ begin end; -function DoMeta(hContact:HCONTACT):pointer; +function DoMeta(hContact:MCONTACT):pointer; var pw:pWideChar; i:integer; @@ -433,7 +433,7 @@ end; //----- Initial table filling ----- -procedure AddContact(num:integer;hContact:HCONTACT); +procedure AddContact(num:integer;hContact:MCONTACT); var col:pcolumnitem; tmpstr:array [0..63] of AnsiChar; @@ -476,7 +476,7 @@ end; function PrepareToFill:boolean; var cnt,cnt1:integer; - hContact:THCONTACT; + hContact:MCONTACT; i:integer; begin result:=false; diff --git a/plugins/QuickSearch/sr_window.pas b/plugins/QuickSearch/sr_window.pas index fd241bb3d4..d9b83503c9 100644 --- a/plugins/QuickSearch/sr_window.pas +++ b/plugins/QuickSearch/sr_window.pas @@ -51,7 +51,7 @@ type end; pQSFRec = ^tQSFRec; tQSFRec = record // row (contact) - contact:HCONTACT; + contact:MCONTACT; proto :uint_ptr; flags :dword; status :dword; @@ -115,7 +115,7 @@ begin end; end; -procedure AddContactToList(hContact:HCONTACT;num:integer); +procedure AddContactToList(hContact:MCONTACT;num:integer); var li:LV_ITEMW; i:integer; @@ -337,7 +337,7 @@ end; //----- contacts actions ----- -function GetFocusedhContact:HCONTACT; +function GetFocusedhContact:MCONTACT; var i:integer; begin @@ -348,7 +348,7 @@ begin result:=FlagBuf[i].contact; end; -procedure ShowContactMsgDlg(hContact:HCONTACT); +procedure ShowContactMsgDlg(hContact:MCONTACT); begin if hContact<>0 then begin @@ -357,7 +357,7 @@ begin end; end; -procedure DeleteOneContact(hContact:HCONTACT); +procedure DeleteOneContact(hContact:MCONTACT); begin if ServiceExists(strCListDel)>0 then CallService(strCListDel,hContact,0) @@ -388,8 +388,8 @@ end; procedure ConvertToMeta; var - hMeta:HCONTACT; - tmp:HCONTACT; + hMeta:MCONTACT; + tmp:MCONTACT; i,j:integer; begin j:=ListView_GetItemCount(grid)-1; @@ -438,7 +438,7 @@ end; procedure UpdateLVCell(item,column:integer;text:pWideChar=pWideChar(-1)); var li:LV_ITEMW; - contact:HCONTACT; + contact:MCONTACT; row:integer; begin contact:=FlagBuf[LV_GetLParam(grid,item)].contact; @@ -469,7 +469,7 @@ end; procedure MoveToGroup(group:PWideChar); var - contact:HCONTACT; + contact:MCONTACT; i,j,grcol,row:integer; begin j:=ListView_GetItemCount(grid)-1; @@ -512,7 +512,7 @@ end; procedure MoveToContainer(container:PWideChar); var - contact:HCONTACT; + contact:MCONTACT; i,j,grcol,row:integer; begin j:=ListView_GetItemCount(grid)-1; @@ -784,7 +784,7 @@ begin UpdateLVCell(SendMessage(grid,LVM_GETNEXTITEM,-1,LVNI_FOCUSED),cmcolumn,qsr.text); end; -function ShowContactMenu(wnd:HWND;hContact:HCONTACT;col:integer=-1):HMENU; +function ShowContactMenu(wnd:HWND;hContact:MCONTACT;col:integer=-1):HMENU; var mi:TCListMenuItem; pt:tpoint; diff --git a/plugins/Utils.pas/contact.pas b/plugins/Utils.pas/contact.pas index 697c603591..3d0289cb34 100644 --- a/plugins/Utils.pas/contact.pas +++ b/plugins/Utils.pas/contact.pas @@ -6,7 +6,7 @@ interface uses windows, m_api; procedure FillContactList(list:hwnd; filter:boolean=true;format:pWideChar=nil); -function FindContact(list:hwnd;contact:HCONTACT):integer; +function FindContact(list:hwnd;contact:MCONTACT):integer; implementation @@ -17,7 +17,7 @@ const procedure FillContactList(list:hwnd; filter:boolean=true;format:pWideChar=nil); var - hContact:THCONTACT; + hContact:MCONTACT; buf:array [0..511] of WideChar; buf1:array [0..63] of WideChar; p:PWideChar; @@ -109,7 +109,7 @@ begin end; end; -function FindContact(list:hwnd;contact:HCONTACT):integer; +function FindContact(list:hwnd;contact:MCONTACT):integer; var j:integer; begin diff --git a/plugins/Utils.pas/dbsettings.pas b/plugins/Utils.pas/dbsettings.pas index dfbdd8ee69..d8c2566c5d 100644 --- a/plugins/Utils.pas/dbsettings.pas +++ b/plugins/Utils.pas/dbsettings.pas @@ -4,78 +4,78 @@ interface uses windows,m_api; -function DBReadByte (hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:byte =0):byte; -function DBReadWord (hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:word =0):word; -function DBReadDWord(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:dword=0):dword; +function DBReadByte (hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:byte =0):byte; +function DBReadWord (hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:word =0):word; +function DBReadDWord(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:dword=0):dword; -function DBReadSetting (hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;dbv:PDBVARIANT):int_ptr; -function DBReadSettingStr(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;dbv:PDBVARIANT):int_ptr; +function DBReadSetting (hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;dbv:PDBVARIANT):int_ptr; +function DBReadSettingStr(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;dbv:PDBVARIANT):int_ptr; -function DBReadStringLength(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar):integer; -function DBReadString (hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar; +function DBReadStringLength(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar):integer; +function DBReadString (hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar; default:PAnsiChar=nil;enc:integer=DBVT_ASCIIZ):PAnsiChar; -function DBReadUTF8 (hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:PAnsiChar=nil):PAnsiChar; -function DBReadUnicode(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:PWideChar=nil):PWideChar; +function DBReadUTF8 (hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:PAnsiChar=nil):PAnsiChar; +function DBReadUnicode(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:PWideChar=nil):PWideChar; -function DBReadStruct (hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar; +function DBReadStruct (hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar; ptr:pointer;size:dword):uint_ptr; -function DBWriteStruct(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar; +function DBWriteStruct(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar; ptr:pointer;size:dword):Integer; -function DBWriteSetting(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;dbv:PDBVARIANT):int_ptr; -function DBWriteByte (hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:Byte ):int_ptr; -function DBWriteWord (hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:Word ):int_ptr; -function DBWriteDWord(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:dword):int_ptr; +function DBWriteSetting(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;dbv:PDBVARIANT):int_ptr; +function DBWriteByte (hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:Byte ):int_ptr; +function DBWriteWord (hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:Word ):int_ptr; +function DBWriteDWord(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:dword):int_ptr; -function DBWriteString (hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar; +function DBWriteString (hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar; val:PAnsiChar;enc:integer=DBVT_ASCIIZ):int_ptr; -function DBWriteUTF8 (hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:PAnsiChar):int_ptr; -function DBWriteUnicode(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:PWideChar):int_ptr; +function DBWriteUTF8 (hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:PAnsiChar):int_ptr; +function DBWriteUnicode(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:PWideChar):int_ptr; //function DBFreeVariant(dbv:PDBVARIANT):int_ptr; -function DBDeleteSetting(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar):int_ptr; +function DBDeleteSetting(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar):int_ptr; -function DBDeleteGroup(hContact:HCONTACT;szModule:PAnsiChar;prefix:pAnsiChar=nil):int_ptr; +function DBDeleteGroup(hContact:MCONTACT;szModule:PAnsiChar;prefix:pAnsiChar=nil):int_ptr; function DBDeleteModule(szModule:PAnsiChar):integer; // 0.8.0+ -function DBGetSettingType(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar):integer; +function DBGetSettingType(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar):integer; implementation uses common; -function DBReadByte(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:byte=0):byte; +function DBReadByte(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:byte=0):byte; {$IFDEF AllowInline}inline;{$ENDIF} begin result:=db_get_b(hContact, szModule, szSetting, default); end; -function DBReadWord(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:word=0):word; +function DBReadWord(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:word=0):word; {$IFDEF AllowInline}inline;{$ENDIF} begin result:=db_get_w(hContact, szModule, szSetting, default); end; -function DBReadDWord(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:dword=0):dword; +function DBReadDWord(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:dword=0):dword; {$IFDEF AllowInline}inline;{$ENDIF} begin result:=db_get_dw(hContact, szModule, szSetting, default); end; -function DBReadSetting(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;dbv:PDBVARIANT):int_ptr; +function DBReadSetting(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;dbv:PDBVARIANT):int_ptr; {$IFDEF AllowInline}inline;{$ENDIF} begin result:=db_get(hContact, szModule, szSetting, dbv); end; -function DBReadSettingStr(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;dbv:PDBVARIANT):int_ptr; +function DBReadSettingStr(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;dbv:PDBVARIANT):int_ptr; {$IFDEF AllowInline}inline;{$ENDIF} begin result:=db_get_s(hContact, szModule, szSetting, dbv, DBVT_ASCIIZ); end; -function DBReadStringLength(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar):integer; +function DBReadStringLength(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar):integer; var dbv:TDBVARIANT; i:int_ptr; @@ -90,7 +90,7 @@ begin DBFreeVariant(@dbv); end; -function DBReadString(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar; +function DBReadString(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar; default:PAnsiChar=nil;enc:integer=DBVT_ASCIIZ):PAnsiChar; var dbv:TDBVARIANT; @@ -109,13 +109,13 @@ begin DBFreeVariant(@dbv); end; -function DBReadUTF8(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:PAnsiChar=nil):PAnsiChar; +function DBReadUTF8(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:PAnsiChar=nil):PAnsiChar; {$IFDEF AllowInline}inline;{$ENDIF} begin result:=DBReadString(hContact,szModule,szSetting,default,DBVT_UTF8); end; -function DBReadUnicode(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:PWideChar=nil):PWideChar; +function DBReadUnicode(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;default:PWideChar=nil):PWideChar; var dbv:TDBVARIANT; i:int_ptr; @@ -133,7 +133,7 @@ begin DBFreeVariant(@dbv); end; -function DBReadStruct(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar; +function DBReadStruct(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar; ptr:pointer;size:dword):uint_ptr; var dbv:TDBVariant; @@ -154,57 +154,57 @@ begin result:=0; end; -function DBWriteStruct(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar; +function DBWriteStruct(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar; ptr:pointer;size:dword):Integer; {$IFDEF AllowInline}inline;{$ENDIF} begin result:=db_set_blob(hContact, szModule, szSetting, ptr, size); end; -function DBWriteSetting(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;dbv:PDBVARIANT):int_ptr; +function DBWriteSetting(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;dbv:PDBVARIANT):int_ptr; {$IFDEF AllowInline}inline;{$ENDIF} begin Result:=db_set(hContact, szModule, szSetting, dbv); end; -function DBWriteByte(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:Byte):int_ptr; +function DBWriteByte(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:Byte):int_ptr; {$IFDEF AllowInline}inline;{$ENDIF} begin result:=db_set_b(hContact, szModule, szSetting, val); end; -function DBWriteWord(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:Word):int_ptr; +function DBWriteWord(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:Word):int_ptr; {$IFDEF AllowInline}inline;{$ENDIF} begin result:=db_set_w(hContact, szModule, szSetting, val); end; -function DBWriteDWord(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:dword):int_ptr; +function DBWriteDWord(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:dword):int_ptr; {$IFDEF AllowInline}inline;{$ENDIF} begin result:=db_set_dw(hContact, szModule, szSetting, val); end; -function DBWriteString(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar; +function DBWriteString(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar; val:PAnsiChar;enc:integer=DBVT_ASCIIZ):int_ptr; {$IFDEF AllowInline}inline;{$ENDIF} begin result:=db_set_s(hContact, szModule, szSetting, val); end; -function DBWriteUTF8(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:PAnsiChar):int_ptr; +function DBWriteUTF8(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:PAnsiChar):int_ptr; {$IFDEF AllowInline}inline;{$ENDIF} begin result:=db_set_utf(hContact, szModule, szSetting, val); end; -function DBWriteUnicode(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:PWideChar):int_ptr; +function DBWriteUnicode(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar;val:PWideChar):int_ptr; {$IFDEF AllowInline}inline;{$ENDIF} begin result:=db_set_ws(hContact, szModule, szSetting, val); end; -function DBDeleteSetting(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar):int_ptr; +function DBDeleteSetting(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar):int_ptr; {$IFDEF AllowInline}inline;{$ENDIF} begin result:=db_unset(hContact, szModule, szSetting); @@ -226,7 +226,7 @@ begin result:=0; end; -function DBDeleteGroup(hContact:HCONTACT;szModule:PAnsiChar;prefix:pAnsiChar=nil):int_ptr; +function DBDeleteGroup(hContact:MCONTACT;szModule:PAnsiChar;prefix:pAnsiChar=nil):int_ptr; var ces:TDBCONTACTENUMSETTINGS; p:PAnsiChar; @@ -314,7 +314,7 @@ begin CallService(MS_DB_MODULE_DELETE,0,lParam(szModule)); end; -function DBGetSettingType(hContact:HCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar):integer; +function DBGetSettingType(hContact:MCONTACT;szModule:PAnsiChar;szSetting:PAnsiChar):integer; var ldbv:TDBVARIANT; begin diff --git a/plugins/Utils.pas/mirutils.pas b/plugins/Utils.pas/mirutils.pas index 19285b56f7..ea35e86e51 100644 --- a/plugins/Utils.pas/mirutils.pas +++ b/plugins/Utils.pas/mirutils.pas @@ -20,10 +20,10 @@ function RegisterSingleIcon(resname,ilname,descr,group:PAnsiChar):int; // others -function ConvertFileName(src:pAnsiChar;hContact:HCONTACT=0):pAnsiChar; overload; -function ConvertFileName(src:pWideChar;hContact:HCONTACT=0):pWideChar; overload; -function ConvertFileName(src:pAnsiChar;dst:pAnsiChar;hContact:HCONTACT=0):pAnsiChar; overload; -function ConvertFileName(src:pWideChar;dst:pWideChar;hContact:HCONTACT=0):pWideChar; overload; +function ConvertFileName(src:pAnsiChar;hContact:MCONTACT=0):pAnsiChar; overload; +function ConvertFileName(src:pWideChar;hContact:MCONTACT=0):pWideChar; overload; +function ConvertFileName(src:pAnsiChar;dst:pAnsiChar;hContact:MCONTACT=0):pAnsiChar; overload; +function ConvertFileName(src:pWideChar;dst:pWideChar;hContact:MCONTACT=0):pWideChar; overload; procedure ShowPopupW(text:pWideChar;title:pWideChar=nil); function GetAddonFileName(prefix,altname,path:PAnsiChar;ext:PAnsiChar):PAnsiChar; @@ -31,31 +31,31 @@ function TranslateA2W(sz:PAnsiChar):PWideChar; function MirandaCP:integer; function isVarsInstalled:bool; -function ParseVarString(astr:pAnsiChar;aContact:HCONTACT=0;extra:pAnsiChar=nil):pAnsiChar; overload; -function ParseVarString(astr:pWideChar;aContact:HCONTACT=0;extra:pWideChar=nil):pWideChar; overload; +function ParseVarString(astr:pAnsiChar;aContact:MCONTACT=0;extra:pAnsiChar=nil):pAnsiChar; overload; +function ParseVarString(astr:pWideChar;aContact:MCONTACT=0;extra:pWideChar=nil):pWideChar; overload; function ShowVarHelp(dlg:HWND;id:integer=0):integer; -function IsChat(hContact:HCONTACT):bool; -procedure SendToChat(hContact:HCONTACT;pszText:PWideChar); - -function LoadContact(group,setting:PAnsiChar):HCONTACT; -function SaveContact(hContact:HCONTACT;group,setting:PAnsiChar):integer; - -function SetCListSelContact(hContact:HCONTACT):HCONTACT; -function GetCListSelContact:HCONTACT; {$IFDEF DELPHI_10_UP}inline;{$ENDIF} -function GetContactProtoAcc(hContact:HCONTACT):PAnsiChar; -function IsMirandaUser(hContact:HCONTACT):integer; // >0=Miranda; 0=Not miranda; -1=unknown -procedure ShowContactDialog(hContact:HCONTACT;DblClk:boolean=true;anystatus:boolean=true); -function FindContactHandle(proto:pAnsiChar;const dbv:TDBVARIANT;is_chat:boolean=false):HCONTACT; -function WndToContact(wnd:hwnd):HCONTACT; overload; -function WndToContact:HCONTACT; overload; -function GetContactStatus(hContact:HCONTACT):integer; +function IsChat(hContact:MCONTACT):bool; +procedure SendToChat(hContact:MCONTACT;pszText:PWideChar); + +function LoadContact(group,setting:PAnsiChar):MCONTACT; +function SaveContact(hContact:MCONTACT;group,setting:PAnsiChar):integer; + +function SetCListSelContact(hContact:MCONTACT):MCONTACT; +function GetCListSelContact:MCONTACT; {$IFDEF DELPHI_10_UP}inline;{$ENDIF} +function GetContactProtoAcc(hContact:MCONTACT):PAnsiChar; +function IsMirandaUser(hContact:MCONTACT):integer; // >0=Miranda; 0=Not miranda; -1=unknown +procedure ShowContactDialog(hContact:MCONTACT;DblClk:boolean=true;anystatus:boolean=true); +function FindContactHandle(proto:pAnsiChar;const dbv:TDBVARIANT;is_chat:boolean=false):MCONTACT; +function WndToContact(wnd:hwnd):MCONTACT; overload; +function WndToContact:MCONTACT; overload; +function GetContactStatus(hContact:MCONTACT):integer; // -2 - deleted account, -1 - disabled account, 0 - hidden // 1 - metacontact, 2 - submetacontact, positive - active // proto - ASSIGNED buffer -function IsContactActive(hContact:HCONTACT;proto:pAnsiChar=nil):integer; +function IsContactActive(hContact:MCONTACT;proto:pAnsiChar=nil):integer; -function CreateGroupW(name:pWideChar;hContact:HCONTACT):integer; +function CreateGroupW(name:pWideChar;hContact:MCONTACT):integer; function MakeGroupMenu(idxfrom:integer=100):HMENU; function GetNewGroupName(parent:HWND):pWideChar; @@ -95,7 +95,7 @@ begin SendMessage(btn,BM_SETIMAGE,IMAGE_ICON,result); end; -function ConvertFileName(src:pWideChar;dst:pWideChar;hContact:HCONTACT=0):pWideChar; overload; +function ConvertFileName(src:pWideChar;dst:pWideChar;hContact:MCONTACT=0):pWideChar; overload; var pc:pWideChar; begin @@ -115,7 +115,7 @@ begin end; end; -function ConvertFileName(src:pWideChar;hContact:HCONTACT=0):pWideChar; overload; +function ConvertFileName(src:pWideChar;hContact:MCONTACT=0):pWideChar; overload; var buf1:array [0..511] of WideChar; begin @@ -125,7 +125,7 @@ begin result:=nil; end; -function ConvertFileName(src:pAnsiChar;dst:pAnsiChar;hContact:HCONTACT=0):pAnsiChar; overload; +function ConvertFileName(src:pAnsiChar;dst:pAnsiChar;hContact:MCONTACT=0):pAnsiChar; overload; var pc:pAnsiChar; begin @@ -145,7 +145,7 @@ begin end; end; -function ConvertFileName(src:pAnsiChar;hContact:HCONTACT=0):pAnsiChar; overload; +function ConvertFileName(src:pAnsiChar;hContact:MCONTACT=0):pAnsiChar; overload; var buf1:array [0..511] of AnsiChar; begin @@ -165,7 +165,7 @@ begin result:=MirCP; end; -function IsChat(hContact:HCONTACT):bool; +function IsChat(hContact:MCONTACT):bool; begin result:=DBReadByte(hContact, PAnsiChar(CallService(MS_PROTO_GETCONTACTBASEPROTO,hContact,0)), @@ -178,7 +178,7 @@ begin result:=ServiceExists(MS_VARS_FORMATSTRING)<>0; end; -function ParseVarString(astr:pAnsiChar;aContact:HCONTACT=0;extra:pAnsiChar=nil):pAnsiChar; +function ParseVarString(astr:pAnsiChar;aContact:MCONTACT=0;extra:pAnsiChar=nil):pAnsiChar; var tfi:TFORMATINFO; tmp,pc:pAnsiChar; @@ -217,7 +217,7 @@ begin mir_free(pc); end; -function ParseVarString(astr:pWideChar;aContact:HCONTACT=0;extra:pWideChar=nil):pWideChar; +function ParseVarString(astr:pWideChar;aContact:MCONTACT=0;extra:pWideChar=nil):pWideChar; var tfi:TFORMATINFO; tmp,pc:pWideChar; @@ -314,7 +314,7 @@ begin end; end; -function GetContactProtoAcc(hContact:HCONTACT):PAnsiChar; +function GetContactProtoAcc(hContact:MCONTACT):PAnsiChar; begin if ServiceExists(MS_PROTO_GETCONTACTBASEACCOUNT)<>0 then result:=PAnsiChar(CallService(MS_PROTO_GETCONTACTBASEACCOUNT,hContact,0)) @@ -322,7 +322,7 @@ begin result:=PAnsiChar(CallService(MS_PROTO_GETCONTACTBASEPROTO,hContact,0)); end; -function IsMirandaUser(hContact:HCONTACT):integer; // >0=Miranda; 0=Not miranda; -1=unknown +function IsMirandaUser(hContact:MCONTACT):integer; // >0=Miranda; 0=Not miranda; -1=unknown var sz:PAnsiChar; begin @@ -337,7 +337,7 @@ begin result:=-1; end; -function SetCListSelContact(hContact:HCONTACT):HCONTACT; +function SetCListSelContact(hContact:MCONTACT):MCONTACT; var wnd:HWND; begin @@ -348,12 +348,12 @@ begin // SendMessage(wnd,CLM_ENSUREVISIBLE,hContact,0); end; -function GetCListSelContact:HCONTACT; +function GetCListSelContact:MCONTACT; begin result:=SendMessageW(CallService(MS_CLUI_GETHWNDTREE,0,0),CLM_GETSELECTION,0,0); end; -function LoadContact(group,setting:PAnsiChar):HCONTACT; +function LoadContact(group,setting:PAnsiChar):MCONTACT; var p,proto:pAnsiChar; section:array [0..63] of AnsiChar; @@ -378,7 +378,7 @@ begin mFreeMem(dbv.szVal.W); end; -function SaveContact(hContact:HCONTACT;group,setting:PAnsiChar):integer; +function SaveContact(hContact:MCONTACT;group,setting:PAnsiChar):integer; var p,proto,uid:pAnsiChar; cws:TDBVARIANT; @@ -420,9 +420,9 @@ begin end; end; -function WndToContact(wnd:hwnd):HCONTACT; overload; +function WndToContact(wnd:hwnd):MCONTACT; overload; var - hContact:THCONTACT; + hContact:MCONTACT; mwid:TMessageWindowInputData; mwod:TMessageWindowOutputData; begin @@ -450,7 +450,7 @@ begin result:=0; end; -function WndToContact:HCONTACT; overload; +function WndToContact:MCONTACT; overload; var wnd:HWND; begin @@ -465,7 +465,7 @@ begin result:=GetCListSelContact; end; -function GetContactStatus(hContact:HCONTACT):integer; +function GetContactStatus(hContact:MCONTACT):integer; var szProto:PAnsiChar; begin @@ -555,7 +555,7 @@ begin end; end; -procedure ShowContactDialog(hContact:HCONTACT;DblClk:boolean=true;anystatus:boolean=true); +procedure ShowContactDialog(hContact:MCONTACT;DblClk:boolean=true;anystatus:boolean=true); var pc:array [0..127] of AnsiChar; begin @@ -609,7 +609,7 @@ begin CallServiceSync(MS_GC_EVENT,0,lparam(@gce)); end; -procedure SendToChat(hContact:HCONTACT;pszText:PWideChar); +procedure SendToChat(hContact:MCONTACT;pszText:PWideChar); var gci:TGC_INFO; pszModule:PAnsiChar; @@ -633,11 +633,11 @@ begin end; end; -function FindContactHandle(proto:pAnsiChar;const dbv:TDBVARIANT;is_chat:boolean=false):HCONTACT; +function FindContactHandle(proto:pAnsiChar;const dbv:TDBVARIANT;is_chat:boolean=false):MCONTACT; var uid:pAnsiChar; ldbv:TDBVARIANT; - hContact:THCONTACT; + hContact:MCONTACT; pw:pWideChar; begin result:=0; @@ -692,7 +692,7 @@ begin end; end; -function IsContactActive(hContact:HCONTACT;proto:pAnsiChar=nil):integer; +function IsContactActive(hContact:MCONTACT;proto:pAnsiChar=nil):integer; var p:PPROTOACCOUNT; name: array [0..31] of AnsiChar; @@ -741,7 +741,7 @@ begin end; // Import plugin function adaptation -function CreateGroupW(name:pWideChar;hContact:HCONTACT):integer; +function CreateGroupW(name:pWideChar;hContact:MCONTACT):integer; var groupId:integer; groupIdStr:array [0..10] of AnsiChar; diff --git a/plugins/Utils.pas/sparam.pas b/plugins/Utils.pas/sparam.pas index 80a7b150db..43007b2c86 100644 --- a/plugins/Utils.pas/sparam.pas +++ b/plugins/Utils.pas/sparam.pas @@ -50,7 +50,7 @@ function SetParamLabel (Dialog:HWND; lbl:pWideChar):HWND; procedure ClearParam (flags:dword; var param); function DuplicateParam(flags:dword; var sparam,dparam):dword; -function TranslateParam(param:uint_ptr;flags:dword;hContact:HCONTACT):uint_ptr; +function TranslateParam(param:uint_ptr;flags:dword;hContact:MCONTACT):uint_ptr; function CreateResultBlock(parent:HWND;x,y,width:integer;flags:dword=0):THANDLE; function ClearResultFields(Dialog:HWND):HWND; @@ -651,7 +651,7 @@ begin result:=flags; end; -function TranslateParam(param:uint_ptr;flags:dword;hContact:HCONTACT):uint_ptr; +function TranslateParam(param:uint_ptr;flags:dword;hContact:MCONTACT):uint_ptr; var tmp1:pWideChar; begin diff --git a/plugins/Variables/src/help.cpp b/plugins/Variables/src/help.cpp index e799d1f0df..9cc79bcf75 100644 --- a/plugins/Variables/src/help.cpp +++ b/plugins/Variables/src/help.cpp @@ -98,33 +98,37 @@ static INT_PTR CALLBACK extratextDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPA } // dialog box for the %subject% selection -void ResetCList(HWND hwndDlg) { +void ResetCList(HWND hwndDlg) +{ if ((CallService(MS_CLUI_GETCAPS, 0, 0) & CLUIF_DISABLEGROUPS && !db_get_b(NULL, "CList", "UseGroups", SETTING_USEGROUPS_DEFAULT)) || !(GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_CLIST), GWL_STYLE)&CLS_USEGROUPS)) - SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETUSEGROUPS, (WPARAM) FALSE, 0); + SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETUSEGROUPS, FALSE, 0); else - SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETUSEGROUPS, (WPARAM) TRUE, 0); - SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETHIDEEMPTYGROUPS, 1, 0); + SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETUSEGROUPS, TRUE, 0); + + SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETBKBITMAP, 0, NULL); + SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETBKCOLOR, GetSysColor(COLOR_WINDOW), 0); SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETGREYOUTFLAGS, 0, 0); SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETLEFTMARGIN, 2, 0); - SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETBKBITMAP, 0, (LPARAM) (HBITMAP) NULL); - SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETBKCOLOR, GetSysColor(COLOR_WINDOW), 0); SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETINDENT, 10, 0); + SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETHIDEEMPTYGROUPS, 1, 0); + for (int i = 0; i <= FONTID_MAX; i++) SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SETTEXTCOLOR, i, GetSysColor(COLOR_WINDOWTEXT)); } -static int clistDialogResize(HWND hwndDlg, LPARAM lParam, UTILRESIZECONTROL *urc) { - - switch(urc->wId) { +static int clistDialogResize(HWND hwndDlg, LPARAM lParam, UTILRESIZECONTROL *urc) +{ + switch (urc->wId) { case IDC_ABOUT: case IDC_ABOUTFRAME: - return RD_ANCHORX_WIDTH|RD_ANCHORY_TOP; + return RD_ANCHORX_WIDTH | RD_ANCHORY_TOP; + case IDC_NULL: case IDC_CONTACT: - return RD_ANCHORX_LEFT|RD_ANCHORY_TOP; + return RD_ANCHORX_LEFT | RD_ANCHORY_TOP; } - return RD_ANCHORX_WIDTH|RD_ANCHORY_HEIGHT; + return RD_ANCHORX_WIDTH | RD_ANCHORY_HEIGHT; } static INT_PTR CALLBACK clistDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lParam) @@ -138,33 +142,34 @@ static INT_PTR CALLBACK clistDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM EnableWindow(GetDlgItem(hwndDlg, IDC_CLIST), IsDlgButtonChecked(hwndDlg, IDC_CONTACT)); break; - case VARM_SETSUBJECT: { - LPARAM res = 0; - MCONTACT hItem, hContact = wParam; - log_debugA("VARM_SETSUBJECT: %u", hContact); - if (hContact == INVALID_CONTACT_ID) { - TCHAR *tszContact = db_get_tsa(NULL, MODULENAME, SETTING_SUBJECT); - log_debugA("VARM_SETSUBJECT: %s", tszContact); - if (tszContact != NULL) { - hContact = decodeContactFromString(tszContact); - log_debugA("VARM_SETSUBJECT decoded: %u", hContact); - mir_free(tszContact); - } } + case VARM_SETSUBJECT: + { + LPARAM res = 0; + MCONTACT hItem, hContact = wParam; + log_debugA("VARM_SETSUBJECT: %u", hContact); + if (hContact == INVALID_CONTACT_ID) { + TCHAR *tszContact = db_get_tsa(NULL, MODULENAME, SETTING_SUBJECT); + log_debugA("VARM_SETSUBJECT: %s", tszContact); + if (tszContact != NULL) { + hContact = decodeContactFromString(tszContact); + log_debugA("VARM_SETSUBJECT decoded: %u", hContact); + mir_free(tszContact); + } } - if ((hContact != INVALID_CONTACT_ID) && (hContact != NULL)) - hItem = (MCONTACT)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_FINDCONTACT, hContact, 0); - else - hItem = NULL; + if ((hContact != INVALID_CONTACT_ID) && (hContact != NULL)) + hItem = (MCONTACT)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_FINDCONTACT, hContact, 0); + else + hItem = NULL; - if (hItem != NULL) - res = (LPARAM)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SELECTITEM, (WPARAM)hItem, 0); + if (hItem != NULL) + res = (LPARAM)SendDlgItemMessage(hwndDlg, IDC_CLIST, CLM_SELECTITEM, (WPARAM)hItem, 0); - CheckRadioButton(hwndDlg, IDC_NULL, IDC_CONTACT, hItem==NULL?IDC_NULL:IDC_CONTACT); - EnableWindow(GetDlgItem(hwndDlg, IDC_CLIST), IsDlgButtonChecked(hwndDlg, IDC_CONTACT)); - SetFocus(GetDlgItem(hwndDlg, IDC_CLIST)); - SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, (LPARAM)res); + CheckRadioButton(hwndDlg, IDC_NULL, IDC_CONTACT, hItem==NULL?IDC_NULL:IDC_CONTACT); + EnableWindow(GetDlgItem(hwndDlg, IDC_CLIST), IsDlgButtonChecked(hwndDlg, IDC_CONTACT)); + SetFocus(GetDlgItem(hwndDlg, IDC_CLIST)); + SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, (LPARAM)res); + } return TRUE; - } case VARM_GETSUBJECT: SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, @@ -172,9 +177,8 @@ static INT_PTR CALLBACK clistDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM return TRUE; case WM_SIZE: - if (!IsIconic( hwndDlg )) { - UTILRESIZEDIALOG urd = { 0 }; - urd.cbSize = sizeof(urd); + if (!IsIconic(hwndDlg)) { + UTILRESIZEDIALOG urd = { sizeof(urd) }; urd.hInstance = hInst; urd.hwndDlg = hwndDlg; urd.lParam = 0; @@ -222,14 +226,14 @@ static INT_PTR CALLBACK clistDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM case WM_DESTROY: db_unset(NULL, MODULENAME, SETTING_SUBJECT); - { - MCONTACT hContact = (MCONTACT)SendMessage(hwndDlg, VARM_GETSUBJECT, 0, 0); - if (hContact != NULL) { - TCHAR *tszContact = encodeContactToString(hContact); - if (tszContact != NULL) { - db_set_ts(NULL, MODULENAME, SETTING_SUBJECT, tszContact); - mir_free(tszContact); - } } } + + MCONTACT hContact = (MCONTACT)SendMessage(hwndDlg, VARM_GETSUBJECT, 0, 0); + if (hContact != NULL) { + TCHAR *tszContact = encodeContactToString(hContact); + if (tszContact != NULL) { + db_set_ts(NULL, MODULENAME, SETTING_SUBJECT, tszContact); + mir_free(tszContact); + } } break; } diff --git a/plugins/Watrack/proto/proto.pas b/plugins/Watrack/proto/proto.pas index 9509c706e1..b26c6dba04 100644 --- a/plugins/Watrack/proto/proto.pas +++ b/plugins/Watrack/proto/proto.pas @@ -57,7 +57,7 @@ var {$include i_proto_opt.inc} {$include i_proto_dlg.inc} -procedure AddEvent(hContact:HCONTACT;atype,flag:integer;data:pointer;size:integer;time:dword=0); +procedure AddEvent(hContact:MCONTACT;atype,flag:integer;data:pointer;size:integer;time:dword=0); var dbeo:TDBEVENTINFO; begin @@ -404,7 +404,7 @@ end; procedure RegisterContacts; var - hContact:THCONTACT; + hContact:MCONTACT; begin hContact:=db_find_first(); while hContact<>0 do diff --git a/plugins/mRadio/i_myservice.inc b/plugins/mRadio/i_myservice.inc index e4cf178a5c..34f541689c 100644 --- a/plugins/mRadio/i_myservice.inc +++ b/plugins/mRadio/i_myservice.inc @@ -4,7 +4,7 @@ function Service_RadioPlayStop(wParam:WPARAM;lParam:LPARAM):int;cdecl; var p:PAnsiChar; lnew:bool; - hContact:THCONTACT; + hContact:MCONTACT; cni:TCONTACTINFO; i:integer; begin @@ -145,7 +145,7 @@ end; //----- Import-export ----- -function ImportOneStation(group:PAnsiChar;section:pointer):HCONTACT; +function ImportOneStation(group:PAnsiChar;section:pointer):MCONTACT; var p:pWideChar; pc:pAnsiChar; @@ -218,7 +218,7 @@ begin end; end; -procedure ExportRadioContact(num:integer;fname:PAnsiChar;hContact:HCONTACT); +procedure ExportRadioContact(num:integer;fname:PAnsiChar;hContact:MCONTACT); var pc:pAnsiChar; section:array [0..15] of AnsiChar; @@ -257,7 +257,7 @@ end; function ExportAll(wParam:WPARAM;lParam:LPARAM):int; cdecl; var dst:array [0..MAX_PATH-1] of AnsiChar; - hContact:THCONTACT; + hContact:MCONTACT; begin result:=0; if lParam<>0 then diff --git a/plugins/mRadio/i_search.inc b/plugins/mRadio/i_search.inc index d585c72d73..f4d21a0955 100644 --- a/plugins/mRadio/i_search.inc +++ b/plugins/mRadio/i_search.inc @@ -276,7 +276,7 @@ end; function Service_AddToList(wParam:WPARAM;lParam:LPARAM):int_ptr;cdecl; var - hContact:THCONTACT; + hContact:MCONTACT; p:PWideChar; lurl:pWideChar; begin diff --git a/plugins/mRadio/i_service.inc b/plugins/mRadio/i_service.inc index e1a528d84f..6473b5e9b2 100644 --- a/plugins/mRadio/i_service.inc +++ b/plugins/mRadio/i_service.inc @@ -27,7 +27,7 @@ begin result:=0; end; -procedure GetAwayMsgProc(hContact:HCONTACT); cdecl; +procedure GetAwayMsgProc(hContact:MCONTACT); cdecl; var buf,p:PWideChar; begin diff --git a/plugins/mRadio/rglobal.pas b/plugins/mRadio/rglobal.pas index d914d4dc21..51caddc63c 100644 --- a/plugins/mRadio/rglobal.pas +++ b/plugins/mRadio/rglobal.pas @@ -21,7 +21,7 @@ const const chan :HSTREAM = 0; - ActiveContact:HCONTACT = 0; + ActiveContact:MCONTACT = 0; ActiveURL :PWideChar = nil; const @@ -159,7 +159,7 @@ const function MakeMessage:pWideChar; -procedure SetStatus(hContact:HCONTACT;status:integer); +procedure SetStatus(hContact:MCONTACT;status:integer); function GetDefaultRecPath:pWideChar; function GetStatusText(status:integer;toCList:boolean=false):PWideChar; @@ -169,7 +169,7 @@ implementation uses common, dbsettings; -procedure SetStatus(hContact:HCONTACT;status:integer); +procedure SetStatus(hContact:MCONTACT;status:integer); begin // if Status=ID_STATUS_OFFLINE then // MyStopBass; -- cgit v1.2.3