summaryrefslogtreecommitdiff
path: root/plugins/ExternalAPI
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/ExternalAPI')
-rw-r--r--plugins/ExternalAPI/m_ContactSettings.h2
-rw-r--r--plugins/ExternalAPI/m_LogService.h6
-rw-r--r--plugins/ExternalAPI/m_account.h2
-rw-r--r--plugins/ExternalAPI/m_flash.h2
-rw-r--r--plugins/ExternalAPI/m_ftpfile.h6
-rw-r--r--plugins/ExternalAPI/m_ieview.h2
-rw-r--r--plugins/ExternalAPI/m_msg_buttonsbar.h2
-rw-r--r--plugins/ExternalAPI/m_popup2.h4
-rw-r--r--plugins/ExternalAPI/m_smileyadd.h10
-rw-r--r--plugins/ExternalAPI/m_spellchecker.h2
-rw-r--r--plugins/ExternalAPI/m_text.h4
-rw-r--r--plugins/ExternalAPI/m_tipper.h2
-rw-r--r--plugins/ExternalAPI/m_userinfoex.h2
-rw-r--r--plugins/ExternalAPI/m_variables.h10
-rw-r--r--plugins/ExternalAPI/m_voice.h2
-rw-r--r--plugins/ExternalAPI/m_weather.h5
-rw-r--r--plugins/ExternalAPI/m_yamn.h6
17 files changed, 35 insertions, 34 deletions
diff --git a/plugins/ExternalAPI/m_ContactSettings.h b/plugins/ExternalAPI/m_ContactSettings.h
index 9118a97a0f..1b497ab479 100644
--- a/plugins/ExternalAPI/m_ContactSettings.h
+++ b/plugins/ExternalAPI/m_ContactSettings.h
@@ -26,7 +26,7 @@ typedef struct {
int Type; // one of CSIT_ constants; value of this field depends on what settings dialog was opened: contact settings or group settings
union
{
- HCONTACT hContact; // used when Type == CSIT_CONTACT
+ MCONTACT hContact; // used when Type == CSIT_CONTACT
int groupID; // used when Type == CSIT_GROUP
};
} CONTACTSETTINGSINIT;
diff --git a/plugins/ExternalAPI/m_LogService.h b/plugins/ExternalAPI/m_LogService.h
index a8cf3f348c..3acd6be1d6 100644
--- a/plugins/ExternalAPI/m_LogService.h
+++ b/plugins/ExternalAPI/m_LogService.h
@@ -89,7 +89,7 @@ __inline static INT_PTR logservice_register(char *szID, TCHAR *tszTitle, TCHAR *
typedef struct {
int cbSize; // sizeof(LS_MSGINFO)
char *szID;
- HCONTACT hContact; // may be NULL if no contact is associated with the message
+ MCONTACT hContact; // may be NULL if no contact is associated with the message
union
{
char *szMsg; // the message
@@ -106,7 +106,7 @@ typedef struct {
// returns 0 on success
#define MS_LOGSERVICE_LOG "LogService/Log"
-__inline static INT_PTR logservice_log(char *szID, HCONTACT hContact, TCHAR *tszMsg)
+__inline static INT_PTR logservice_log(char *szID, MCONTACT hContact, TCHAR *tszMsg)
{
LS_MSGINFO mi;
ZeroMemory(&mi, sizeof(LS_MSGINFO));
@@ -131,7 +131,7 @@ __inline static INT_PTR logservice_log(char *szID, HCONTACT hContact, TCHAR *tsz
typedef struct {
int cbSize; // [in]; sizeof(LS_LOGINFO)
char *szID; // [in]
- HCONTACT hContact; // [in]; may be NULL
+ MCONTACT hContact; // [in]; may be NULL
union
{
char *szLogPath; // [in]; pointer to a string to receive log file name, including full path. May be NULL. The string must be at least MAX_PATH characters long
diff --git a/plugins/ExternalAPI/m_account.h b/plugins/ExternalAPI/m_account.h
index 88ad067239..e4b1820976 100644
--- a/plugins/ExternalAPI/m_account.h
+++ b/plugins/ExternalAPI/m_account.h
@@ -187,7 +187,7 @@ typedef struct CAccount
PSWMRG MessagesAccessSO;
//For clist contact notification
- HCONTACT hContact;
+ MCONTACT hContact;
BOOL isCounting;
struct CAccount *Next;
diff --git a/plugins/ExternalAPI/m_flash.h b/plugins/ExternalAPI/m_flash.h
index 868a6cda07..96a8407103 100644
--- a/plugins/ExternalAPI/m_flash.h
+++ b/plugins/ExternalAPI/m_flash.h
@@ -79,7 +79,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// FLASHAVATAR structure
typedef struct {
- HCONTACT hContact; // contact who flash avatar belongs to
+ MCONTACT hContact; // contact who flash avatar belongs to
HWND hWindow; // handle of flash avatar object
HWND hParentWindow; // handle of flash avatar's parent object
TCHAR* cUrl; // url of .swf file
diff --git a/plugins/ExternalAPI/m_ftpfile.h b/plugins/ExternalAPI/m_ftpfile.h
index 6bf82bb469..a51e1cd037 100644
--- a/plugins/ExternalAPI/m_ftpfile.h
+++ b/plugins/ExternalAPI/m_ftpfile.h
@@ -44,7 +44,7 @@ Boston, MA 02111-1307, USA.
typedef struct
{
int cbSize; // size of the structure
- HCONTACT hContact; // contact handle, can be NULL
+ MCONTACT hContact; // contact handle, can be NULL
BYTE ftpNum; // number of the FTP server which will be used for upload, can be one of FNUM_* values
BYTE mode; // upload mode, can be one of FMODE_* values
DWORD flags; // bitwise OR of the FUPL_* flags above
@@ -66,7 +66,7 @@ typedef struct
//
#define MS_FTPFILE_UPLOAD "FTPFile/Upload"
-__inline static INT_PTR FTPFileUploadA(HCONTACT hContact, BYTE ftpNum, BYTE mode, char **pszObjects, int objCount)
+__inline static INT_PTR FTPFileUploadA(MCONTACT hContact, BYTE ftpNum, BYTE mode, char **pszObjects, int objCount)
{
FTPUPLOAD ftpu = {0};
ftpu.cbSize = sizeof(ftpu);
@@ -78,7 +78,7 @@ __inline static INT_PTR FTPFileUploadA(HCONTACT hContact, BYTE ftpNum, BYTE mode
return CallService(MS_FTPFILE_UPLOAD, 0, (LPARAM)&ftpu);
}
-__inline static INT_PTR FTPFileUploadW(HCONTACT hContact, BYTE ftpNum, BYTE mode, wchar_t **pswzObjects, int objCount)
+__inline static INT_PTR FTPFileUploadW(MCONTACT hContact, BYTE ftpNum, BYTE mode, wchar_t **pswzObjects, int objCount)
{
FTPUPLOAD ftpu = {0};
ftpu.cbSize = sizeof(ftpu);
diff --git a/plugins/ExternalAPI/m_ieview.h b/plugins/ExternalAPI/m_ieview.h
index 44b8d5201d..08277c92e0 100644
--- a/plugins/ExternalAPI/m_ieview.h
+++ b/plugins/ExternalAPI/m_ieview.h
@@ -165,7 +165,7 @@ typedef struct {
int iType; // one of IEE_* values
DWORD dwFlags; // one of IEEF_* values
HWND hwnd; // HWND returned by IEW_CREATE
- HCONTACT hContact; // contact
+ MCONTACT hContact; // contact
union {
HANDLE hDbEventFirst; // first event to log, when IEE_LOG_EVENTS returns it will contain
// the last event actually logged or NULL if no event was logged (IEE_LOG_EVENTS)
diff --git a/plugins/ExternalAPI/m_msg_buttonsbar.h b/plugins/ExternalAPI/m_msg_buttonsbar.h
index e56bcafd81..73d4619229 100644
--- a/plugins/ExternalAPI/m_msg_buttonsbar.h
+++ b/plugins/ExternalAPI/m_msg_buttonsbar.h
@@ -83,7 +83,7 @@ typedef struct {
char* pszModule; // button owners name
DWORD dwButtonId; // registered button ID
HWND hwndFrom; // button parents HWND
- HCONTACT hContact;
+ MCONTACT hContact;
DWORD flags; // BBCF_ flags
} CustomButtonClickData;
diff --git a/plugins/ExternalAPI/m_popup2.h b/plugins/ExternalAPI/m_popup2.h
index c28a94cded..073955b945 100644
--- a/plugins/ExternalAPI/m_popup2.h
+++ b/plugins/ExternalAPI/m_popup2.h
@@ -70,7 +70,7 @@ typedef struct
DWORD flags;
// miranda bindings
- HCONTACT lchContact;
+ MCONTACT lchContact;
HANDLE lchEvent;
// style
@@ -123,7 +123,7 @@ typedef struct
// Unicode version of POPUPDATAEX_V2
typedef struct
{
- HCONTACT lchContact;
+ MCONTACT lchContact;
HICON lchIcon;
union
{
diff --git a/plugins/ExternalAPI/m_smileyadd.h b/plugins/ExternalAPI/m_smileyadd.h
index c0d9aacaa7..97c18dccdb 100644
--- a/plugins/ExternalAPI/m_smileyadd.h
+++ b/plugins/ExternalAPI/m_smileyadd.h
@@ -37,7 +37,7 @@ typedef struct
//If not found or NULL, "Standard" will be used
unsigned flags; //Flags (SAFLRE_*) that define the behaivior
BOOL disableRedraw; //Parameter have been depricated, have no effect on operation
- HCONTACT hContact; //Contact handle
+ MCONTACT hContact; //Contact handle
} SMADD_RICHEDIT3;
//Replace smileys in a rich edit control...
@@ -65,7 +65,7 @@ typedef struct
LPARAM targetWParam; //Target WParam to be sent (LParam will be char* to select smiley)
//see the example file.
HWND hwndParent; //Parent window for smiley dialog
- HCONTACT hContact; //Contact handle
+ MCONTACT hContact; //Contact handle
} SMADD_SHOWSEL3;
//Show smiley selection window
@@ -85,7 +85,7 @@ typedef struct
//NULL if the buttonicon is not defined...
int NumberOfVisibleSmileys; //Number of visible smileys defined.
int NumberOfSmileys; //Number of total smileys defined
- HCONTACT hContact; //Contact handle
+ MCONTACT hContact; //Contact handle
} SMADD_INFO2;
//get button smiley icon
@@ -131,7 +131,7 @@ typedef struct
unsigned numSmileys; //Number of Smileys found, this parameter filled by SmileyAdd
unsigned oflag; //One of the SAFL_ flags specifies content of the parse results
//this parameter filled by SmileyAdd
- HCONTACT hContact; //Contact handle
+ MCONTACT hContact; //Contact handle
} SMADD_BATCHPARSE2;
typedef struct
@@ -237,7 +237,7 @@ typedef struct
typedef struct
{
unsigned cbSize; // size of the structure
- HCONTACT hContact;
+ MCONTACT hContact;
int type; // 0 - directory, 1 - file;
TCHAR* path; // smiley category name for reference
} SMADD_CONT;
diff --git a/plugins/ExternalAPI/m_spellchecker.h b/plugins/ExternalAPI/m_spellchecker.h
index d3d4378872..71ad5d50fe 100644
--- a/plugins/ExternalAPI/m_spellchecker.h
+++ b/plugins/ExternalAPI/m_spellchecker.h
@@ -23,7 +23,7 @@ Boston, MA 02111-1307, USA.
typedef struct {
int cbSize;
- HCONTACT hContact; // The contact to get the settings from, or NULL
+ MCONTACT hContact; // The contact to get the settings from, or NULL
HWND hwnd; // The hwnd of the richedit
char *window_name; // A name for this richedit
} SPELLCHECKER_ITEM;
diff --git a/plugins/ExternalAPI/m_text.h b/plugins/ExternalAPI/m_text.h
index 3f8007b26d..666c88411a 100644
--- a/plugins/ExternalAPI/m_text.h
+++ b/plugins/ExternalAPI/m_text.h
@@ -47,7 +47,7 @@ typedef struct _tagMTEXT_interface {
#else
HANDLE (DLL_CALLCONV *CreateT) (HANDLE userHandle, char *text);
#endif
- HANDLE (DLL_CALLCONV *CreateEx) (HANDLE userHandle, HCONTACT hContact, void *text, DWORD flags);
+ HANDLE (DLL_CALLCONV *CreateEx) (HANDLE userHandle, MCONTACT hContact, void *text, DWORD flags);
int (DLL_CALLCONV *Measure) (HDC dc, SIZE *sz, HANDLE text);
int (DLL_CALLCONV *Display) (HDC dc, POINT pos, SIZE sz, HANDLE text);
int (DLL_CALLCONV *SetParent) (HANDLE text, HWND hwnd, RECT rect);
@@ -109,7 +109,7 @@ enum
typedef struct tagMTEXTCREATE
{
DWORD cbSize;
- HCONTACT hContact;
+ MCONTACT hContact;
void *text; // this is 'char *' or 'WCHAR *'
DWORD flags;
diff --git a/plugins/ExternalAPI/m_tipper.h b/plugins/ExternalAPI/m_tipper.h
index eceb4cc573..2f703df395 100644
--- a/plugins/ExternalAPI/m_tipper.h
+++ b/plugins/ExternalAPI/m_tipper.h
@@ -26,7 +26,7 @@ Boston, MA 02111-1307, USA.
// translation function type
// use hContact, module and setting to read your db value(s) and put the resulting string into buff
// return buff if the translation was successful, or return 0 for failure
-typedef TCHAR *(TranslateFunc)(HCONTACT hContact, const char *module, const char *setting_or_prefix, TCHAR *buff, int bufflen);
+typedef TCHAR *(TranslateFunc)(MCONTACT hContact, const char *module, const char *setting_or_prefix, TCHAR *buff, int bufflen);
typedef struct {
TranslateFunc *transFunc; // address of your translation function (see typedef above)
diff --git a/plugins/ExternalAPI/m_userinfoex.h b/plugins/ExternalAPI/m_userinfoex.h
index 9e244309bf..e0079d36cd 100644
--- a/plugins/ExternalAPI/m_userinfoex.h
+++ b/plugins/ExternalAPI/m_userinfoex.h
@@ -335,7 +335,7 @@ This service returns one of the results of MS_DB_CONTACT_GETSETTING_STR!
static FORCEINLINE INT_PTR
DBGetContactSettingEx_Helper(
- HCONTACT hContact,
+ MCONTACT hContact,
const char* pszProto,
const char* pszSetting,
DBVARIANT *dbv,
diff --git a/plugins/ExternalAPI/m_variables.h b/plugins/ExternalAPI/m_variables.h
index 2fc1d22c78..5dbfdfc5d9 100644
--- a/plugins/ExternalAPI/m_variables.h
+++ b/plugins/ExternalAPI/m_variables.h
@@ -77,7 +77,7 @@ typedef struct {
WCHAR *wszExtraText;
TCHAR *tszExtraText;
};
- HCONTACT hContact; // Handle to contact (can be NULL) -> The field "subject"
+ MCONTACT hContact; // Handle to contact (can be NULL) -> The field "subject"
// represents this contact.
int pCount; // (output) Number of succesful parsed tokens, needs to be set
// to 0 before the call
@@ -110,7 +110,7 @@ typedef struct {
// The returned string needs to be freed using mir_free.
#ifndef VARIABLES_NOHELPER
-__inline static TCHAR *variables_parse(TCHAR *tszFormat, TCHAR *tszExtraText, HCONTACT hContact)
+__inline static TCHAR *variables_parse(TCHAR *tszFormat, TCHAR *tszExtraText, MCONTACT hContact)
{
FORMATINFO fi = { sizeof(fi) };
fi.tszFormat = tszFormat;
@@ -121,7 +121,7 @@ __inline static TCHAR *variables_parse(TCHAR *tszFormat, TCHAR *tszExtraText, HC
}
#endif
-__inline static TCHAR *variables_parse_ex(TCHAR *tszFormat, TCHAR *tszExtraText, HCONTACT hContact,
+__inline static TCHAR *variables_parse_ex(TCHAR *tszFormat, TCHAR *tszExtraText, MCONTACT hContact,
TCHAR **tszaTemporaryVars, int cbTemporaryVarsSize) {
FORMATINFO fi = { 0 };
@@ -145,7 +145,7 @@ __inline static TCHAR *variables_parse_ex(TCHAR *tszFormat, TCHAR *tszExtraText,
// Note: The returned pointer needs to be released using your own free().
#ifndef VARIABLES_NOHELPER
-__inline static TCHAR *variables_parsedup(TCHAR *tszFormat, TCHAR *tszExtraText, HCONTACT hContact)
+__inline static TCHAR *variables_parsedup(TCHAR *tszFormat, TCHAR *tszExtraText, MCONTACT hContact)
{
if (ServiceExists(MS_VARS_FORMATSTRING)) {
FORMATINFO fi = { sizeof(fi) };
@@ -160,7 +160,7 @@ __inline static TCHAR *variables_parsedup(TCHAR *tszFormat, TCHAR *tszExtraText,
return tszFormat ? mir_tstrdup(tszFormat) : tszFormat;
}
-__inline static TCHAR *variables_parsedup_ex(TCHAR *tszFormat, TCHAR *tszExtraText, HCONTACT hContact,
+__inline static TCHAR *variables_parsedup_ex(TCHAR *tszFormat, TCHAR *tszExtraText, MCONTACT hContact,
TCHAR **tszaTemporaryVars, int cbTemporaryVarsSize)
{
if (ServiceExists(MS_VARS_FORMATSTRING)) {
diff --git a/plugins/ExternalAPI/m_voice.h b/plugins/ExternalAPI/m_voice.h
index 68d48510d3..5adf159f05 100644
--- a/plugins/ExternalAPI/m_voice.h
+++ b/plugins/ExternalAPI/m_voice.h
@@ -48,7 +48,7 @@ typedef struct {
char *id; // Protocol especific ID for this call
int flags; // Can be VOICE_CALL_CONTACT or VOICE_CALL_STRING (VOICE_UNICODE to say the string is unicode)
union { // Who to call
- HCONTACT hContact;
+ MCONTACT hContact;
TCHAR *ptszContact;
char *pszContact;
WCHAR *pwszContact;
diff --git a/plugins/ExternalAPI/m_weather.h b/plugins/ExternalAPI/m_weather.h
index 5a290b838d..cf1a522261 100644
--- a/plugins/ExternalAPI/m_weather.h
+++ b/plugins/ExternalAPI/m_weather.h
@@ -46,8 +46,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//============ WEATHER CONDITION STRUCT ============
// weather conditions (added in v0.1.2.0)
-typedef struct {
- HCONTACT hContact;
+typedef struct
+{
+ MCONTACT hContact;
TCHAR id[128];
TCHAR city[128];
TCHAR update[64];
diff --git a/plugins/ExternalAPI/m_yamn.h b/plugins/ExternalAPI/m_yamn.h
index 0211cd9936..43b8fccffc 100644
--- a/plugins/ExternalAPI/m_yamn.h
+++ b/plugins/ExternalAPI/m_yamn.h
@@ -94,7 +94,7 @@ struct CExportedServices
//
//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.
#define MS_YAMN_CLISTCONTEXT "YAMN/Service/ClistContactContextMenu"
@@ -104,7 +104,7 @@ struct CExportedServices
//
//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.
#define MS_YAMN_CLISTCONTEXTAPP "YAMN/Service/ClistContactContextMenuApp"
@@ -114,7 +114,7 @@ struct CExportedServices
//
//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.
#define MS_YAMN_CLISTDBLCLICK "YAMN/Service/ClistContactDoubleclicked"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 06:54:26 +0000