summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/m_clistint.h88
-rw-r--r--libs/win32/mir_app.libbin255540 -> 260208 bytes
-rw-r--r--libs/win64/mir_app.libbin253112 -> 258954 bytes
-rw-r--r--plugins/Clist_modern/src/modern_clistevents.cpp23
-rw-r--r--plugins/Clist_nicer/src/clistevents.cpp19
-rw-r--r--src/mir_app/src/clistevents.cpp27
-rw-r--r--src/mir_app/src/mir_app.def80
-rw-r--r--src/mir_app/src/mir_app64.def82
8 files changed, 159 insertions, 160 deletions
diff --git a/include/m_clistint.h b/include/m_clistint.h
index 9f9bfa4a37..03c19973a0 100644
--- a/include/m_clistint.h
+++ b/include/m_clistint.h
@@ -245,54 +245,56 @@ struct MenuProto
/////////////////////////////////////////////////////////////////////////////////////////
// functions
-EXTERN_C MIR_APP_DLL(void) Clist_Broadcast(int msg, WPARAM wParam, LPARAM lParam);
-EXTERN_C MIR_APP_DLL(void) Clist_BroadcastAsync(int msg, WPARAM wParam, LPARAM lParam);
-EXTERN_C MIR_APP_DLL(void) Clist_CalcEipPosition(ClcData *dat, ClcContact *contact, ClcGroup *group, POINT *result);
-EXTERN_C MIR_APP_DLL(void) Clist_ChangeContactIcon(MCONTACT hContact, int iIcon);
-EXTERN_C MIR_APP_DLL(void) Clist_ClcOptionsChanged(void);
-EXTERN_C MIR_APP_DLL(int) Clist_ClcStatusToPf2(int status);
-EXTERN_C MIR_APP_DLL(uint32_t) Clist_ContactToHItem(ClcContact *contact);
-EXTERN_C MIR_APP_DLL(HANDLE) Clist_ContactToItemHandle(ClcContact *contact, uint32_t *nmFlags);
-EXTERN_C MIR_APP_DLL(void) Clist_DeleteFromContactList(HWND hwnd, ClcData *dat);
-EXTERN_C MIR_APP_DLL(void) Clist_DeleteItemFromTree(HWND hwnd, MCONTACT hItem);
-EXTERN_C MIR_APP_DLL(void) Clist_DoSelectionDefaultAction(HWND hwnd, ClcData *dat);
-EXTERN_C MIR_APP_DLL(void) Clist_DrawMenuItem(DRAWITEMSTRUCT *dis, HICON hIcon, HICON eventIcon);
-EXTERN_C MIR_APP_DLL(void) Clist_EndRename(ClcData *dat, int save);
-EXTERN_C MIR_APP_DLL(void) Clist_EnsureVisible(HWND hwnd, ClcData *dat, int iItem, int partialOk);
-EXTERN_C MIR_APP_DLL(int) Clist_EventsProcessTrayDoubleClick(int index);
-EXTERN_C MIR_APP_DLL(bool) Clist_FindItem(HWND hwnd, ClcData *dat, uint32_t dwItem, ClcContact **contact, ClcGroup **subgroup = 0, int *isVisible = 0);
-EXTERN_C MIR_APP_DLL(uint32_t) Clist_GetDefaultExStyle(void);
-EXTERN_C MIR_APP_DLL(void) Clist_GetFontSetting(int i, LOGFONT *lf, COLORREF *colour);
-EXTERN_C MIR_APP_DLL(int) Clist_GetGeneralizedStatus(char **szProto = nullptr);
-EXTERN_C MIR_APP_DLL(wchar_t*) Clist_GetGroupCountsText(ClcData *dat, ClcContact *contact);
-EXTERN_C MIR_APP_DLL(int) Clist_GetRealStatus(ClcContact *cc, int iDefaultValue);
-EXTERN_C MIR_APP_DLL(void) Clist_HideInfoTip(ClcData *dat);
-EXTERN_C MIR_APP_DLL(void) Clist_InitAutoRebuild(HWND hWnd);
-EXTERN_C MIR_APP_DLL(void) Clist_InvalidateItem(HWND hwnd, ClcData *dat, int iItem);
-EXTERN_C MIR_APP_DLL(int) Clist_IsHiddenMode(ClcData *dat, int status);
-EXTERN_C MIR_APP_DLL(void) Clist_LoadContactTree(void);
-EXTERN_C MIR_APP_DLL(void) Clist_NotifyNewContact(HWND hwnd, MCONTACT hContact);
-EXTERN_C MIR_APP_DLL(void) Clist_RecalculateGroupCheckboxes(ClcData *dat);
-EXTERN_C MIR_APP_DLL(int) Clist_RemoveEvent(MCONTACT hContact, MEVENT hDbEvent);
-EXTERN_C MIR_APP_DLL(ClcGroup*) Clist_RemoveItemFromGroup(HWND hwnd, ClcGroup *group, ClcContact *contact, int updateTotalCount);
-EXTERN_C MIR_APP_DLL(void) Clist_SaveStateAndRebuildList(HWND hwnd, ClcData *dat);
-EXTERN_C MIR_APP_DLL(void) Clist_SetGroupChildCheckboxes(ClcGroup *group, int checked);
+MIR_APP_DLL(void) Clist_Broadcast(int msg, WPARAM wParam, LPARAM lParam);
+MIR_APP_DLL(void) Clist_BroadcastAsync(int msg, WPARAM wParam, LPARAM lParam);
+MIR_APP_DLL(void) Clist_CalcEipPosition(ClcData *dat, ClcContact *contact, ClcGroup *group, POINT *result);
+MIR_APP_DLL(void) Clist_ChangeContactIcon(MCONTACT hContact, int iIcon);
+MIR_APP_DLL(void) Clist_ClcOptionsChanged(void);
+MIR_APP_DLL(int) Clist_ClcStatusToPf2(int status);
+MIR_APP_DLL(uint32_t) Clist_ContactToHItem(ClcContact *contact);
+MIR_APP_DLL(HANDLE) Clist_ContactToItemHandle(ClcContact *contact, uint32_t *nmFlags);
+MIR_APP_DLL(void) Clist_DeleteFromContactList(HWND hwnd, ClcData *dat);
+MIR_APP_DLL(void) Clist_DeleteItemFromTree(HWND hwnd, MCONTACT hItem);
+MIR_APP_DLL(void) Clist_DoSelectionDefaultAction(HWND hwnd, ClcData *dat);
+MIR_APP_DLL(void) Clist_DrawMenuItem(DRAWITEMSTRUCT *dis, HICON hIcon, HICON eventIcon);
+MIR_APP_DLL(void) Clist_EndRename(ClcData *dat, int save);
+MIR_APP_DLL(void) Clist_EnsureVisible(HWND hwnd, ClcData *dat, int iItem, int partialOk);
+MIR_APP_DLL(int) Clist_EventsProcessTrayDoubleClick(int index);
+MIR_APP_DLL(bool) Clist_FindItem(HWND hwnd, ClcData *dat, uint32_t dwItem, ClcContact **contact, ClcGroup **subgroup = 0, int *isVisible = 0);
+MIR_APP_DLL(uint32_t) Clist_GetDefaultExStyle(void);
+MIR_APP_DLL(int) Clist_GetEventCount(void);
+MIR_APP_DLL(void) Clist_GetFontSetting(int i, LOGFONT *lf, COLORREF *colour);
+MIR_APP_DLL(int) Clist_GetGeneralizedStatus(char **szProto = nullptr);
+MIR_APP_DLL(wchar_t*) Clist_GetGroupCountsText(ClcData *dat, ClcContact *contact);
+MIR_APP_DLL(int) Clist_GetRealStatus(ClcContact *cc, int iDefaultValue);
+MIR_APP_DLL(void) Clist_HideInfoTip(ClcData *dat);
+MIR_APP_DLL(void) Clist_InitAutoRebuild(HWND hWnd);
+MIR_APP_DLL(void) Clist_InvalidateItem(HWND hwnd, ClcData *dat, int iItem);
+MIR_APP_DLL(int) Clist_IsHiddenMode(ClcData *dat, int status);
+MIR_APP_DLL(void) Clist_LoadContactTree(void);
+MIR_APP_DLL(void) Clist_NotifyNewContact(HWND hwnd, MCONTACT hContact);
+MIR_APP_DLL(void) Clist_RecalculateGroupCheckboxes(ClcData *dat);
+MIR_APP_DLL(int) Clist_RemoveEvent(MCONTACT hContact, MEVENT hDbEvent);
+MIR_APP_DLL(ClcGroup*) Clist_RemoveItemFromGroup(HWND hwnd, ClcGroup *group, ClcContact *contact, int updateTotalCount);
+MIR_APP_DLL(void) Clist_SaveStateAndRebuildList(HWND hwnd, ClcData *dat);
+MIR_APP_DLL(void) Clist_SetGroupChildCheckboxes(ClcGroup *group, int checked);
-EXTERN_C MIR_APP_DLL(int) Clist_TrayIconAdd(HWND hwnd, const char *szProto, const char *szIconProto, int status);
-EXTERN_C MIR_APP_DLL(int) Clist_TrayIconDestroy(HWND hwnd);
-EXTERN_C MIR_APP_DLL(void) Clist_TrayIconIconsChanged(void);
-EXTERN_C MIR_APP_DLL(wchar_t*) Clist_TrayIconMakeTooltip(const wchar_t *szPrefix, const char *szProto);
-EXTERN_C MIR_APP_DLL(void) Clist_TrayIconRemove(HWND hwnd, const char *szProto);
-EXTERN_C MIR_APP_DLL(int) Clist_TrayIconSetBaseInfo(HICON hIcon, const char *szPreferredProto);
-EXTERN_C MIR_APP_DLL(void) Clist_TrayIconUpdateBase(const char *szChangedProto);
-EXTERN_C MIR_APP_DLL(void) Clist_TraySetTimer();
+MIR_APP_DLL(int) Clist_TrayIconAdd(HWND hwnd, const char *szProto, const char *szIconProto, int status);
+MIR_APP_DLL(int) Clist_TrayIconDestroy(HWND hwnd);
+MIR_APP_DLL(void) Clist_TrayIconIconsChanged(void);
+MIR_APP_DLL(wchar_t*) Clist_TrayIconMakeTooltip(const wchar_t *szPrefix, const char *szProto);
+MIR_APP_DLL(void) Clist_TrayIconRemove(HWND hwnd, const char *szProto);
+MIR_APP_DLL(int) Clist_TrayIconSetBaseInfo(HICON hIcon, const char *szPreferredProto);
+MIR_APP_DLL(void) Clist_TrayIconUpdateBase(const char *szChangedProto);
+MIR_APP_DLL(void) Clist_TraySetTimer();
MIR_APP_DLL(CListEvent*) Clist_GetEvent(MCONTACT hContact, int idx);
+MIR_APP_DLL(CListEvent*) Clist_GetEventByMenu(int iMenuId);
-EXTERN_C MIR_APP_DLL(ClcCacheEntry*) Clist_GetCacheEntry(MCONTACT hContact);
+MIR_APP_DLL(ClcCacheEntry*) Clist_GetCacheEntry(MCONTACT hContact);
// calculates account's index by its position in status bar
-EXTERN_C MIR_APP_DLL(int) Clist_GetAccountIndex(int iPos);
+MIR_APP_DLL(int) Clist_GetAccountIndex(int iPos);
/////////////////////////////////////////////////////////////////////////////////////////
// CLIST_INTERFACE structure definition
@@ -394,8 +396,6 @@ struct CLIST_INTERFACE
* version 2 - events processing
*************************************************************************************/
- OBJLIST<CListEvent> *events;
-
CListEvent* (*pfnAddEvent)(CLISTEVENT*);
int (*pfnFreeEvent)(CListEvent *);
diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib
index d5d7dc174e..69e88e612c 100644
--- a/libs/win32/mir_app.lib
+++ b/libs/win32/mir_app.lib
Binary files differ
diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib
index 13fef8c1be..db4978293c 100644
--- a/libs/win64/mir_app.lib
+++ b/libs/win64/mir_app.lib
Binary files differ
diff --git a/plugins/Clist_modern/src/modern_clistevents.cpp b/plugins/Clist_modern/src/modern_clistevents.cpp
index d0eb4753d2..a578a69a29 100644
--- a/plugins/Clist_modern/src/modern_clistevents.cpp
+++ b/plugins/Clist_modern/src/modern_clistevents.cpp
@@ -54,15 +54,6 @@ struct NotifyMenuItemExData
MEVENT hDbEvent;
};
-static CLISTEVENT* MyGetEvent(int iSelection)
-{
- for (auto &it : *g_clistApi.events)
- if (it->menuId == iSelection)
- return it;
-
- return nullptr;
-}
-
static void EventArea_HideShowNotifyFrame()
{
int dwVisible = CallService(MS_CLIST_FRAMES_GETFRAMEOPTIONS, MAKEWPARAM(FO_FLAGS, hNotifyFrame), 0) & F_VISIBLE;
@@ -142,7 +133,7 @@ CListEvent* cli_AddEvent(CLISTEVENT *cle)
g_CluiData.hUpdateContact = p->hContact;
}
- if (g_clistApi.events->getCount() > 0) {
+ if (Clist_GetEventCount() > 0) {
g_CluiData.bEventAreaEnabled = true;
if (g_CluiData.bNotifyActive == false) {
g_CluiData.bNotifyActive = true;
@@ -178,7 +169,7 @@ int cli_RemoveEvent(CListEvent *pEvent)
int res = corecli.pfnFreeEvent(pEvent);
- if (g_clistApi.events->getCount() == 0) {
+ if (Clist_GetEventCount() == 0) {
g_CluiData.bNotifyActive = false;
EventArea_HideShowNotifyFrame();
}
@@ -245,8 +236,6 @@ static int ehhEventAreaBackgroundSettingsChanged(WPARAM, LPARAM)
void EventArea_ConfigureEventArea()
{
- int iCount = g_clistApi.events->getCount();
-
g_CluiData.dwFlags &= ~(CLUI_FRAME_AUTOHIDENOTIFY | CLUI_FRAME_SHOWALWAYS);
if (db_get_b(0, "CLUI", "EventArea", SETTING_EVENTAREAMODE_DEFAULT) == 1) g_CluiData.dwFlags |= CLUI_FRAME_AUTOHIDENOTIFY;
if (db_get_b(0, "CLUI", "EventArea", SETTING_EVENTAREAMODE_DEFAULT) == 2) g_CluiData.dwFlags |= CLUI_FRAME_SHOWALWAYS;
@@ -254,7 +243,7 @@ void EventArea_ConfigureEventArea()
if (g_CluiData.dwFlags & CLUI_FRAME_SHOWALWAYS)
g_CluiData.bNotifyActive = true;
else if (g_CluiData.dwFlags & CLUI_FRAME_AUTOHIDENOTIFY)
- g_CluiData.bNotifyActive = iCount > 0;
+ g_CluiData.bNotifyActive = Clist_GetEventCount() > 0;
else
g_CluiData.bNotifyActive = false;
@@ -391,13 +380,13 @@ static LRESULT CALLBACK EventArea_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LP
if (result != 0) {
NotifyMenuItemExData *nmi = (NotifyMenuItemExData*)mii.dwItemData;
if (nmi) {
- CLISTEVENT *cle = MyGetEvent(iSelection);
+ auto *cle = Clist_GetEventByMenu(iSelection);
if (cle) {
- CLISTEVENT *cle1 = nullptr;
CallService(cle->pszService, (WPARAM)nullptr, (LPARAM)cle);
+
// re-obtain the pointer, it may already be invalid/point to another event if the
// event we're interested in was removed by the service (nasty one...)
- cle1 = MyGetEvent(iSelection);
+ auto cle1 = Clist_GetEventByMenu(iSelection);
if (cle1 != nullptr)
Clist_RemoveEvent(cle->hContact, cle->hDbEvent);
}
diff --git a/plugins/Clist_nicer/src/clistevents.cpp b/plugins/Clist_nicer/src/clistevents.cpp
index 08a48dcede..667fc07b3f 100644
--- a/plugins/Clist_nicer/src/clistevents.cpp
+++ b/plugins/Clist_nicer/src/clistevents.cpp
@@ -64,15 +64,6 @@ void HideShowNotifyFrame()
}
}
-static CLISTEVENT* MyGetEvent(int iSelection)
-{
- for (auto &p : *g_clistApi.events)
- if (p->menuId == iSelection)
- return p;
-
- return nullptr;
-}
-
LRESULT CALLBACK EventAreaWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
switch (msg) {
@@ -153,13 +144,13 @@ LRESULT CALLBACK EventAreaWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
if (result != 0) {
nmi = (struct NotifyMenuItemExData *) mii.dwItemData;
if (nmi) {
- CLISTEVENT *cle = MyGetEvent(iSelection);
+ auto *cle = Clist_GetEventByMenu(iSelection);
if (cle) {
- CLISTEVENT *cle1 = nullptr;
CallService(cle->pszService, (WPARAM)NULL, (LPARAM)cle);
+
// re-obtain the pointer, it may already be invalid/point to another event if the
// event we're interested in was removed by the service (nasty one...)
- cle1 = MyGetEvent(iSelection);
+ auto *cle1 = Clist_GetEventByMenu(iSelection);
if (cle1 != nullptr)
Clist_RemoveEvent(cle->hContact, cle->hDbEvent);
}
@@ -296,7 +287,7 @@ CListEvent* AddEvent(CLISTEVENT *cle)
}
}
- if (g_clistApi.events->getCount() > 0) {
+ if (Clist_GetEventCount() > 0) {
cfg::dat.bEventAreaEnabled = TRUE;
if (cfg::dat.notifyActive == 0) {
cfg::dat.notifyActive = 1;
@@ -334,7 +325,7 @@ int RemoveEvent(CListEvent *e)
auto hDbEvent = e->hDbEvent;
int res = coreCli.pfnFreeEvent(e);
- if (g_clistApi.events->getCount() == 0) {
+ if (Clist_GetEventCount() == 0) {
cfg::dat.bEventAreaEnabled = FALSE;
if (cfg::dat.dwFlags & CLUI_FRAME_AUTOHIDENOTIFY) {
cfg::dat.notifyActive = 0;
diff --git a/src/mir_app/src/clistevents.cpp b/src/mir_app/src/clistevents.cpp
index 1bf064b467..b7b88f6faf 100644
--- a/src/mir_app/src/clistevents.cpp
+++ b/src/mir_app/src/clistevents.cpp
@@ -234,16 +234,33 @@ int fnRemoveEvent(CListEvent *pEvent)
MIR_APP_DLL(CListEvent *) Clist_FindEvent(MCONTACT hContact, MEVENT hDbEvent)
{
- for (auto &it : g_cliEvents) {
+ for (auto &it : g_cliEvents)
if ((hContact == it->hContact || hContact == -1) && it->hDbEvent == hDbEvent)
return it;
- }
return nullptr;
}
/////////////////////////////////////////////////////////////////////////////////////////
+MIR_APP_DLL(CListEvent *) Clist_GetEventByMenu(int iMenuId)
+{
+ for (auto &it : g_cliEvents)
+ if (it->menuId == iMenuId)
+ return it;
+
+ return nullptr;
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+
+MIR_APP_DLL(int) Clist_GetEventCount(void)
+{
+ return g_cliEvents.getCount();
+}
+
+/////////////////////////////////////////////////////////////////////////////////////////
+
MIR_APP_DLL(int) Clist_RemoveEvent(MCONTACT hContact, MEVENT hDbEvent)
{
if (auto *pEvent = Clist_FindEvent(hContact, hDbEvent)) {
@@ -358,9 +375,9 @@ MIR_APP_DLL(int) Clist_EventsProcessTrayDoubleClick(int index)
/////////////////////////////////////////////////////////////////////////////////////////
// Module entry point
-static int CListEventMarkedRead(WPARAM hContact, LPARAM hDbEvent)
+static int CListEventMarkedRead(WPARAM, LPARAM hDbEvent)
{
- Clist_RemoveEvent(hContact, hDbEvent);
+ Clist_RemoveEvent(INVALID_CONTACT_ID, hDbEvent);
return 0;
}
@@ -378,8 +395,6 @@ static int CListEventSettingsChanged(WPARAM hContact, LPARAM lParam)
int InitCListEvents(void)
{
- g_clistApi.events = &g_cliEvents;
-
if (db_get_b(0, MODULENAME, "DisableTrayFlash")) {
Clist::EnableTrayFlash = false;
db_unset(0, MODULENAME, "DisableTrayFlash");
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index 02620ec096..fd52af99cc 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -183,12 +183,12 @@ Clist_GroupRename @258
Clist_EndRebuild @259
Clist_GroupAdded @260
?GetInfo@Contact@@YGPA_WHIPBD@Z @261 NONAME
-Clist_ContactToHItem @262
+Clist_ContactToHItem @262 NONAME
Clist_ContactToItemHandle @263
Window_SetSkinIcon_IcoLib @264
Window_SetIcon_IcoLib @265
-Clist_Broadcast @266
-Clist_BroadcastAsync @267
+Clist_Broadcast @266 NONAME
+Clist_BroadcastAsync @267 NONAME
Clist_MenuProcessCommand @268
Clist_IsDocked @269
Clist_MenuProcessHotkey @270
@@ -218,7 +218,7 @@ Chat_GetDefaultEventDescr @295
FindDatabasePlugin @296
RegisterDatabasePlugin @298
Chat_CustomizeApi @299
-Clist_FindItem @314
+Clist_FindItem @314 NONAME
Colour_Get @315
Colour_GetW @316
Colour_Register @317
@@ -445,7 +445,7 @@ Proto_SetUniqueId @549
?SetUniqueId@CMPluginBase@@IAEXPBDH@Z @555 NONAME
Clist_GetProtocolVisibility @556
?Accounts@@YGAAU?$LIST@UPROTOACCOUNT@@@@XZ @557 NONAME
-Clist_InitAutoRebuild @558
+Clist_InitAutoRebuild @558 NONAME
Clist_GetContactIcon @559
Clist_GetAccountIndex @560
Menu_ReloadProtoMenus @561
@@ -453,41 +453,41 @@ Menu_GetProtocolMenu @562
ExtraIcon_Reload @563
ExtraIcon_SetAll @564
Clist_GetStatusModeDescription @565
-Clist_LoadContactTree @566
-Clist_ChangeContactIcon @567
-Clist_DrawMenuItem @568
-Clist_TrayIconUpdateBase @569
-Clist_TrayIconSetBaseInfo @570
-Clist_TrayIconRemove @571
-Clist_TrayIconMakeTooltip @572
-Clist_TrayIconIconsChanged @573
-Clist_TrayIconDestroy @574
-Clist_TrayIconAdd @575
-Clist_TraySetTimer @576
+Clist_LoadContactTree @566 NONAME
+Clist_ChangeContactIcon @567 NONAME
+Clist_DrawMenuItem @568 NONAME
+Clist_TrayIconUpdateBase @569 NONAME
+Clist_TrayIconSetBaseInfo @570 NONAME
+Clist_TrayIconRemove @571 NONAME
+Clist_TrayIconMakeTooltip @572 NONAME
+Clist_TrayIconIconsChanged @573 NONAME
+Clist_TrayIconDestroy @574 NONAME
+Clist_TrayIconAdd @575 NONAME
+Clist_TraySetTimer @576 NONAME
Clist_GetContactDisplayName @577
Clist_GetCacheEntry @578
-Clist_EventsProcessTrayDoubleClick @579
-Clist_InvalidateItem @580
-Clist_SetGroupChildCheckboxes @581
-Clist_RecalculateGroupCheckboxes @582
-Clist_GetFontSetting @583
-Clist_GetDefaultExStyle @584
-Clist_NotifyNewContact @585
-Clist_HideInfoTip @586
-Clist_IsHiddenMode @587
-Clist_ClcStatusToPf2 @588
-Clist_CalcEipPosition @589
-Clist_DeleteFromContactList @590
-Clist_EndRename @591
-Clist_DoSelectionDefaultAction @592
-Clist_EnsureVisible @593
-Clist_GetGroupCountsText @594
-Clist_SaveStateAndRebuildList @595
-Clist_DeleteItemFromTree @596
-Clist_RemoveItemFromGroup @597
-Clist_ClcOptionsChanged @598
-Clist_GetRealStatus @599
-Clist_GetGeneralizedStatus @600
+Clist_EventsProcessTrayDoubleClick @579 NONAME
+Clist_InvalidateItem @580 NONAME
+Clist_SetGroupChildCheckboxes @581 NONAME
+Clist_RecalculateGroupCheckboxes @582 NONAME
+Clist_GetFontSetting @583 NONAME
+Clist_GetDefaultExStyle @584 NONAME
+Clist_NotifyNewContact @585 NONAME
+Clist_HideInfoTip @586 NONAME
+Clist_IsHiddenMode @587 NONAME
+Clist_ClcStatusToPf2 @588 NONAME
+Clist_CalcEipPosition @589 NONAME
+Clist_DeleteFromContactList @590 NONAME
+Clist_EndRename @591 NONAME
+Clist_DoSelectionDefaultAction @592 NONAME
+Clist_EnsureVisible @593 NONAME
+Clist_GetGroupCountsText @594 NONAME
+Clist_SaveStateAndRebuildList @595 NONAME
+Clist_DeleteItemFromTree @596 NONAME
+Clist_RemoveItemFromGroup @597 NONAME
+Clist_ClcOptionsChanged @598 NONAME
+Clist_GetRealStatus @599 NONAME
+Clist_GetGeneralizedStatus @600 NONAME
Proto_GetStatus @601
?getCache@MDatabaseCommon@@QBEPAUMIDatabaseCache@@XZ @602 NONAME
?Compact@MDatabaseCommon@@UAGHXZ @603 NONAME
@@ -871,4 +871,6 @@ Chat_IsMuted @941 NONAME
?setUrl@FILE_BLOB@DB@@QAEXPBD@Z @986 NONAME
?Clist_GetEvent@@YGPAUCListEvent@@IH@Z @987 NONAME
?Clist_FindEvent@@YGPAUCListEvent@@II@Z @988 NONAME
-Clist_RemoveEvent @989
+?Clist_RemoveEvent@@YGHII@Z @989 NONAME
+?Clist_GetEventByMenu@@YGPAUCListEvent@@H@Z @990 NONAME
+?Clist_GetEventCount@@YGHXZ @991 NONAME
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index f6b294699f..5b9a90234d 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -183,12 +183,12 @@ Clist_GroupRename @258
Clist_EndRebuild @259
Clist_GroupAdded @260
?GetInfo@Contact@@YAPEA_WHIPEBD@Z @261 NONAME
-Clist_ContactToHItem @262
-Clist_ContactToItemHandle @263
+Clist_ContactToHItem @262 NONAME
+Clist_ContactToItemHandle @263 NONAME
Window_SetSkinIcon_IcoLib @264
Window_SetIcon_IcoLib @265
-Clist_Broadcast @266
-Clist_BroadcastAsync @267
+Clist_Broadcast @266 NONAME
+Clist_BroadcastAsync @267 NONAME
Clist_MenuProcessCommand @268
Clist_IsDocked @269
Clist_MenuProcessHotkey @270
@@ -218,7 +218,7 @@ Chat_GetDefaultEventDescr @295
FindDatabasePlugin @296
RegisterDatabasePlugin @298
Chat_CustomizeApi @299
-Clist_FindItem @314
+Clist_FindItem @314 NONAME
Colour_Get @315
Colour_GetW @316
Colour_Register @317
@@ -445,7 +445,7 @@ Proto_SetUniqueId @549
?SetUniqueId@CMPluginBase@@IEAAXPEBDH@Z @555 NONAME
Clist_GetProtocolVisibility @556
?Accounts@@YAAEAU?$LIST@UPROTOACCOUNT@@@@XZ @557 NONAME
-Clist_InitAutoRebuild @558
+Clist_InitAutoRebuild @558 NONAME
Clist_GetContactIcon @559
Clist_GetAccountIndex @560
Menu_ReloadProtoMenus @561
@@ -453,41 +453,41 @@ Menu_GetProtocolMenu @562
ExtraIcon_Reload @563
ExtraIcon_SetAll @564
Clist_GetStatusModeDescription @565
-Clist_LoadContactTree @566
-Clist_ChangeContactIcon @567
-Clist_DrawMenuItem @568
-Clist_TrayIconUpdateBase @569
-Clist_TrayIconSetBaseInfo @570
-Clist_TrayIconRemove @571
-Clist_TrayIconMakeTooltip @572
-Clist_TrayIconIconsChanged @573
-Clist_TrayIconDestroy @574
-Clist_TrayIconAdd @575
-Clist_TraySetTimer @576
+Clist_LoadContactTree @566 NONAME
+Clist_ChangeContactIcon @567 NONAME
+Clist_DrawMenuItem @568 NONAME
+Clist_TrayIconUpdateBase @569 NONAME
+Clist_TrayIconSetBaseInfo @570 NONAME
+Clist_TrayIconRemove @571 NONAME
+Clist_TrayIconMakeTooltip @572 NONAME
+Clist_TrayIconIconsChanged @573 NONAME
+Clist_TrayIconDestroy @574 NONAME
+Clist_TrayIconAdd @575 NONAME
+Clist_TraySetTimer @576 NONAME
Clist_GetContactDisplayName @577
Clist_GetCacheEntry @578
-Clist_EventsProcessTrayDoubleClick @579
-Clist_InvalidateItem @580
-Clist_SetGroupChildCheckboxes @581
-Clist_RecalculateGroupCheckboxes @582
-Clist_GetFontSetting @583
-Clist_GetDefaultExStyle @584
-Clist_NotifyNewContact @585
-Clist_HideInfoTip @586
-Clist_IsHiddenMode @587
-Clist_ClcStatusToPf2 @588
-Clist_CalcEipPosition @589
-Clist_DeleteFromContactList @590
-Clist_EndRename @591
-Clist_DoSelectionDefaultAction @592
-Clist_EnsureVisible @593
-Clist_GetGroupCountsText @594
-Clist_SaveStateAndRebuildList @595
-Clist_DeleteItemFromTree @596
-Clist_RemoveItemFromGroup @597
-Clist_ClcOptionsChanged @598
-Clist_GetRealStatus @599
-Clist_GetGeneralizedStatus @600
+Clist_EventsProcessTrayDoubleClick @579 NONAME
+Clist_InvalidateItem @580 NONAME
+Clist_SetGroupChildCheckboxes @581 NONAME
+Clist_RecalculateGroupCheckboxes @582 NONAME
+Clist_GetFontSetting @583 NONAME
+Clist_GetDefaultExStyle @584 NONAME
+Clist_NotifyNewContact @585 NONAME
+Clist_HideInfoTip @586 NONAME
+Clist_IsHiddenMode @587 NONAME
+Clist_ClcStatusToPf2 @588 NONAME
+Clist_CalcEipPosition @589 NONAME
+Clist_DeleteFromContactList @590 NONAME
+Clist_EndRename @591 NONAME
+Clist_DoSelectionDefaultAction @592 NONAME
+Clist_EnsureVisible @593 NONAME
+Clist_GetGroupCountsText @594 NONAME
+Clist_SaveStateAndRebuildList @595 NONAME
+Clist_DeleteItemFromTree @596 NONAME
+Clist_RemoveItemFromGroup @597 NONAME
+Clist_ClcOptionsChanged @598 NONAME
+Clist_GetRealStatus @599 NONAME
+Clist_GetGeneralizedStatus @600 NONAME
Proto_GetStatus @601
?getCache@MDatabaseCommon@@QEBAPEAUMIDatabaseCache@@XZ @602 NONAME
?Compact@MDatabaseCommon@@UEAAHXZ @603 NONAME
@@ -871,4 +871,6 @@ Chat_IsMuted @941 NONAME
?setUrl@FILE_BLOB@DB@@QEAAXPEBD@Z @986 NONAME
?Clist_GetEvent@@YAPEAUCListEvent@@IH@Z @987 NONAME
?Clist_FindEvent@@YAPEAUCListEvent@@II@Z @988 NONAME
-Clist_RemoveEvent @989
+?Clist_RemoveEvent@@YAHII@Z @989 NONAME
+?Clist_GetEventByMenu@@YAPEAUCListEvent@@H@Z @990 NONAME
+?Clist_GetEventCount@@YAHXZ @991 NONAME
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-02 08:33:37 +0000