From 25221b7d2afb70f82eb3805330fd39a6f6708049 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 26 Jun 2012 23:41:55 +0000 Subject: mk: removed all LIST_INTERFACE, MI_INTERFACE & UTF8_INTERFACE instances. all related functions moved to mir_core. git-svn-id: http://svn.miranda-ng.org/main/trunk@644 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/ExternalAPI/m_music.h | 8 ++++---- plugins/ExternalAPI/m_popup2.h | 4 ++-- plugins/ExternalAPI/m_variables.h | 22 ---------------------- 3 files changed, 6 insertions(+), 28 deletions(-) (limited to 'plugins/ExternalAPI') diff --git a/plugins/ExternalAPI/m_music.h b/plugins/ExternalAPI/m_music.h index 0246fabe34..f89dae99a0 100644 --- a/plugins/ExternalAPI/m_music.h +++ b/plugins/ExternalAPI/m_music.h @@ -79,7 +79,7 @@ typedef struct tSongInfo { #else #define WAT_INF_TCHAR WAT_INF_ANSI #define SongInfoT tSongInfoA -#endif +#endif // result codes #define WAT_RES_UNKNOWN -2 @@ -122,7 +122,7 @@ typedef struct tSongInfo { Affects: Fill structure by info from file named in SongInfo.mfile returns: 0, if success note: fields, which values can't be obtained, leaves old values. - you must free given strings by miranda mmi.free + you must free given strings by miranda mir_free */ #define MS_WAT_GETFILEINFO "WATrack/GetFileInfo" @@ -309,7 +309,7 @@ typedef struct tPlayerCell { HICON Icon; // can be 0. for registration only LPINITPROC Init; // LPINITPROC; can be NULL. initialize any data LPDEINITPROC DeInit; // LPDEINITPROC; can be NULL. finalize player processing - LPCHECKPROC Check; // check player + LPCHECKPROC Check; // check player LPSTATUSPROC GetStatus; // tStatusProc; can be NULL. get player status LPNAMEPROC GetName; // can be NULL. get media filename LPINFOPROC GetInfo; // can be NULL. get info from player @@ -346,7 +346,7 @@ typedef struct tLastFMInfo { UINT request; // 0 - artist, 1 - album, 2 - track WCHAR* artist; // artist WCHAR* album; // album or similar artists for Artist info request - WCHAR* title; // track title + WCHAR* title; // track title WCHAR* tags; // tags WCHAR* info; // artist bio or wiki article WCHAR* image; // photo/cover link diff --git a/plugins/ExternalAPI/m_popup2.h b/plugins/ExternalAPI/m_popup2.h index cec5abb395..5ccf169a0e 100644 --- a/plugins/ExternalAPI/m_popup2.h +++ b/plugins/ExternalAPI/m_popup2.h @@ -30,7 +30,7 @@ them! // popup you are requesting // ANSI Popup Action -typedef struct +typedef struct { int cbSize; // sizeof(POPUPACTION) HICON lchIcon; // Action Icon @@ -227,7 +227,7 @@ static int __inline PUChangeW(HWND hWndPopUp, POPUPDATAW_V2 *newData) { /* UM_CHANGEPOPUP This message is triggered by Change/ChangeText services. You also may post it directly, but make -sure you allocate memory via miranda mmi, because popup will mir_free() them! +sure you allocate memory via mir_alloc, because popup will mir_free() them! wParam = Modification type lParam = value of type defined by wParam diff --git a/plugins/ExternalAPI/m_variables.h b/plugins/ExternalAPI/m_variables.h index 0cba5216ce..77571f5522 100644 --- a/plugins/ExternalAPI/m_variables.h +++ b/plugins/ExternalAPI/m_variables.h @@ -55,26 +55,6 @@ // Note: Do only use this service to free memory that was *explicitliy* // stated that it should be free with this service. - - -#define MS_VARS_GET_MMI "Vars/GetMMI" - -// Get Variable's RTL/CRT function poiners to malloc(), free() and -// realloc(). - -// Parameters: -// ------------------------ -// wParam = 0 -// lParam = (LPARAM) &MM_INTERFACE -// Pointer to a memory manager interface struct (see m_system.h). - -// Return Value: -// ------------------------ -// Returns 0 on success, nozero otherwise - -// Note: Works exactly the same as the MS_SYSTEM_GET_MMI service -// service of m_system.h. - // Helper function for easy using: #ifndef VARIABLES_NOHELPER __inline static void variables_free(void *pntr) { @@ -83,8 +63,6 @@ __inline static void variables_free(void *pntr) { } #endif - - // -------------------------------------------------------------------------- // String formatting // -------------------------------------------------------------------------- -- cgit v1.2.3