4 Jul
2015
4 Jul
'15
9:12 p.m.
Author: gedmurphy
Date: Sat Jul 4 21:12:06 2015
New Revision: 68342
URL: http://svn.reactos.org/svn/reactos?rev=68342&view=rev
Log:
[DEVMGR]
- Add a separate class for the root node
- Move creating the action menu items to a generic function so we can use it for both the
context menu and the main menu
- Create the main action menu as a dynamic popup menu. It doesn't work quite the same
as the menus via the resources, so if any menu expects know how to fix this, be my guest
Added:
trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.cpp (with props)
trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.h (with props)
Modified:
trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp
trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h
trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp
trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h
trunk/reactos/dll/win32/devmgr/devmgmt/Node.cpp
trunk/reactos/dll/win32/devmgr/devmgmt/Resource.h
trunk/reactos/dll/win32/devmgr/devmgmt/lang/en-US.rc
Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D…
==============================================================================
--- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.cpp [iso-8859-1] Sat Jul 4 21:12:06
2015
@@ -51,8 +51,7 @@
m_hMenu(NULL),
m_ViewType(DevicesByType),
m_ShowHidden(FALSE),
- m_RootClassImage(-1),
- m_RootDevInst(0)
+ m_RootNode(NULL)
{
ZeroMemory(&m_ImageListData, sizeof(SP_CLASSIMAGELIST_DATA));
}
@@ -162,14 +161,27 @@
ScreenToClient(m_hTreeView, &pt) &&
PtInRect(&rc, pt))
{
-
- INT xPos = GET_X_LPARAM(lParam);
- INT yPos = GET_Y_LPARAM(lParam);
-
CNode *Node = GetSelectedNode();
if (Node)
{
- BuildContextMenuForNode(Node, xPos, yPos);
+ // Create the context menu
+ HMENU hContextMenu = CreatePopupMenu();
+
+ // Add the actions for this node
+ BuildActionMenuForNode(hContextMenu, Node);
+
+ INT xPos = GET_X_LPARAM(lParam);
+ INT yPos = GET_Y_LPARAM(lParam);
+
+ // Display the menu
+ TrackPopupMenuEx(hContextMenu,
+ TPM_RIGHTBUTTON,
+ xPos,
+ yPos,
+ m_hMainWnd,
+ NULL);
+
+ DestroyMenu(hContextMenu);
}
}
}
@@ -259,6 +271,22 @@
}
bool
+CDeviceView::CreateActionMenu(
+ _In_ HMENU OwnerMenu,
+ _In_ bool MainMenu
+ )
+{
+ CNode *Node = GetSelectedNode();
+ if (Node)
+ {
+ BuildActionMenuForNode(OwnerMenu, Node);
+ return true;
+ }
+
+ return false;
+}
+
+bool
CDeviceView::HasProperties(
_In_ LPTV_ITEMW TvItem
)
@@ -336,54 +364,8 @@
bool
CDeviceView::AddRootDevice()
{
- // Check whether we've loaded the root bitmap into the imagelist (done on first
run)
- if (m_RootClassImage == -1)
- {
- // Load the bitmap we'll be using as the root image
- HBITMAP hRootImage;
- hRootImage = LoadBitmapW(g_hInstance,
- MAKEINTRESOURCEW(IDB_ROOT_IMAGE));
- if (hRootImage == NULL) return FALSE;
-
- // Add this bitmap to the device image list. This is a bit hacky, but it's
safe
- m_RootClassImage = ImageList_Add(m_ImageListData.ImageList,
- hRootImage,
- NULL);
- DeleteObject(hRootImage);
- }
-
- // Get the root instance
- CONFIGRET cr;
- cr = CM_Locate_DevNodeW(&m_RootDevInst,
- NULL,
- CM_LOCATE_DEVNODE_NORMAL);
- if (cr != CR_SUCCESS)
- {
- return false;
- }
-
- // The root name is the computer name
- WCHAR RootDeviceName[ROOT_NAME_SIZE];
- DWORD Size = ROOT_NAME_SIZE;
- if (GetComputerNameW(RootDeviceName, &Size))
- _wcslwr_s(RootDeviceName);
-
- TV_ITEMW tvi;
- TV_INSERTSTRUCT tvins;
- ZeroMemory(&tvi, sizeof(tvi));
- ZeroMemory(&tvins, sizeof(tvins));
-
- // Insert the root / parent item into our treeview
- tvi.mask = TVIF_TEXT | TVIF_IMAGE | TVIF_SELECTEDIMAGE;
- tvi.pszText = RootDeviceName;
- tvi.cchTextMax = wcslen(RootDeviceName);
- tvi.iImage = m_RootClassImage;
- tvi.iSelectedImage = m_RootClassImage;
- tvins.item = tvi;
- m_hTreeRoot = TreeView_InsertItem(m_hTreeView, &tvins);
-
+ m_hTreeRoot = InsertIntoTreeView(NULL, m_RootNode);
return (m_hTreeRoot != NULL);
-
}
bool
@@ -622,7 +604,7 @@
if (bSuccess == false) return false;
// Walk the device tree and add all the devices
- (void)RecurseChildDevices(m_RootDevInst, m_hTreeRoot);
+ (void)RecurseChildDevices(m_RootNode->GetDeviceInst(), m_hTreeRoot);
// Expand the root item
(void)TreeView_Expand(m_hTreeView,
@@ -755,11 +737,10 @@
HTREEITEM
CDeviceView::InsertIntoTreeView(
- _In_ HTREEITEM hParent,
+ _In_opt_ HTREEITEM hParent,
_In_ CNode *Node
)
{
-
LPWSTR lpLabel;
lpLabel = Node->GetDisplayName();
@@ -791,15 +772,11 @@
}
void
-CDeviceView::BuildContextMenuForNode(
- _In_ CNode *Node,
- _In_ INT xPos,
- _In_ INT yPos
- )
-{
- // Create the context menu
- HMENU hContextMenu = CreatePopupMenu();
-
+CDeviceView::BuildActionMenuForNode(
+ _In_ HMENU OwnerMenu,
+ _In_ CNode *Node
+ )
+{
// Create a seperator structure
MENUITEMINFOW MenuSeperator = { 0 };
MenuSeperator.cbSize = sizeof(MENUITEMINFOW);
@@ -824,7 +801,7 @@
String.LoadStringW(g_hInstance, IDS_MENU_UPDATE);
MenuItemInfo.wID = IDC_UPDATE_DRV;
MenuItemInfo.dwTypeData = String.GetBuffer();
- InsertMenuItemW(hContextMenu, i, TRUE, &MenuItemInfo);
+ InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo);
i++;
}
@@ -833,7 +810,7 @@
String.LoadStringW(g_hInstance, IDS_MENU_ENABLE);
MenuItemInfo.wID = IDC_ENABLE_DRV;
MenuItemInfo.dwTypeData = String.GetBuffer();
- InsertMenuItemW(hContextMenu, i, TRUE, &MenuItemInfo);
+ InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo);
i++;
}
@@ -842,7 +819,7 @@
String.LoadStringW(g_hInstance, IDS_MENU_DISABLE);
MenuItemInfo.wID = IDC_DISABLE_DRV;
MenuItemInfo.dwTypeData = String.GetBuffer();
- InsertMenuItemW(hContextMenu, i, TRUE, &MenuItemInfo);
+ InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo);
i++;
}
@@ -851,11 +828,11 @@
String.LoadStringW(g_hInstance, IDS_MENU_UNINSTALL);
MenuItemInfo.wID = IDC_UNINSTALL_DRV;
MenuItemInfo.dwTypeData = String.GetBuffer();
- InsertMenuItemW(hContextMenu, i, TRUE, &MenuItemInfo);
+ InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo);
i++;
}
- InsertMenuItemW(hContextMenu, i, TRUE, &MenuSeperator);
+ InsertMenuItemW(OwnerMenu, i, TRUE, &MenuSeperator);
i++;
}
@@ -863,32 +840,22 @@
String.LoadStringW(g_hInstance, IDS_MENU_SCAN);
MenuItemInfo.wID = IDC_SCAN_HARDWARE;
MenuItemInfo.dwTypeData = String.GetBuffer();
- InsertMenuItemW(hContextMenu, i, TRUE, &MenuItemInfo);
+ InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo);
i++;
if (Node->HasProperties())
{
- InsertMenuItemW(hContextMenu, i, TRUE, &MenuSeperator);
+ InsertMenuItemW(OwnerMenu, i, TRUE, &MenuSeperator);
i++;
String.LoadStringW(g_hInstance, IDS_MENU_PROPERTIES);
MenuItemInfo.wID = IDC_PROPERTIES;
MenuItemInfo.dwTypeData = String.GetBuffer();
- InsertMenuItemW(hContextMenu, i, TRUE, &MenuItemInfo);
+ InsertMenuItemW(OwnerMenu, i, TRUE, &MenuItemInfo);
i++;
- SetMenuDefaultItem(hContextMenu, IDC_PROPERTIES, FALSE);
- }
-
- // Display the menu
- TrackPopupMenuEx(hContextMenu,
- TPM_RIGHTBUTTON,
- xPos,
- yPos,
- m_hMainWnd,
- NULL);
-
- DestroyMenu(hContextMenu);
+ SetMenuDefaultItem(OwnerMenu, IDC_PROPERTIES, FALSE);
+ }
}
HTREEITEM
@@ -1097,6 +1064,9 @@
EmptyLists();
+ if (m_RootNode) delete m_RootNode;
+ m_RootNode = new CRootNode(&m_ImageListData);
+ m_RootNode->SetupNode();
// Loop through all the classes
do
{
Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D…
==============================================================================
--- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceView.h [iso-8859-1] Sat Jul 4 21:12:06
2015
@@ -1,6 +1,7 @@
#pragma once
#include "DeviceNode.h"
#include "ClassNode.h"
+#include "RootNode.h"
enum ViewType
{
@@ -13,6 +14,7 @@
class CDeviceView
{
+ CRootNode *m_RootNode;
CAtlList<CClassNode *> m_ClassNodeList;
CAtlList<CDeviceNode *> m_DeviceNodeList;
SP_CLASSIMAGELIST_DATA m_ImageListData;
@@ -22,9 +24,7 @@
HMENU m_hMenu;
ViewType m_ViewType;
HTREEITEM m_hTreeRoot;
- DEVINST m_RootDevInst;
bool m_ShowHidden;
- int m_RootClassImage;
public:
CDeviceView(
@@ -67,6 +67,11 @@
}
ViewType GetCurrentView() { return m_ViewType; }
+
+ bool CreateActionMenu(
+ _In_ HMENU OwnerMenu,
+ _In_ bool MainMenu
+ );
bool HasProperties(
_In_ LPTV_ITEMW TvItem
@@ -123,14 +128,13 @@
);
HTREEITEM InsertIntoTreeView(
- _In_ HTREEITEM hParent,
+ _In_opt_ HTREEITEM hParent,
_In_ CNode *Node
);
- void BuildContextMenuForNode(
- _In_ CNode *Node,
- _In_ INT xPos,
- _In_ INT yPos
+ void BuildActionMenuForNode(
+ _In_ HMENU OwnerMenu,
+ _In_ CNode *Node
);
HTREEITEM RecurseFindDevice(
Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/M…
==============================================================================
--- trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.cpp [iso-8859-1] Sat Jul 4 21:12:06
2015
@@ -590,6 +590,29 @@
break;
}
+ case IDC_ACTIONMENU:
+ {
+ // Create a popup menu with all the actions for the selected node
+ HMENU hMenu = CreatePopupMenu();
+ m_DeviceView->CreateActionMenu(hMenu, true);
+
+ RECT rc;
+ GetMenuItemRect(m_hMainWnd, m_hMenu, 1, &rc);
+
+ LONG Height = rc.bottom - rc.top;
+
+ // Display the menu
+ TrackPopupMenuEx(hMenu,
+ TPM_RIGHTBUTTON,
+ rc.left,
+ rc.top + Height,
+ m_hMainWnd,
+ NULL);
+
+ DestroyMenu(hMenu);
+ break;
+ }
+
case IDC_DEVBYTYPE:
{
RefreshView(DevicesByType);
Modified: trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/M…
==============================================================================
--- trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr/devmgmt/MainWindow.h [iso-8859-1] Sat Jul 4 21:12:06
2015
@@ -16,6 +16,7 @@
HWND m_hToolBar;
HIMAGELIST m_ToolbarhImageList;
HMENU m_hMenu;
+ HMENU m_hActionMenu;
int m_CmdShow;
public:
Modified: trunk/reactos/dll/win32/devmgr/devmgmt/Node.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/N…
==============================================================================
--- trunk/reactos/dll/win32/devmgr/devmgmt/Node.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr/devmgmt/Node.cpp [iso-8859-1] Sat Jul 4 21:12:06 2015
@@ -22,6 +22,7 @@
m_ClassImage(0)
{
m_DisplayName[0] = UNICODE_NULL;
+ m_ClassGuid = GUID_NULL;
}
CNode::~CNode()
Modified: trunk/reactos/dll/win32/devmgr/devmgmt/Resource.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/R…
==============================================================================
--- trunk/reactos/dll/win32/devmgr/devmgmt/Resource.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr/devmgmt/Resource.h [iso-8859-1] Sat Jul 4 21:12:06
2015
@@ -21,8 +21,12 @@
#define IDC_UPDATE_DRV 104
#define IDC_UNINSTALL_DRV 105
#define IDC_ADD_HARDWARE 106
-#define IDC_ABOUT 107
-#define IDC_EXIT 108
+
+/* Menu items */
+#define IDC_ACTIONMENU 150
+#define IDC_ABOUT 151
+#define IDC_EXIT 152
+
/* view menu */
#define IDC_DEVBYTYPE 200
Added: trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/R…
==============================================================================
--- trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.cpp (added)
+++ trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.cpp [iso-8859-1] Sat Jul 4 21:12:06
2015
@@ -0,0 +1,61 @@
+/*
+* PROJECT: ReactOS Device Manager
+* LICENSE: GPL - See COPYING in the top level directory
+* FILE: dll/win32/devmgr/devmgr/RootNode.cpp
+* PURPOSE: Root object for
+* COPYRIGHT: Copyright 2015 Ged Murphy <gedmurphy(a)reactos.org>
+*
+*/
+
+#include "stdafx.h"
+#include "devmgmt.h"
+#include "RootNode.h"
+
+
+CRootNode::CRootNode(_In_ PSP_CLASSIMAGELIST_DATA ImageListData) :
+ CNode(RootNode, ImageListData)
+{
+}
+
+
+CRootNode::~CRootNode()
+{
+}
+
+
+bool
+CRootNode::SetupNode()
+{
+
+ // Load the bitmap we'll be using as the root image
+ HBITMAP hRootImage;
+ hRootImage = LoadBitmapW(g_hInstance,
+ MAKEINTRESOURCEW(IDB_ROOT_IMAGE));
+ if (hRootImage == NULL) return FALSE;
+
+ // Add this bitmap to the device image list. This is a bit hacky, but it's safe
+ m_ClassImage = ImageList_Add(m_ImageListData->ImageList,
+ hRootImage,
+ NULL);
+ DeleteObject(hRootImage);
+
+
+ // Get the root instance
+ CONFIGRET cr;
+ cr = CM_Locate_DevNodeW(&m_DevInst,
+ NULL,
+ CM_LOCATE_DEVNODE_NORMAL);
+ if (cr != CR_SUCCESS)
+ {
+ return false;
+ }
+
+ // The root name is the computer name
+ DWORD Size = DISPLAY_NAME_LEN;
+ if (GetComputerNameW(m_DisplayName, &Size))
+ _wcslwr_s(m_DisplayName);
+
+ return true;
+
+
+}
Propchange: trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.cpp
------------------------------------------------------------------------------
svn:eol-style = native
Added: trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/R…
==============================================================================
--- trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.h (added)
+++ trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.h [iso-8859-1] Sat Jul 4 21:12:06
2015
@@ -0,0 +1,17 @@
+#pragma once
+#include "Node.h"
+
+class CRootNode : public CNode
+{
+private:
+ DEVINST m_DevInst;
+
+public:
+ CRootNode(_In_ PSP_CLASSIMAGELIST_DATA ImageListData);
+ ~CRootNode();
+
+ virtual bool SetupNode();
+
+ DEVINST GetDeviceInst() { return m_DevInst; }
+};
+
Propchange: trunk/reactos/dll/win32/devmgr/devmgmt/RootNode.h
------------------------------------------------------------------------------
svn:eol-style = native
Modified: trunk/reactos/dll/win32/devmgr/devmgmt/lang/en-US.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/l…
==============================================================================
--- trunk/reactos/dll/win32/devmgr/devmgmt/lang/en-US.rc [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr/devmgmt/lang/en-US.rc [iso-8859-1] Sat Jul 4 21:12:06
2015
@@ -6,18 +6,7 @@
BEGIN
MENUITEM "E&xit", IDC_EXIT
END
- POPUP "Action"
- BEGIN
- MENUITEM "Update driver software..." IDC_UPDATE_DRV
- MENUITEM "Enable" IDC_ENABLE_DRV
- MENUITEM "Disable" IDC_DISABLE_DRV
- MENUITEM "Uninstall" IDC_UNINSTALL_DRV
- MENUITEM SEPARATOR
- MENUITEM "Scan for hardware changes" IDC_SCAN_HARDWARE
- MENUITEM "Add hardware" IDC_ADD_HARDWARE, GRAYED
- MENUITEM SEPARATOR
- MENUITEM "Properties", IDC_PROPERTIES
- END
+ MENUITEM "Action" IDC_ACTIONMENU
POPUP "View"
BEGIN
MENUITEM "Devices by type", IDC_DEVBYTYPE