Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check if GetMenu returns a valid handle and change return type to int for GetMenuItemCount #306

Merged
merged 3 commits into from
Aug 23, 2023
Merged

Check if GetMenu returns a valid handle and change return type to int for GetMenuItemCount #306

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b9d52a2
Check it GetMenu returns a valid handle and change return type to int…
Ekopalypse Aug 21, 2023
1d5ccc5
Merge branch 'bruderstein:master' into master
Ekopalypse Aug 21, 2023
f113b91
Refactor loop variable type from idx_t to int in MenuManager.cpp
Ekopalypse Aug 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions PythonScript/src/MenuManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -837,9 +837,9 @@ idx_t MenuManager::findPluginCommand(const TCHAR *pluginName, const TCHAR *menuO
{
HMENU hPluginMenu = (HMENU)::SendMessage(m_hNotepad, NPPM_GETMENUHANDLE, 0, 0);

size_t iMenuItems = (size_t)GetMenuItemCount(hPluginMenu);
int iMenuItems = GetMenuItemCount(hPluginMenu);
TCHAR strBuffer[500]{};
for ( idx_t i = 0; i < iMenuItems; ++i )
for ( int i = 0; i < iMenuItems; ++i )
{
MENUITEMINFO mii{};
mii.cbSize = sizeof(MENUITEMINFO);
Expand Down Expand Up @@ -913,6 +913,9 @@ idx_t MenuManager::findMenuCommand(const TCHAR *menuName, const TCHAR *menuOptio
}

HMENU hMenuBar = ::GetMenu(m_hNotepad);
if (hMenuBar == NULL) {
return 0;
}
idx_t retVal = findMenuCommand(hMenuBar, _T(""), menuName, menuOption);

if (retVal != 0)
Expand All @@ -936,12 +939,12 @@ tstring MenuManager::formatMenuName(const TCHAR *name)

idx_t MenuManager::findMenuCommand(HMENU hParentMenu, const TCHAR *parentMenuName, const TCHAR *menuName, const TCHAR *menuOption)
{
size_t iMenuItems = (size_t)GetMenuItemCount(hParentMenu);
int iMenuItems = GetMenuItemCount(hParentMenu);
Ekopalypse marked this conversation as resolved.
Show resolved Hide resolved
idx_t retVal = 0;

TCHAR strBuffer[500]{};

for ( idx_t i = 0; i < iMenuItems; ++i )
for ( int i = 0; i < iMenuItems; ++i )
{
MENUITEMINFO mii{};
mii.cbSize = sizeof(MENUITEMINFO);
Expand All @@ -956,8 +959,8 @@ idx_t MenuManager::findMenuCommand(HMENU hParentMenu, const TCHAR *parentMenuNam
tstring thisMenuName = formatMenuName(strBuffer);
if (NULL == menuName || 0 == _tcsicmp(menuName, thisMenuName.c_str()))
{
size_t subMenuItems = (size_t)GetMenuItemCount(mii.hSubMenu);
for (idx_t subMenuPos = 0; subMenuPos < subMenuItems; ++subMenuPos)
int subMenuItems = GetMenuItemCount(mii.hSubMenu);
for (int subMenuPos = 0; subMenuPos < subMenuItems; ++subMenuPos)
{
TCHAR *context = NULL;
::GetMenuString(mii.hSubMenu, static_cast<UINT>(subMenuPos), strBuffer, 500, MF_BYPOSITION);
Expand All @@ -968,7 +971,7 @@ idx_t MenuManager::findMenuCommand(HMENU hParentMenu, const TCHAR *parentMenuNam

if (0 == _tcsicmp(menuOption, nameStr.c_str()))
{
return ::GetMenuItemID(mii.hSubMenu, (int)subMenuPos);
return ::GetMenuItemID(mii.hSubMenu, subMenuPos);
}
}
}
Expand Down Expand Up @@ -1142,4 +1145,4 @@ void MenuManager::checkShowConsole(bool checked)
{
::SendMessage(m_hNotepad, NPPM_SETMENUITEMCHECK, (WPARAM)m_funcItems[1]._cmdID, (LPARAM)checked);
s_menuItemConsoleChecked = checked;
}
}