summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/stdchat/src/window.cpp8
-rw-r--r--src/core/stdfile/src/filerecvdlg.cpp4
-rw-r--r--src/core/stdfile/src/filesenddlg.cpp4
-rw-r--r--src/core/stdfile/src/filexferdlg.cpp4
-rw-r--r--src/core/stdmsg/src/msgdialog.cpp4
-rw-r--r--src/core/stdurl/urldialogs.cpp8
-rw-r--r--src/mir_app/src/clc.cpp4
-rw-r--r--src/mir_app/src/clistmenus.cpp19
-rw-r--r--src/mir_app/src/clui.cpp10
-rw-r--r--src/mir_app/src/genmenu.cpp71
-rw-r--r--src/mir_app/src/genmenu.h2
-rw-r--r--src/mir_app/src/mir_app.def6
-rw-r--r--src/mir_app/src/mir_app64.def6
13 files changed, 68 insertions, 82 deletions
diff --git a/src/core/stdchat/src/window.cpp b/src/core/stdchat/src/window.cpp
index d480705827..bb9dbffbd3 100644
--- a/src/core/stdchat/src/window.cpp
+++ b/src/core/stdchat/src/window.cpp
@@ -1060,7 +1060,7 @@ static LRESULT CALLBACK NicklistSubclassProc(HWND hwnd, UINT msg, WPARAM wParam,
{
MEASUREITEMSTRUCT *mis = (MEASUREITEMSTRUCT *) lParam;
if (mis->CtlType == ODT_MENU)
- return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);
+ return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);
}
return FALSE;
@@ -1068,7 +1068,7 @@ static LRESULT CALLBACK NicklistSubclassProc(HWND hwnd, UINT msg, WPARAM wParam,
{
DRAWITEMSTRUCT *dis = (DRAWITEMSTRUCT *) lParam;
if (dis->CtlType == ODT_MENU)
- return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);
+ return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);
}
return FALSE;
@@ -1786,7 +1786,7 @@ END_REMOVETAB:
{
MEASUREITEMSTRUCT *mis = (MEASUREITEMSTRUCT *) lParam;
if (mis->CtlType == ODT_MENU)
- return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);
+ return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);
int ih = GetTextPixelSize( _T("AQGgl'"), g_Settings.UserListFont,FALSE);
int ih2 = GetTextPixelSize( _T("AQGg'"), g_Settings.UserListHeadingsFont,FALSE);
@@ -1805,7 +1805,7 @@ END_REMOVETAB:
{
DRAWITEMSTRUCT *dis = (DRAWITEMSTRUCT *) lParam;
if (dis->CtlType == ODT_MENU)
- return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);
+ return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);
if (dis->CtlID == IDC_LIST) {
int index = dis->itemID;
diff --git a/src/core/stdfile/src/filerecvdlg.cpp b/src/core/stdfile/src/filerecvdlg.cpp
index 591cf78834..09c19b331b 100644
--- a/src/core/stdfile/src/filerecvdlg.cpp
+++ b/src/core/stdfile/src/filerecvdlg.cpp
@@ -293,7 +293,7 @@ INT_PTR CALLBACK DlgProcRecvFile(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
return TRUE;
case WM_MEASUREITEM:
- return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);
+ return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);
case WM_DRAWITEM:
{
@@ -309,7 +309,7 @@ INT_PTR CALLBACK DlgProcRecvFile(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
}
}
}
- return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);
+ return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);
case WM_COMMAND:
if (CallService(MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM(LOWORD(wParam), MPCF_CONTACTMENU), (LPARAM)dat->hContact))
diff --git a/src/core/stdfile/src/filesenddlg.cpp b/src/core/stdfile/src/filesenddlg.cpp
index aa9cbee487..56aaf3bb88 100644
--- a/src/core/stdfile/src/filesenddlg.cpp
+++ b/src/core/stdfile/src/filesenddlg.cpp
@@ -276,7 +276,7 @@ INT_PTR CALLBACK DlgProcSendFile(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
return TRUE;
case WM_MEASUREITEM:
- return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);
+ return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);
case WM_DRAWITEM:
{
@@ -292,7 +292,7 @@ INT_PTR CALLBACK DlgProcSendFile(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
}
}
}
- return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);
+ return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);
case M_FILECHOOSEDONE:
if (lParam != 0) {
diff --git a/src/core/stdfile/src/filexferdlg.cpp b/src/core/stdfile/src/filexferdlg.cpp
index a256f7316e..1db269962e 100644
--- a/src/core/stdfile/src/filexferdlg.cpp
+++ b/src/core/stdfile/src/filexferdlg.cpp
@@ -328,10 +328,10 @@ INT_PTR CALLBACK DlgProcFileTransfer(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
break;
case WM_MEASUREITEM:
- return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);
+ return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);
case WM_DRAWITEM:
- return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);
+ return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);
case WM_FT_CLEANUP:
if (!dat->fs) {
diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp
index 583f6acd8d..acb7c0049d 100644
--- a/src/core/stdmsg/src/msgdialog.cpp
+++ b/src/core/stdmsg/src/msgdialog.cpp
@@ -1320,7 +1320,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
{
LPMEASUREITEMSTRUCT mis = (LPMEASUREITEMSTRUCT)lParam;
if (mis->CtlType == ODT_MENU)
- return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);
+ return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);
}
break;
@@ -1328,7 +1328,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
{
LPDRAWITEMSTRUCT dis = (LPDRAWITEMSTRUCT)lParam;
if (dis->CtlType == ODT_MENU)
- return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);
+ return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);
if (dis->hwndItem == dat->hwndStatus) {
DrawStatusIcons(dat->hContact, dis->hDC, dis->rcItem, 2);
return TRUE;
diff --git a/src/core/stdurl/urldialogs.cpp b/src/core/stdurl/urldialogs.cpp
index 3fb66a7e25..0d781abc76 100644
--- a/src/core/stdurl/urldialogs.cpp
+++ b/src/core/stdurl/urldialogs.cpp
@@ -128,7 +128,7 @@ INT_PTR CALLBACK DlgProcUrlRecv(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
return TRUE;
case WM_MEASUREITEM:
- return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);
+ return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);
case WM_DRAWITEM:
{
@@ -144,7 +144,7 @@ INT_PTR CALLBACK DlgProcUrlRecv(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
}
}
}
- return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);
+ return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);
case DM_UPDATETITLE:
sttUpdateTitle(hwndDlg, dat->hContact);
@@ -502,7 +502,7 @@ INT_PTR CALLBACK DlgProcUrlSend(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
break;
case WM_MEASUREITEM:
- return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);
+ return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);
case WM_DRAWITEM:
{
@@ -518,7 +518,7 @@ INT_PTR CALLBACK DlgProcUrlSend(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
}
}
}
- return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);
+ return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);
case DM_UPDATETITLE:
sttUpdateTitle(hwndDlg, dat->hContact);
diff --git a/src/mir_app/src/clc.cpp b/src/mir_app/src/clc.cpp
index 517aaceac5..6c3a6c3125 100644
--- a/src/mir_app/src/clc.cpp
+++ b/src/mir_app/src/clc.cpp
@@ -1277,10 +1277,10 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam,
return 0;
case WM_MEASUREITEM:
- return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);
+ return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);
case WM_DRAWITEM:
- return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);
+ return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);
case WM_COMMAND:
hit = cli.pfnGetRowByIndex(dat, dat->selection, &contact, NULL);
diff --git a/src/mir_app/src/clistmenus.cpp b/src/mir_app/src/clistmenus.cpp
index 32193ed18d..9baf333882 100644
--- a/src/mir_app/src/clistmenus.cpp
+++ b/src/mir_app/src/clistmenus.cpp
@@ -342,7 +342,7 @@ INT_PTR ContactMenuCheckService(WPARAM wParam, LPARAM)
}
TMO_MenuItem mi;
- if (MO_GetMenuItem((WPARAM)pcpp->MenuItemHandle, (LPARAM)&mi) == 0) {
+ if (Menu_GetItemInfo(pcpp->MenuItemHandle, mi) == 0) {
if (mi.flags & CMIF_HIDDEN) return FALSE;
if (mi.flags & CMIF_NOTONLIST && bcp->isOnList) return FALSE;
if (mi.flags & CMIF_NOTOFFLIST && !bcp->isOnList) return FALSE;
@@ -681,8 +681,8 @@ static INT_PTR MenuProcessHotkey(WPARAM vKey, LPARAM)
prochotkey = true;
bool res =
- MO_ProcessHotKeys(hStatusMenuObject, vKey) ||
- MO_ProcessHotKeys(hMainMenuObject, vKey);
+ Menu_ProcessHotKey(hStatusMenuObject, vKey) ||
+ Menu_ProcessHotKey(hMainMenuObject, vKey);
prochotkey = false;
@@ -697,16 +697,6 @@ static int MenuIconsChanged(WPARAM, LPARAM)
return 0;
}
-static INT_PTR MeasureMenuItem(WPARAM, LPARAM lParam)
-{
- return MO_MeasureMenuItem((LPMEASUREITEMSTRUCT)lParam);
-}
-
-static INT_PTR DrawMenuItem(WPARAM, LPARAM lParam)
-{
- return MO_DrawMenuItem((LPDRAWITEMSTRUCT)lParam);
-}
-
int RecursiveDeleteMenu(HMENU hMenu)
{
int cnt = GetMenuItemCount(hMenu);
@@ -1210,9 +1200,6 @@ void InitCustomMenus(void)
CreateServiceFunction("CList/AddContactMenuItem", AddContactMenuItem);
CreateServiceFunction(MS_CLIST_MENUBUILDCONTACT, BuildContactMenu);
- CreateServiceFunction(MS_CLIST_MENUMEASUREITEM, MeasureMenuItem);
- CreateServiceFunction(MS_CLIST_MENUDRAWITEM, DrawMenuItem);
-
CreateServiceFunction(MS_CLIST_MENUGETSTATUS, BuildStatusMenu);
CreateServiceFunction(MS_CLIST_MENUPROCESSCOMMAND, MenuProcessCommand);
CreateServiceFunction(MS_CLIST_MENUPROCESSHOTKEY, MenuProcessHotkey);
diff --git a/src/mir_app/src/clui.cpp b/src/mir_app/src/clui.cpp
index 018d4300f4..c899b5f1f4 100644
--- a/src/mir_app/src/clui.cpp
+++ b/src/mir_app/src/clui.cpp
@@ -965,12 +965,12 @@ LRESULT CALLBACK fnContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
break;
case WM_MEASUREITEM:
- if (((LPMEASUREITEMSTRUCT) lParam)->itemData == MENU_MIRANDAMENU) {
- ((LPMEASUREITEMSTRUCT) lParam)->itemWidth = g_IconWidth * 4 / 3;
- ((LPMEASUREITEMSTRUCT) lParam)->itemHeight = 0;
+ if (((LPMEASUREITEMSTRUCT)lParam)->itemData == MENU_MIRANDAMENU) {
+ ((LPMEASUREITEMSTRUCT)lParam)->itemWidth = g_IconWidth * 4 / 3;
+ ((LPMEASUREITEMSTRUCT)lParam)->itemHeight = 0;
return TRUE;
}
- return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);
+ return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);
case WM_DRAWITEM:
{
@@ -1029,7 +1029,7 @@ LRESULT CALLBACK fnContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
IcoLib_ReleaseIcon(hIcon);
return TRUE;
}
- return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);
+ return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);
}
}
return 0;
diff --git a/src/mir_app/src/genmenu.cpp b/src/mir_app/src/genmenu.cpp
index 9396daad50..ef63bd933f 100644
--- a/src/mir_app/src/genmenu.cpp
+++ b/src/mir_app/src/genmenu.cpp
@@ -109,13 +109,11 @@ TMO_IntMenuItem* MO_RecursiveWalkMenu(TMO_IntMenuItem *parent, pfnWalkFunc func,
}
///////////////////////////////////////////////////////////////////////////////
-// wparam = 0
-// lparam = LPMEASUREITEMSTRUCT
-int MO_MeasureMenuItem(LPMEASUREITEMSTRUCT mis)
+MIR_APP_DLL(BOOL) Menu_MeasureItem(MEASUREITEMSTRUCT *mis)
{
if (!bIsGenMenuInited)
- return -1;
+ return FALSE;
if (mis == NULL)
return FALSE;
@@ -137,13 +135,11 @@ int MO_MeasureMenuItem(LPMEASUREITEMSTRUCT mis)
}
///////////////////////////////////////////////////////////////////////////////
-// wparam = 0
-// lparam = LPDRAWITEMSTRUCT
-int MO_DrawMenuItem(LPDRAWITEMSTRUCT dis)
+MIR_APP_DLL(BOOL) Menu_DrawItem(DRAWITEMSTRUCT *dis)
{
if (!bIsGenMenuInited)
- return -1;
+ return FALSE;
if (dis == NULL)
return FALSE;
@@ -184,6 +180,8 @@ int MO_DrawMenuItem(LPDRAWITEMSTRUCT dis)
return TRUE;
}
+/////////////////////////////////////////////////////////////////////////////////////////
+
int MO_RemoveAllObjects()
{
for (int i = 0; i < g_menus.getCount(); i++)
@@ -193,22 +191,20 @@ int MO_RemoveAllObjects()
}
/////////////////////////////////////////////////////////////////////////////////////////
-// wparam = MenuObjectHandle
-// lparam = vKey
-INT_PTR MO_ProcessHotKeys(HANDLE menuHandle, INT_PTR vKey)
+EXTERN_C MIR_APP_DLL(BOOL) Menu_ProcessHotKey(HANDLE hMenuObject, int key)
{
if (!bIsGenMenuInited)
return -1;
mir_cslock lck(csMenuHook);
- int objidx = GetMenuObjbyId((int)menuHandle);
+ int objidx = GetMenuObjbyId((int)hMenuObject);
if (objidx == -1)
return FALSE;
for (TMO_IntMenuItem *pimi = g_menus[objidx]->m_items.first; pimi != NULL; pimi = pimi->next) {
if (pimi->hotKey == 0) continue;
- if (HIWORD(pimi->hotKey) != vKey) continue;
+ if (HIWORD(pimi->hotKey) != key) continue;
if (!(LOWORD(pimi->hotKey) & MOD_ALT) != !(GetKeyState(VK_MENU) & 0x8000)) continue;
if (!(LOWORD(pimi->hotKey) & MOD_CONTROL) != !(GetKeyState(VK_CONTROL) & 0x8000)) continue;
if (!(LOWORD(pimi->hotKey) & MOD_SHIFT) != !(GetKeyState(VK_SHIFT) & 0x8000)) continue;
@@ -220,6 +216,8 @@ INT_PTR MO_ProcessHotKeys(HANDLE menuHandle, INT_PTR vKey)
return FALSE;
}
+/////////////////////////////////////////////////////////////////////////////////////////
+
MIR_APP_DLL(HGENMENU) Menu_GetProtocolRoot(const char *szProto)
{
if (szProto == NULL)
@@ -243,23 +241,23 @@ MIR_APP_DLL(HGENMENU) Menu_GetProtocolRoot(const char *szProto)
}
/////////////////////////////////////////////////////////////////////////////////////////
-// wparam = MenuItemHandle
-// lparam = PMO_MenuItem
-INT_PTR MO_GetMenuItem(WPARAM wParam, LPARAM lParam)
+
+MIR_APP_DLL(int) Menu_GetItemInfo(HGENMENU hMenuItem, TMO_MenuItem &pInfo)
{
- TMO_MenuItem *mi = (TMO_MenuItem*)lParam;
- if (!bIsGenMenuInited || mi == NULL)
+ if (!bIsGenMenuInited)
return -1;
- TMO_IntMenuItem *pimi = MO_GetIntMenuItem((HGENMENU)wParam);
+ TMO_IntMenuItem *pimi = MO_GetIntMenuItem(hMenuItem);
mir_cslock lck(csMenuHook);
if (pimi == NULL)
return -1;
- *mi = pimi->mi;
+ pInfo = pimi->mi;
return 0;
}
+/////////////////////////////////////////////////////////////////////////////////////////
+
static int FindDefaultItem(TMO_IntMenuItem *pimi, void*)
{
if (pimi->mi.flags & (CMIF_GRAYED | CMIF_HIDDEN))
@@ -268,19 +266,17 @@ static int FindDefaultItem(TMO_IntMenuItem *pimi, void*)
return (pimi->mi.flags & CMIF_DEFAULT) ? TRUE : FALSE;
}
-INT_PTR MO_GetDefaultMenuItem(WPARAM wParam, LPARAM)
+MIR_APP_DLL(HGENMENU) Menu_GetDefaultItem(HGENMENU hMenu)
{
if (!bIsGenMenuInited)
- return -1;
+ return NULL;
- TMO_IntMenuItem *pimi = MO_GetIntMenuItem((HGENMENU)wParam);
+ TMO_IntMenuItem *pimi = MO_GetIntMenuItem(hMenu);
mir_cslock lck(csMenuHook);
- return (pimi) ? (INT_PTR)MO_RecursiveWalkMenu(pimi, FindDefaultItem, NULL) : NULL;
+ return (pimi) ? MO_RecursiveWalkMenu(pimi, FindDefaultItem, NULL) : NULL;
}
/////////////////////////////////////////////////////////////////////////////////////////
-// wparam MenuItemHandle
-// lparam PMO_MenuItem
MIR_APP_DLL(int) Menu_ModifyItem(HGENMENU hMenuItem, const TCHAR *ptszName, HANDLE hIcon, int iFlags)
{
@@ -329,20 +325,19 @@ MIR_APP_DLL(int) Menu_ModifyItem(HGENMENU hMenuItem, const TCHAR *ptszName, HAND
}
/////////////////////////////////////////////////////////////////////////////////////////
-// wparam MenuItemHandle
-// return ownerdata useful to free ownerdata before delete menu item,
-// NULL on error.
-INT_PTR MO_MenuItemGetOwnerData(WPARAM wParam, LPARAM)
+MIR_APP_DLL(void*) Menu_GetItemData(HGENMENU hMenuItem)
{
if (!bIsGenMenuInited)
- return -1;
+ return NULL;
mir_cslock lck(csMenuHook);
- TMO_IntMenuItem *pimi = MO_GetIntMenuItem((HGENMENU)wParam);
- return (pimi) ? (INT_PTR)pimi->mi.ownerdata : -1;
+ TMO_IntMenuItem *pimi = MO_GetIntMenuItem(hMenuItem);
+ return (pimi) ? pimi->mi.ownerdata : NULL;
}
+/////////////////////////////////////////////////////////////////////////////////////////
+
TMO_IntMenuItem *MO_GetIntMenuItem(HGENMENU wParam)
{
TMO_IntMenuItem *result = (TMO_IntMenuItem*)wParam;
@@ -1105,7 +1100,7 @@ int TryProcessDoubleClick(MCONTACT hContact)
if (iMenuID != -1) {
NotifyEventHooks(hPreBuildContactMenuEvent, hContact, 0);
- TMO_IntMenuItem *pimi = (TMO_IntMenuItem*)MO_GetDefaultMenuItem((WPARAM)g_menus[iMenuID]->m_items.first, 0);
+ TMO_IntMenuItem *pimi = Menu_GetDefaultItem(g_menus[iMenuID]->m_items.first);
if (pimi != NULL) {
Menu_ProcessCommand(pimi, hContact);
return 0;
@@ -1128,20 +1123,14 @@ static VOID CALLBACK PostRegisterIcons(HWND, UINT, UINT_PTR, DWORD)
static int OnModulesLoaded(WPARAM, LPARAM)
{
- posttimerid = SetTimer((HWND)NULL, 0, 5, (TIMERPROC)PostRegisterIcons);
+ posttimerid = SetTimer(NULL, 0, 5, (TIMERPROC)PostRegisterIcons);
HookEvent(ME_SKIN2_ICONSCHANGED, OnIconLibChanges);
return 0;
}
int InitGenMenu()
{
- CreateServiceFunction(MO_MENUITEMGETOWNERDATA, MO_MenuItemGetOwnerData);
- CreateServiceFunction(MO_GETMENUITEM, MO_GetMenuItem);
- CreateServiceFunction(MO_GETDEFAULTMENUITEM, MO_GetDefaultMenuItem);
- CreateServiceFunction(MO_PROCESSHOTKEYS, (MIRANDASERVICE)MO_ProcessHotKeys);
-
bIconsDisabled = db_get_b(NULL, "CList", "DisableMenuIcons", 0) != 0;
-
bIsGenMenuInited = true;
HookEvent(ME_SYSTEM_MODULESLOADED, OnModulesLoaded);
diff --git a/src/mir_app/src/genmenu.h b/src/mir_app/src/genmenu.h
index 7ae31f8b25..17c6102763 100644
--- a/src/mir_app/src/genmenu.h
+++ b/src/mir_app/src/genmenu.h
@@ -110,7 +110,6 @@ TMO_IntMenuItem* MO_AddOldNewMenuItem(HANDLE menuobjecthandle, TMO_MenuItem *pmi
int MO_DrawMenuItem(LPDRAWITEMSTRUCT dis);
int MO_MeasureMenuItem(LPMEASUREITEMSTRUCT mis);
-INT_PTR MO_ProcessHotKeys(HANDLE menuHandle, INT_PTR vKey);
int MO_ProcessCommandBySubMenuIdent(int menuID, int command, LPARAM lParam);
@@ -137,6 +136,5 @@ int GetMenuItembyId(const int objpos, const int id);
int ProtocolOrderOptInit(WPARAM wParam, LPARAM);
-INT_PTR MO_GetMenuItem(WPARAM wParam, LPARAM lParam);
void FreeAndNil(void **p);
#endif
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def
index f54b171e6c..ee225cae3c 100644
--- a/src/mir_app/src/mir_app.def
+++ b/src/mir_app/src/mir_app.def
@@ -212,3 +212,9 @@ Menu_AddItem @209
Menu_RemoveItem @210
Menu_AddObject @211
Menu_RemoveObject @212
+Menu_GetItemData @213
+Menu_GetDefaultItem @214
+Menu_GetItemInfo @215
+Menu_ProcessHotKey @216
+Menu_DrawItem @217
+Menu_MeasureItem @218
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def
index c97bd514b1..e0a756b14f 100644
--- a/src/mir_app/src/mir_app64.def
+++ b/src/mir_app/src/mir_app64.def
@@ -212,3 +212,9 @@ Menu_AddItem @209
Menu_RemoveItem @210
Menu_AddObject @211
Menu_RemoveObject @212
+Menu_GetItemData @213
+Menu_GetDefaultItem @214
+Menu_GetItemInfo @215
+Menu_ProcessHotKey @216
+Menu_DrawItem @217
+Menu_MeasureItem @218
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 21:37:17 +0000