From a08cada31ac15d43acd83eb4143789236ff7e55d Mon Sep 17 00:00:00 2001
From: Joachim Henze <Joachim.Henze@reactos.org>
Date: Wed, 16 Nov 2022 13:28:27 +0100
Subject: [PATCH] [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 075ec50298e80df79ff654a08ee7ae0f4e055084
and also port back stripping of some EOL-whitespace
---
 dll/win32/devmgr/devmgmt/MainWindow.cpp | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/dll/win32/devmgr/devmgmt/MainWindow.cpp b/dll/win32/devmgr/devmgmt/MainWindow.cpp
index 3273aad5bbb..825b1c1949c 100644
--- a/dll/win32/devmgr/devmgmt/MainWindow.cpp
+++ b/dll/win32/devmgr/devmgmt/MainWindow.cpp
@@ -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);