[0.4.14][DEVMGR] Fix wrong menu item hint (#4854) CORE-18608

Item hint for "Resources by connection" was incorrectly set to the hint for "Resources by type".

fix picked from 0.4.15-dev-5334-g 075ec50298
and also port back stripping of some EOL-whitespace
This commit is contained in:
Joachim Henze 2022-11-16 13:28:27 +01:00
parent 385763882b
commit a08cada31a

View file

@ -11,7 +11,6 @@
#include "devmgmt.h"
#include "MainWindow.h"
/* DATA *****************************************************/
#define BTN_PROPERTIES 0
@ -37,15 +36,15 @@ static const MENU_HINT MainMenuHintTable[] =
{ IDM_SCAN_HARDWARE, IDS_HINT_SCAN },
{ IDM_ENABLE_DRV, IDS_HINT_ENABLE },
{ IDM_DISABLE_DRV, IDS_HINT_DISABLE },
{ IDM_UPDATE_DRV, IDS_HINT_UPDATE },
{ IDM_UPDATE_DRV, IDS_HINT_UPDATE },
{ IDM_UNINSTALL_DRV, IDS_HINT_UNINSTALL },
{ IDM_ADD_HARDWARE, IDS_HINT_ADD },
// View Menu
{ IDM_DEVBYTYPE, IDS_HINT_DEV_BY_TYPE},
{ IDM_DEVBYCONN, IDS_HINT_DEV_BY_CONN},
{ IDM_RESBYTYPE, IDS_HINT_RES_BY_TYPE},
{ IDM_RESBYCONN, IDS_HINT_RES_BY_TYPE},
{ IDM_DEVBYTYPE, IDS_HINT_DEV_BY_TYPE },
{ IDM_DEVBYCONN, IDS_HINT_DEV_BY_CONN },
{ IDM_RESBYTYPE, IDS_HINT_RES_BY_TYPE },
{ IDM_RESBYCONN, IDS_HINT_RES_BY_CONN },
{ IDM_SHOWHIDDEN, IDS_HINT_SHOW_HIDDEN },
{ IDM_ABOUT, IDS_HINT_ABOUT }
@ -176,14 +175,14 @@ CDeviceManager::Initialize(_In_z_ LPCTSTR lpCaption,
this);
}
// Return creation result
// Return creation result
return !!(m_hMainWnd);
}
void
CDeviceManager::Uninitialize(void)
{
// Unregister the window class
// Unregister the window class
UnregisterClassW(m_szMainWndClass, g_hThisInstance);
}
@ -192,7 +191,7 @@ CDeviceManager::Run(void)
{
MSG Msg;
// Pump the message queue
// Pump the message queue
while (GetMessageW(&Msg, NULL, 0, 0 ) != 0)
{
TranslateMessage(&Msg);