From 18ee7073d76f02c5c78182c3aeee7427b469bd01 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 5 Sep 2016 11:04:46 +0000 Subject: Menu_DrawItem & Menu_MeasureItem now simply receive LPARAM git-svn-id: http://svn.miranda-ng.org/main/trunk@17255 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- include/m_genmenu.h | 4 ++-- plugins/ClientChangeNotify/src/ClientChangeNotify.cpp | 4 ++-- plugins/Clist_modern/src/cluiframes.cpp | 4 ++-- plugins/Clist_modern/src/modern_clui.cpp | 4 ++-- plugins/Clist_nicer/src/clui.cpp | 4 ++-- plugins/Clist_nicer/src/cluiframes.cpp | 4 ++-- plugins/ContactsPlus/src/receive.cpp | 4 ++-- plugins/ContactsPlus/src/send.cpp | 4 ++-- plugins/FTPFileYM/src/dialog.cpp | 4 ++-- plugins/FavContacts/src/menu.cpp | 4 ++-- plugins/FloatingContacts/src/main.cpp | 4 ++-- plugins/MirOTR/src/mirotrmenu.cpp | 4 ++-- plugins/MyDetails/src/frame.cpp | 4 ++-- plugins/NewAwaySysMod/src/ContactList.cpp | 4 ++-- plugins/NewAwaySysMod/src/Notification.cpp | 4 ++-- plugins/NewXstatusNotify/src/popup.cpp | 4 ++-- plugins/Popup/src/popup_wnd2.cpp | 4 ++-- plugins/QuickContacts/src/quickcontacts.cpp | 4 ++-- plugins/RecentContacts/src/RecentContacts.cpp | 4 ++-- plugins/Scriver/src/chat/window.cpp | 8 ++++---- plugins/Scriver/src/infobar.cpp | 2 +- plugins/Scriver/src/msgdialog.cpp | 4 ++-- plugins/Scriver/src/msgwindow.cpp | 4 ++-- plugins/SeenPlugin/src/history.cpp | 4 ++-- plugins/TabSRMM/src/chat/window.cpp | 8 ++++---- plugins/TabSRMM/src/container.cpp | 4 ++-- plugins/TabSRMM/src/msgdialog.cpp | 2 +- plugins/TabSRMM/src/msgdlgutils.cpp | 2 +- plugins/UserInfoEx/src/dlg_anniversarylist.cpp | 4 ++-- plugins/Weather/src/weather_mwin.cpp | 4 ++-- plugins/Weather/src/weather_popup.cpp | 4 ++-- protocols/JabberG/src/jabber_disco.cpp | 4 ++-- src/core/stdchat/src/window.cpp | 8 ++++---- src/core/stdfile/src/filerecvdlg.cpp | 4 ++-- src/core/stdfile/src/filesenddlg.cpp | 4 ++-- src/core/stdfile/src/filexferdlg.cpp | 4 ++-- src/core/stdmsg/src/msgdialog.cpp | 4 ++-- src/mir_app/src/clc.cpp | 4 ++-- src/mir_app/src/clui.cpp | 4 ++-- src/mir_app/src/menu_utils.cpp | 6 ++++-- 40 files changed, 85 insertions(+), 83 deletions(-) diff --git a/include/m_genmenu.h b/include/m_genmenu.h index e8174e822e..01e8c60da7 100644 --- a/include/m_genmenu.h +++ b/include/m_genmenu.h @@ -125,7 +125,7 @@ EXTERN_C MIR_APP_DLL(HGENMENU) Menu_CreateRoot(int hMenuObject, LPCWSTR ptszName // wParam, lParam, return value as for WM_MEASUREITEM // See comments for clist/menumeasureitem -EXTERN_C MIR_APP_DLL(BOOL) Menu_DrawItem(DRAWITEMSTRUCT *dis); +EXTERN_C MIR_APP_DLL(BOOL) Menu_DrawItem(LPARAM); ///////////////////////////////////////////////////////////////////////////////////////// // enables or disables a menu item @@ -158,7 +158,7 @@ EXTERN_C MIR_APP_DLL(int) Menu_GetItemInfo(HGENMENU hMenuItem, TMO_MenuItem &pIn // and clist/menudrawitem whne drawing a menu returned by one of the three menu // services below then it'll work but you won't get any icons -EXTERN_C MIR_APP_DLL(BOOL) Menu_MeasureItem(MEASUREITEMSTRUCT *mis); +EXTERN_C MIR_APP_DLL(BOOL) Menu_MeasureItem(LPARAM); ///////////////////////////////////////////////////////////////////////////////////////// // modify an existing menu item diff --git a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp index f7949bc5e6..55621267d2 100644 --- a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp +++ b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp @@ -57,10 +57,10 @@ static int CALLBACK MenuWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar { switch (uMsg) { case WM_MEASUREITEM: - return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + return Menu_MeasureItem(lParam); case WM_DRAWITEM: - return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + return Menu_DrawItem(lParam); } return DefWindowProc(hWnd, uMsg, wParam, lParam); } diff --git a/plugins/Clist_modern/src/cluiframes.cpp b/plugins/Clist_modern/src/cluiframes.cpp index 9f1287c328..72e9bcf338 100644 --- a/plugins/Clist_modern/src/cluiframes.cpp +++ b/plugins/Clist_modern/src/cluiframes.cpp @@ -2597,10 +2597,10 @@ static LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam return FALSE; case WM_MEASUREITEM: - return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + return Menu_MeasureItem(lParam); case WM_DRAWITEM: - return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + return Menu_DrawItem(lParam); case WM_USER + 100: return 1; diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp index 5a7d189c51..3f7887eee0 100644 --- a/plugins/Clist_modern/src/modern_clui.cpp +++ b/plugins/Clist_modern/src/modern_clui.cpp @@ -2421,7 +2421,7 @@ LRESULT CLUI::OnMeasureItem(UINT, WPARAM, LPARAM lParam) ReleaseDC(m_hWnd, hdc); return TRUE; } - return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + return Menu_MeasureItem(lParam); } LRESULT CLUI::OnDrawItem(UINT, WPARAM, LPARAM lParam) @@ -2499,7 +2499,7 @@ LRESULT CLUI::OnDrawItem(UINT, WPARAM, LPARAM lParam) nMirMenuState = dis->itemState; } - return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + return Menu_DrawItem(lParam); } LRESULT CLUI::OnDestroy(UINT, WPARAM, LPARAM) diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp index d35cb59db5..ca49c0c4a1 100644 --- a/plugins/Clist_nicer/src/clui.cpp +++ b/plugins/Clist_nicer/src/clui.cpp @@ -1621,7 +1621,7 @@ buttons_done: ((LPMEASUREITEMSTRUCT)lParam)->itemHeight = 0; return TRUE; } - return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + return Menu_MeasureItem(lParam); case WM_DRAWITEM: { @@ -1721,7 +1721,7 @@ buttons_done: else if (dis->CtlType == ODT_MENU) { if (dis->itemData == MENU_MIRANDAMENU) break; - return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + return Menu_DrawItem(lParam); } } return 0; diff --git a/plugins/Clist_nicer/src/cluiframes.cpp b/plugins/Clist_nicer/src/cluiframes.cpp index 91c347d1d0..4a2ba4f9c9 100644 --- a/plugins/Clist_nicer/src/cluiframes.cpp +++ b/plugins/Clist_nicer/src/cluiframes.cpp @@ -2266,10 +2266,10 @@ LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA return FALSE; case WM_MEASUREITEM: - return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + return Menu_MeasureItem(lParam); case WM_DRAWITEM: - return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + return Menu_DrawItem(lParam); case WM_ENABLE: if (hwnd != 0) InvalidateRect(hwnd, NULL, FALSE); diff --git a/plugins/ContactsPlus/src/receive.cpp b/plugins/ContactsPlus/src/receive.cpp index b85f23343e..34fa0291a9 100644 --- a/plugins/ContactsPlus/src/receive.cpp +++ b/plugins/ContactsPlus/src/receive.cpp @@ -462,11 +462,11 @@ INT_PTR CALLBACK RecvDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara break; case WM_MEASUREITEM: - return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + return Menu_MeasureItem(lParam); case WM_DRAWITEM: DrawProtocolIcon(hwndDlg, lParam, wndData->mhContact); - return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + return Menu_DrawItem(lParam); case WM_SIZE: if (!IsIconic(hwndDlg)) // make the dlg resizeable diff --git a/plugins/ContactsPlus/src/send.cpp b/plugins/ContactsPlus/src/send.cpp index a432d66e1f..6a9581e02d 100644 --- a/plugins/ContactsPlus/src/send.cpp +++ b/plugins/ContactsPlus/src/send.cpp @@ -443,11 +443,11 @@ INT_PTR CALLBACK SendDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara break; case WM_MEASUREITEM: - return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + return Menu_MeasureItem(lParam); case WM_DRAWITEM: DrawProtocolIcon(hwndDlg, lParam, wndData->hContact); - return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + return Menu_DrawItem(lParam); case DM_UPDATETITLE: UpdateDialogTitle(hwndDlg, wndData ? wndData->hContact : NULL, TranslateT("Send Contacts to")); diff --git a/plugins/FTPFileYM/src/dialog.cpp b/plugins/FTPFileYM/src/dialog.cpp index 7cc1bc5453..a9ebbd7d4d 100644 --- a/plugins/FTPFileYM/src/dialog.cpp +++ b/plugins/FTPFileYM/src/dialog.cpp @@ -220,10 +220,10 @@ INT_PTR CALLBACK UploadDialog::UploadDlgProc(HWND hwndDlg, UINT msg, WPARAM wPar break; case WM_MEASUREITEM: - return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + return Menu_MeasureItem(lParam); case WM_DRAWITEM: - return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + return Menu_DrawItem(lParam); case WM_COMMAND: { diff --git a/plugins/FavContacts/src/menu.cpp b/plugins/FavContacts/src/menu.cpp index 2daf8d0dd5..3504975539 100644 --- a/plugins/FavContacts/src/menu.cpp +++ b/plugins/FavContacts/src/menu.cpp @@ -368,7 +368,7 @@ static LRESULT CALLBACK MenuHostWndProc(HWND hwnd, UINT message, WPARAM wParam, return FALSE; if ((lpmis->itemID >= CLISTMENUIDMIN) && (lpmis->itemID <= CLISTMENUIDMAX)) - return Menu_MeasureItem(lpmis); + return Menu_MeasureItem(lParam); return MenuMeasureItem(lpmis); } @@ -380,7 +380,7 @@ static LRESULT CALLBACK MenuHostWndProc(HWND hwnd, UINT message, WPARAM wParam, return FALSE; if ((lpdis->itemID >= CLISTMENUIDMIN) && (lpdis->itemID <= CLISTMENUIDMAX)) - return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + return Menu_DrawItem(lParam); return MenuDrawItem(lpdis); } diff --git a/plugins/FloatingContacts/src/main.cpp b/plugins/FloatingContacts/src/main.cpp index 593d36793f..0988542780 100644 --- a/plugins/FloatingContacts/src/main.cpp +++ b/plugins/FloatingContacts/src/main.cpp @@ -381,11 +381,11 @@ static LRESULT __stdcall CommWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM } case WM_MEASUREITEM: - Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + Menu_MeasureItem(lParam); break; case WM_DRAWITEM: - Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + Menu_DrawItem(lParam); break; case WM_LBUTTONDOWN: diff --git a/plugins/MirOTR/src/mirotrmenu.cpp b/plugins/MirOTR/src/mirotrmenu.cpp index 60ee2d96aa..4babd970d7 100644 --- a/plugins/MirOTR/src/mirotrmenu.cpp +++ b/plugins/MirOTR/src/mirotrmenu.cpp @@ -121,10 +121,10 @@ LRESULT CALLBACK PopupMenuWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM { switch (message) { case WM_MEASUREITEM: - if (Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam)) return TRUE; + if (Menu_MeasureItem(lParam)) return TRUE; break; case WM_DRAWITEM: - if (Menu_DrawItem((LPDRAWITEMSTRUCT)lParam)) return TRUE; + if (Menu_DrawItem(lParam)) return TRUE; break; case WM_COMMAND: if (Menu_ProcessCommandById(wParam, GetWindowLongPtr(hwnd, GWLP_USERDATA))) diff --git a/plugins/MyDetails/src/frame.cpp b/plugins/MyDetails/src/frame.cpp index b1409d534f..2274d8f64f 100644 --- a/plugins/MyDetails/src/frame.cpp +++ b/plugins/MyDetails/src/frame.cpp @@ -1695,10 +1695,10 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar break; case WM_MEASUREITEM: - return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + return Menu_MeasureItem(lParam); case WM_DRAWITEM: - return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + return Menu_DrawItem(lParam); case WM_CONTEXTMENU: proto = protocols->Get(data->protocol_number); diff --git a/plugins/NewAwaySysMod/src/ContactList.cpp b/plugins/NewAwaySysMod/src/ContactList.cpp index 1381950154..a6718e8d2a 100644 --- a/plugins/NewAwaySysMod/src/ContactList.cpp +++ b/plugins/NewAwaySysMod/src/ContactList.cpp @@ -282,12 +282,12 @@ LRESULT CALLBACK ContactListSubclassProc(HWND hWnd, UINT Msg, WPARAM wParam, LPA case WM_MEASUREITEM: if (!wParam) // if the message was sent by a menu - return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + return Menu_MeasureItem(lParam); break; case WM_DRAWITEM: if (!wParam) // if the message was sent by a menu - return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + return Menu_DrawItem(lParam); break; case WM_CONTEXTMENU: diff --git a/plugins/NewAwaySysMod/src/Notification.cpp b/plugins/NewAwaySysMod/src/Notification.cpp index 2dac6af6ec..56ee9cf2cd 100644 --- a/plugins/NewAwaySysMod/src/Notification.cpp +++ b/plugins/NewAwaySysMod/src/Notification.cpp @@ -41,10 +41,10 @@ static int CALLBACK MenuWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar { switch (uMsg) { case WM_MEASUREITEM: - return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + return Menu_MeasureItem(lParam); case WM_DRAWITEM: - return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + return Menu_DrawItem(lParam); } return DefWindowProc(hWnd, uMsg, wParam, lParam); } diff --git a/plugins/NewXstatusNotify/src/popup.cpp b/plugins/NewXstatusNotify/src/popup.cpp index e68d017ddf..9dfc797344 100644 --- a/plugins/NewXstatusNotify/src/popup.cpp +++ b/plugins/NewXstatusNotify/src/popup.cpp @@ -155,10 +155,10 @@ LRESULT CALLBACK PopupDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa switch (message) { case WM_MEASUREITEM: //Needed by the contact's context menu - return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + return Menu_MeasureItem(lParam); case WM_DRAWITEM: //Needed by the contact's context menu - return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + return Menu_DrawItem(lParam); case WM_COMMAND: //This one returns TRUE if it processed the menu command, and FALSE if it did not process it. diff --git a/plugins/Popup/src/popup_wnd2.cpp b/plugins/Popup/src/popup_wnd2.cpp index a3334c6362..fb5b4ad19c 100644 --- a/plugins/Popup/src/popup_wnd2.cpp +++ b/plugins/Popup/src/popup_wnd2.cpp @@ -1302,10 +1302,10 @@ LRESULT CALLBACK MenuHostWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM break; case WM_MEASUREITEM: - return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + return Menu_MeasureItem(lParam); case WM_DRAWITEM: - return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + return Menu_DrawItem(lParam); } return DefWindowProc(hwnd, message, wParam, lParam); diff --git a/plugins/QuickContacts/src/quickcontacts.cpp b/plugins/QuickContacts/src/quickcontacts.cpp index 91a75a87c4..600ef7689e 100644 --- a/plugins/QuickContacts/src/quickcontacts.cpp +++ b/plugins/QuickContacts/src/quickcontacts.cpp @@ -1002,7 +1002,7 @@ static INT_PTR CALLBACK MainDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA if(lpdis->CtlID != IDC_USERNAME) { if (lpdis->CtlType == ODT_MENU) - return Menu_DrawItem(lpdis); + return Menu_DrawItem(lParam); break; } @@ -1097,7 +1097,7 @@ static INT_PTR CALLBACK MainDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA // Handle contact menu if(lpmis->CtlID != IDC_USERNAME) { if (lpmis->CtlType == ODT_MENU) - return Menu_MeasureItem(lpmis); + return Menu_MeasureItem(lParam); break; } diff --git a/plugins/RecentContacts/src/RecentContacts.cpp b/plugins/RecentContacts/src/RecentContacts.cpp index 67c2dc5129..d3568fc24b 100644 --- a/plugins/RecentContacts/src/RecentContacts.cpp +++ b/plugins/RecentContacts/src/RecentContacts.cpp @@ -342,10 +342,10 @@ INT_PTR CALLBACK ShowListMainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM } case WM_MEASUREITEM: - return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + return Menu_MeasureItem(lParam); case WM_DRAWITEM: - return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + return Menu_DrawItem(lParam); case WM_COMMAND: if (Clist_MenuProcessCommand(LOWORD(wParam), MPCF_CONTACTMENU, DlgDat->hContact)) diff --git a/plugins/Scriver/src/chat/window.cpp b/plugins/Scriver/src/chat/window.cpp index d42e5b5827..263d504ced 100644 --- a/plugins/Scriver/src/chat/window.cpp +++ b/plugins/Scriver/src/chat/window.cpp @@ -852,7 +852,7 @@ static LRESULT CALLBACK NicklistSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, { MEASUREITEMSTRUCT *mis = (MEASUREITEMSTRUCT *)lParam; if (mis->CtlType == ODT_MENU) - return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + return Menu_MeasureItem(lParam); } return FALSE; @@ -860,7 +860,7 @@ static LRESULT CALLBACK NicklistSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, { DRAWITEMSTRUCT *dis = (DRAWITEMSTRUCT *)lParam; if (dis->CtlType == ODT_MENU) - return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + return Menu_DrawItem(lParam); } return FALSE; @@ -1356,7 +1356,7 @@ static INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR if (!MeasureMenuItem(wParam, lParam)) { MEASUREITEMSTRUCT *mis = (MEASUREITEMSTRUCT *)lParam; if (mis->CtlType == ODT_MENU) - return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + return Menu_MeasureItem(lParam); int ih = GetTextPixelSize(L"AQGgl'", g_Settings.UserListFont, FALSE); int ih2 = GetTextPixelSize(L"AQGg'", g_Settings.UserListHeadingsFont, FALSE); @@ -1373,7 +1373,7 @@ static INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR if (!DrawMenuItem(wParam, lParam)) { DRAWITEMSTRUCT *dis = (DRAWITEMSTRUCT *)lParam; if (dis->CtlType == ODT_MENU) - return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + return Menu_DrawItem(lParam); if (dis->CtlID == IDC_CHAT_LIST) { int index = dis->itemID; diff --git a/plugins/Scriver/src/infobar.cpp b/plugins/Scriver/src/infobar.cpp index 764bbdd844..54a4669311 100644 --- a/plugins/Scriver/src/infobar.cpp +++ b/plugins/Scriver/src/infobar.cpp @@ -260,7 +260,7 @@ static INT_PTR CALLBACK InfobarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA return TRUE; } } - return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + return Menu_DrawItem(lParam); case WM_LBUTTONDOWN: SendMessage(idat->mwd->hwnd, WM_LBUTTONDOWN, wParam, lParam); diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp index 124ad7a339..c8649ee804 100644 --- a/plugins/Scriver/src/msgdialog.cpp +++ b/plugins/Scriver/src/msgdialog.cpp @@ -1497,7 +1497,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP case WM_MEASUREITEM: if (!MeasureMenuItem(wParam, lParam)) - return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + return Menu_MeasureItem(lParam); return TRUE; case WM_DRAWITEM: @@ -1545,7 +1545,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP return TRUE; } } - return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + return Menu_MeasureItem(lParam); case WM_COMMAND: if (!lParam && Clist_MenuProcessCommand(LOWORD(wParam), MPCF_CONTACTMENU, dat->hContact)) diff --git a/plugins/Scriver/src/msgwindow.cpp b/plugins/Scriver/src/msgwindow.cpp index ffa91c285f..4f5749f1f3 100644 --- a/plugins/Scriver/src/msgwindow.cpp +++ b/plugins/Scriver/src/msgwindow.cpp @@ -828,7 +828,7 @@ INT_PTR CALLBACK DlgProcParentWindow(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR return TRUE; case WM_MEASUREITEM: - return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + return Menu_MeasureItem(lParam); case WM_DRAWITEM: { @@ -844,7 +844,7 @@ INT_PTR CALLBACK DlgProcParentWindow(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR return TRUE; } } - return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + return Menu_DrawItem(lParam); case WM_COMMAND: if (Clist_MenuProcessCommand(LOWORD(wParam), MPCF_CONTACTMENU, dat->hContact)) diff --git a/plugins/SeenPlugin/src/history.cpp b/plugins/SeenPlugin/src/history.cpp index 34359ae81c..b409a71ccb 100644 --- a/plugins/SeenPlugin/src/history.cpp +++ b/plugins/SeenPlugin/src/history.cpp @@ -197,10 +197,10 @@ INT_PTR CALLBACK HistoryDlgProc(HWND hwndDlg, UINT Message, WPARAM wparam, LPARA return TRUE; case WM_MEASUREITEM: - return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lparam); + return Menu_MeasureItem(lparam); case WM_DRAWITEM: - return Menu_DrawItem((LPDRAWITEMSTRUCT)lparam); + return Menu_DrawItem(lparam); case WM_COMMAND: hContact = (MCONTACT)GetWindowLongPtr(hwndDlg, GWLP_USERDATA); diff --git a/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp index 5ed4d7f05c..289763089e 100644 --- a/plugins/TabSRMM/src/chat/window.cpp +++ b/plugins/TabSRMM/src/chat/window.cpp @@ -1507,7 +1507,7 @@ static LRESULT CALLBACK NicklistSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, { MEASUREITEMSTRUCT *mis = (MEASUREITEMSTRUCT *)lParam; if (mis->CtlType == ODT_MENU) - return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + return Menu_MeasureItem(lParam); } return FALSE; @@ -1515,7 +1515,7 @@ static LRESULT CALLBACK NicklistSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, { DRAWITEMSTRUCT *dis = (DRAWITEMSTRUCT *)lParam; if (dis->CtlType == ODT_MENU) - return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + return Menu_DrawItem(lParam); } return FALSE; @@ -2123,7 +2123,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar mis->itemWidth = 6; return TRUE; } - return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + return Menu_MeasureItem(lParam); } mis->itemHeight = g_Settings.iNickListFontHeight; } @@ -2137,7 +2137,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar DrawMenuItem(dis, (HICON)dis->itemData, 0); return TRUE; } - return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + return Menu_DrawItem(lParam); } if (dis->CtlID == IDC_LIST) { diff --git a/plugins/TabSRMM/src/container.cpp b/plugins/TabSRMM/src/container.cpp index d8e425b8f0..49b60e07c4 100644 --- a/plugins/TabSRMM/src/container.cpp +++ b/plugins/TabSRMM/src/container.cpp @@ -1573,10 +1573,10 @@ panel_found: return TRUE; } } - return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + return Menu_DrawItem(lParam); case WM_MEASUREITEM: - return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + return Menu_MeasureItem(lParam); case DM_QUERYCLIENTAREA: { diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp index b388c39c0a..87e0e8c979 100644 --- a/plugins/TabSRMM/src/msgdialog.cpp +++ b/plugins/TabSRMM/src/msgdialog.cpp @@ -2570,7 +2570,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l return TRUE; } } - return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + return Menu_MeasureItem(lParam); case WM_NCHITTEST: SendMessage(hwndContainer, WM_NCHITTEST, wParam, lParam); diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp index a097a5e086..23f6347ad9 100644 --- a/plugins/TabSRMM/src/msgdlgutils.cpp +++ b/plugins/TabSRMM/src/msgdlgutils.cpp @@ -1588,7 +1588,7 @@ int TSAPI MsgWindowDrawHandler(WPARAM, LPARAM lParam, TWindowData *dat) return TRUE; } - return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + return Menu_DrawItem(lParam); } void TSAPI LoadThemeDefaults(TContainerData *pContainer) diff --git a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp index 11c2b3e83b..c1e2392f04 100644 --- a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp +++ b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp @@ -497,10 +497,10 @@ class CAnnivList break; case WM_DRAWITEM: - return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + return Menu_DrawItem(lParam); case WM_MEASUREITEM: - return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + return Menu_MeasureItem(lParam); case WM_WINDOWPOSCHANGING: if (PtrIsValid(pDlg)) { diff --git a/plugins/Weather/src/weather_mwin.cpp b/plugins/Weather/src/weather_mwin.cpp index fae16001e1..d51d9e6606 100644 --- a/plugins/Weather/src/weather_mwin.cpp +++ b/plugins/Weather/src/weather_mwin.cpp @@ -109,10 +109,10 @@ static LRESULT CALLBACK wndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara return FALSE; case WM_MEASUREITEM: //Needed by the contact's context menu - return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + return Menu_MeasureItem(lParam); case WM_DRAWITEM: //Needed by the contact's context menu - return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + return Menu_DrawItem(lParam); case WM_NOTIFY: if (((LPNMHDR)lParam)->code == NM_AVATAR_CHANGED) { diff --git a/plugins/Weather/src/weather_popup.cpp b/plugins/Weather/src/weather_popup.cpp index 62beb8a588..765d71f830 100644 --- a/plugins/Weather/src/weather_popup.cpp +++ b/plugins/Weather/src/weather_popup.cpp @@ -189,10 +189,10 @@ LRESULT CALLBACK PopupWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam return FALSE; case WM_MEASUREITEM: //Needed by the contact's context menu - return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + return Menu_MeasureItem(lParam); case WM_DRAWITEM: //Needed by the contact's context menu - return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + return Menu_DrawItem(lParam); } return DefWindowProc(hWnd, uMsg, wParam, lParam);//FALSE; diff --git a/protocols/JabberG/src/jabber_disco.cpp b/protocols/JabberG/src/jabber_disco.cpp index f1f38a2791..2e717bfc47 100644 --- a/protocols/JabberG/src/jabber_disco.cpp +++ b/protocols/JabberG/src/jabber_disco.cpp @@ -1129,9 +1129,9 @@ INT_PTR CJabberDlgDiscovery::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) break; case WM_MEASUREITEM: - return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + return Menu_MeasureItem(lParam); case WM_DRAWITEM: - return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + return Menu_DrawItem(lParam); } diff --git a/src/core/stdchat/src/window.cpp b/src/core/stdchat/src/window.cpp index c9525b7723..642dd5b2ea 100644 --- a/src/core/stdchat/src/window.cpp +++ b/src/core/stdchat/src/window.cpp @@ -1058,7 +1058,7 @@ static LRESULT CALLBACK NicklistSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, { MEASUREITEMSTRUCT *mis = (MEASUREITEMSTRUCT *)lParam; if (mis->CtlType == ODT_MENU) - return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + return Menu_MeasureItem(lParam); } return FALSE; @@ -1066,7 +1066,7 @@ static LRESULT CALLBACK NicklistSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, { DRAWITEMSTRUCT *dis = (DRAWITEMSTRUCT *)lParam; if (dis->CtlType == ODT_MENU) - return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + return Menu_DrawItem(lParam); } return FALSE; @@ -1808,7 +1808,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar { MEASUREITEMSTRUCT *mis = (MEASUREITEMSTRUCT *)lParam; if (mis->CtlType == ODT_MENU) - return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + return Menu_MeasureItem(lParam); int ih = GetTextPixelSize(L"AQGgl'", g_Settings.UserListFont, FALSE); int ih2 = GetTextPixelSize(L"AQGg'", g_Settings.UserListHeadingsFont, FALSE); @@ -1827,7 +1827,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar { DRAWITEMSTRUCT *dis = (DRAWITEMSTRUCT *)lParam; if (dis->CtlType == ODT_MENU) - return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + return Menu_DrawItem(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 1d155b1544..2d38df4c64 100644 --- a/src/core/stdfile/src/filerecvdlg.cpp +++ b/src/core/stdfile/src/filerecvdlg.cpp @@ -267,7 +267,7 @@ INT_PTR CALLBACK DlgProcRecvFile(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l return TRUE; case WM_MEASUREITEM: - return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + return Menu_MeasureItem(lParam); case WM_DRAWITEM: { @@ -283,7 +283,7 @@ INT_PTR CALLBACK DlgProcRecvFile(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l } } } - return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + return Menu_DrawItem(lParam); case WM_COMMAND: if (Clist_MenuProcessCommand(LOWORD(wParam), MPCF_CONTACTMENU, dat->hContact)) diff --git a/src/core/stdfile/src/filesenddlg.cpp b/src/core/stdfile/src/filesenddlg.cpp index ccfc68af3f..c2551426a4 100644 --- a/src/core/stdfile/src/filesenddlg.cpp +++ b/src/core/stdfile/src/filesenddlg.cpp @@ -250,7 +250,7 @@ INT_PTR CALLBACK DlgProcSendFile(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l return TRUE; case WM_MEASUREITEM: - return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + return Menu_MeasureItem(lParam); case WM_DRAWITEM: { @@ -266,7 +266,7 @@ INT_PTR CALLBACK DlgProcSendFile(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l } } } - return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + return Menu_DrawItem(lParam); case M_FILECHOOSEDONE: if (lParam != 0) { diff --git a/src/core/stdfile/src/filexferdlg.cpp b/src/core/stdfile/src/filexferdlg.cpp index cfb958c689..603a0c5cd8 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 Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + return Menu_MeasureItem(lParam); case WM_DRAWITEM: - return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + return Menu_DrawItem(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 2286d0c5a1..e5309b928b 100644 --- a/src/core/stdmsg/src/msgdialog.cpp +++ b/src/core/stdmsg/src/msgdialog.cpp @@ -1278,7 +1278,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l { LPMEASUREITEMSTRUCT mis = (LPMEASUREITEMSTRUCT)lParam; if (mis->CtlType == ODT_MENU) - return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + return Menu_MeasureItem(lParam); } break; @@ -1286,7 +1286,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l { LPDRAWITEMSTRUCT dis = (LPDRAWITEMSTRUCT)lParam; if (dis->CtlType == ODT_MENU) - return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + return Menu_DrawItem(lParam); if (dis->hwndItem == dat->hwndStatus) { DrawStatusIcons(dat->hContact, dis->hDC, dis->rcItem, 2); return TRUE; diff --git a/src/mir_app/src/clc.cpp b/src/mir_app/src/clc.cpp index 872a099390..aa01ae56bb 100644 --- a/src/mir_app/src/clc.cpp +++ b/src/mir_app/src/clc.cpp @@ -1225,10 +1225,10 @@ LRESULT CALLBACK fnContactListControlWndProc(HWND hwnd, UINT uMsg, WPARAM wParam return 0; case WM_MEASUREITEM: - return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + return Menu_MeasureItem(lParam); case WM_DRAWITEM: - return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + return Menu_DrawItem(lParam); case WM_COMMAND: hit = cli.pfnGetRowByIndex(dat, dat->selection, &contact, NULL); diff --git a/src/mir_app/src/clui.cpp b/src/mir_app/src/clui.cpp index 6c474e04cd..a182ab0f66 100644 --- a/src/mir_app/src/clui.cpp +++ b/src/mir_app/src/clui.cpp @@ -947,7 +947,7 @@ LRESULT CALLBACK fnContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM ((LPMEASUREITEMSTRUCT)lParam)->itemHeight = 0; return TRUE; } - return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam); + return Menu_MeasureItem(lParam); case WM_DRAWITEM: { @@ -1006,7 +1006,7 @@ LRESULT CALLBACK fnContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM IcoLib_ReleaseIcon(hIcon); return TRUE; } - return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam); + return Menu_DrawItem(lParam); } } return 0; diff --git a/src/mir_app/src/menu_utils.cpp b/src/mir_app/src/menu_utils.cpp index b301b8cac0..30a2a02eec 100644 --- a/src/mir_app/src/menu_utils.cpp +++ b/src/mir_app/src/menu_utils.cpp @@ -107,11 +107,12 @@ TMO_IntMenuItem* MO_RecursiveWalkMenu(TMO_IntMenuItem *parent, pfnWalkFunc func, /////////////////////////////////////////////////////////////////////////////// -MIR_APP_DLL(BOOL) Menu_MeasureItem(MEASUREITEMSTRUCT *mis) +MIR_APP_DLL(BOOL) Menu_MeasureItem(LPARAM lParam) { if (!bIsGenMenuInited) return FALSE; + MEASUREITEMSTRUCT *mis = (MEASUREITEMSTRUCT*)lParam; if (mis == NULL) return FALSE; @@ -133,11 +134,12 @@ MIR_APP_DLL(BOOL) Menu_MeasureItem(MEASUREITEMSTRUCT *mis) /////////////////////////////////////////////////////////////////////////////// -MIR_APP_DLL(BOOL) Menu_DrawItem(DRAWITEMSTRUCT *dis) +MIR_APP_DLL(BOOL) Menu_DrawItem(LPARAM lParam) { if (!bIsGenMenuInited) return FALSE; + DRAWITEMSTRUCT *dis = (DRAWITEMSTRUCT*)lParam; if (dis == NULL) return FALSE; -- cgit v1.2.3