BUG: SF#9: notepad.runMenuCommand ignores menu name

bruderstein · bruderstein · commit d39e14b4e23c · 2014-02-23T13:50:57.000+01:00
diff --git a/PythonScript/src/MenuManager.cpp b/PythonScript/src/MenuManager.cpp
@@ -846,7 +846,7 @@ idx_t MenuManager::findPluginCommand(const TCHAR *pluginName, const TCHAR *menuO
 			tstring thisMenuName = formatMenuName(strBuffer);
 			if (NULL != mii.hSubMenu && 0 == _tcsicmp(pluginName, thisMenuName.c_str()))
 			{
-				retVal = findMenuCommand(mii.hSubMenu, NULL, menuOption);
+				retVal = findMenuCommand(mii.hSubMenu, pluginName, NULL, menuOption);
 				break;
 			}
 		
@@ -908,7 +908,7 @@ idx_t MenuManager::findMenuCommand(const TCHAR *menuName, const TCHAR *menuOptio
 	}
 	
 	HMENU hMenuBar = ::GetMenu(m_hNotepad);
-	idx_t retVal = findMenuCommand(hMenuBar, menuName, menuOption);
+	idx_t retVal = findMenuCommand(hMenuBar, _T(""), menuName, menuOption);
 	
 	if (retVal != 0)
 	{
@@ -929,7 +929,7 @@ tstring MenuManager::formatMenuName(const TCHAR *name)
 	return nameStr;
 }
 
-idx_t MenuManager::findMenuCommand(HMENU hParentMenu, const TCHAR *menuName, const TCHAR *menuOption)
+idx_t MenuManager::findMenuCommand(HMENU hParentMenu, const TCHAR *parentMenuName, const TCHAR *menuName, const TCHAR *menuOption)
 {
 	size_t iMenuItems = (size_t)GetMenuItemCount(hParentMenu);
 	idx_t retVal = 0;
@@ -969,7 +969,7 @@ idx_t MenuManager::findMenuCommand(HMENU hParentMenu, const TCHAR *menuName, con
 				}
 			}
 		}
-		else
+		else if(0 == _tcsicmp(parentMenuName, menuName))
 		{
 			TCHAR *context = NULL;
 			TCHAR *name = _tcstok_s(strBuffer, _T("\t"), &context);
@@ -986,7 +986,7 @@ idx_t MenuManager::findMenuCommand(HMENU hParentMenu, const TCHAR *menuName, con
 		
 		if (NULL != mii.hSubMenu)
 		{
-			retVal = findMenuCommand(mii.hSubMenu, menuName, menuOption);
+			retVal = findMenuCommand(mii.hSubMenu, strBuffer, menuName, menuOption);
 			// If we've found it in the sub menu (or within the sub menu)
 			if (0 != retVal)
 				break;
diff --git a/PythonScript/src/MenuManager.h b/PythonScript/src/MenuManager.h
@@ -52,7 +52,7 @@ class MenuManager
 	idx_t findPluginCommand(const TCHAR *pluginName, const TCHAR *menuOption, bool refreshCache);
 	idx_t findMenuCommand(const TCHAR *menuName, const TCHAR *menuOption, bool refreshCache);
 
-	idx_t findMenuCommand(HMENU parentMenu, const TCHAR *menuName, const TCHAR *menuOption);
+	idx_t findMenuCommand(HMENU parentMenu, const TCHAR *parentMenuName, const TCHAR *menuName, const TCHAR *menuOption);
 
 	void updatePreviousScript(const char *filename);
 	void updateShortcut(UINT cmdID, ShortcutKey* key);

Original file line number	Diff line number	Diff line change
`@@ -846,7 +846,7 @@ idx_t MenuManager::findPluginCommand(const TCHAR pluginName, const TCHAR menuO`
`846`	`846`	`tstring thisMenuName = formatMenuName(strBuffer);`
`847`	`847`	`if (NULL != mii.hSubMenu && 0 == _tcsicmp(pluginName, thisMenuName.c_str()))`
`848`	`848`	`{`
`849`		`- retVal = findMenuCommand(mii.hSubMenu, NULL, menuOption);`
	`849`	`+ retVal = findMenuCommand(mii.hSubMenu, pluginName, NULL, menuOption);`
`850`	`850`	`break;`
`851`	`851`	`}`
`852`	`852`
`@@ -908,7 +908,7 @@ idx_t MenuManager::findMenuCommand(const TCHAR menuName, const TCHAR menuOptio`
`908`	`908`	`}`
`909`	`909`
`910`	`910`	`HMENU hMenuBar = ::GetMenu(m_hNotepad);`
`911`		`- idx_t retVal = findMenuCommand(hMenuBar, menuName, menuOption);`
	`911`	`+ idx_t retVal = findMenuCommand(hMenuBar, _T(""), menuName, menuOption);`
`912`	`912`
`913`	`913`	`if (retVal != 0)`
`914`	`914`	`{`
`@@ -929,7 +929,7 @@ tstring MenuManager::formatMenuName(const TCHAR *name)`
`929`	`929`	`return nameStr;`
`930`	`930`	`}`
`931`	`931`
`932`		`-idx_t MenuManager::findMenuCommand(HMENU hParentMenu, const TCHAR menuName, const TCHAR menuOption)`
	`932`	`+idx_t MenuManager::findMenuCommand(HMENU hParentMenu, const TCHAR parentMenuName, const TCHAR menuName, const TCHAR *menuOption)`
`933`	`933`	`{`
`934`	`934`	`size_t iMenuItems = (size_t)GetMenuItemCount(hParentMenu);`
`935`	`935`	`idx_t retVal = 0;`
`@@ -969,7 +969,7 @@ idx_t MenuManager::findMenuCommand(HMENU hParentMenu, const TCHAR *menuName, con`
`969`	`969`	`}`
`970`	`970`	`}`
`971`	`971`	`}`
`972`		`- else`
	`972`	`+ else if(0 == _tcsicmp(parentMenuName, menuName))`
`973`	`973`	`{`
`974`	`974`	`TCHAR *context = NULL;`
`975`	`975`	`TCHAR *name = _tcstok_s(strBuffer, _T("\t"), &context);`
`@@ -986,7 +986,7 @@ idx_t MenuManager::findMenuCommand(HMENU hParentMenu, const TCHAR *menuName, con`
`986`	`986`
`987`	`987`	`if (NULL != mii.hSubMenu)`
`988`	`988`	`{`
`989`		`- retVal = findMenuCommand(mii.hSubMenu, menuName, menuOption);`
	`989`	`+ retVal = findMenuCommand(mii.hSubMenu, strBuffer, menuName, menuOption);`
`990`	`990`	`// If we've found it in the sub menu (or within the sub menu)`
`991`	`991`	`if (0 != retVal)`
`992`	`992`	`break;`