From: Ged Murphy Date: Mon, 12 Oct 2015 19:18:47 +0000 (+0000) Subject: [DEVMGR] X-Git-Tag: ReactOS-0.4.0~531 X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=bea3c348a8b10497bca191e7a0075fa6c3b96dec [DEVMGR] A few g++ fixes svn path=/trunk/; revision=69517 --- diff --git a/reactos/dll/win32/devmgr_new/devmgmt/ClassNode.cpp b/reactos/dll/win32/devmgr_new/devmgmt/ClassNode.cpp index de8639018f7..836c5ce889d 100644 --- a/reactos/dll/win32/devmgr_new/devmgmt/ClassNode.cpp +++ b/reactos/dll/win32/devmgr_new/devmgmt/ClassNode.cpp @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Device Manager * LICENSE: GPL - See COPYING in the top level directory -* FILE: dll/win32/devmgr/devmgr/ClassNode.cpp +* FILE: dll/win32/devmgr/devmgmt/ClassNode.cpp * PURPOSE: Class object for * COPYRIGHT: Copyright 2015 Ged Murphy * diff --git a/reactos/dll/win32/devmgr_new/devmgmt/DeviceNode.cpp b/reactos/dll/win32/devmgr_new/devmgmt/DeviceNode.cpp index ce2cfe16577..96d6a397d39 100644 --- a/reactos/dll/win32/devmgr_new/devmgmt/DeviceNode.cpp +++ b/reactos/dll/win32/devmgr_new/devmgmt/DeviceNode.cpp @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Device Manager * LICENSE: GPL - See COPYING in the top level directory -* FILE: dll/win32/devmgr/devmgr/ClassNode.cpp +* FILE: dll/win32/devmgr/devmgmt/ClassNode.cpp * PURPOSE: Class object for * COPYRIGHT: Copyright 2015 Ged Murphy * diff --git a/reactos/dll/win32/devmgr_new/devmgmt/DeviceNode.h b/reactos/dll/win32/devmgr_new/devmgmt/DeviceNode.h index e03eaf15887..3c5ddc5c0c3 100644 --- a/reactos/dll/win32/devmgr_new/devmgmt/DeviceNode.h +++ b/reactos/dll/win32/devmgr_new/devmgmt/DeviceNode.h @@ -5,8 +5,9 @@ class CDeviceNode : public CNode { private: SP_DEVINFO_DATA m_DevinfoData; - HDEVINFO m_hDevInfo; DEVINST m_DevInst; + HDEVINFO m_hDevInfo; + ULONG m_Status; ULONG m_ProblemNumber; int m_OverlayImage; diff --git a/reactos/dll/win32/devmgr_new/devmgmt/DeviceView.cpp b/reactos/dll/win32/devmgr_new/devmgmt/DeviceView.cpp index d4dc74399bb..33ead333e5a 100644 --- a/reactos/dll/win32/devmgr_new/devmgmt/DeviceView.cpp +++ b/reactos/dll/win32/devmgr_new/devmgmt/DeviceView.cpp @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Device Manager * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/devmgr/devmgr/DeviceView.cpp + * FILE: dll/win32/devmgr/devmgmt/DeviceView.cpp * PURPOSE: Implements the tree view which contains the devices * COPYRIGHT: Copyright 2015 Ged Murphy */ @@ -51,7 +51,7 @@ CDeviceView::CDeviceView( m_hPropertyDialog(NULL), m_hMenu(NULL), m_ViewType(DevicesByType), - m_ShowHidden(FALSE), + m_ShowHidden(false), m_RootNode(NULL) { ZeroMemory(&m_ImageListData, sizeof(SP_CLASSIMAGELIST_DATA)); diff --git a/reactos/dll/win32/devmgr_new/devmgmt/DeviceView.h b/reactos/dll/win32/devmgr_new/devmgmt/DeviceView.h index 70fe84d1ab5..739da2b14a7 100644 --- a/reactos/dll/win32/devmgr_new/devmgmt/DeviceView.h +++ b/reactos/dll/win32/devmgr_new/devmgmt/DeviceView.h @@ -14,10 +14,7 @@ enum ViewType class CDeviceView { - CRootNode *m_RootNode; - CAtlList m_ClassNodeList; - CAtlList m_DeviceNodeList; - SP_CLASSIMAGELIST_DATA m_ImageListData; + HWND m_hMainWnd; HWND m_hTreeView; HWND m_hPropertyDialog; @@ -26,6 +23,11 @@ class CDeviceView HTREEITEM m_hTreeRoot; bool m_ShowHidden; + CRootNode *m_RootNode; + CAtlList m_ClassNodeList; + CAtlList m_DeviceNodeList; + SP_CLASSIMAGELIST_DATA m_ImageListData; + public: CDeviceView( HWND hMainWnd diff --git a/reactos/dll/win32/devmgr_new/devmgmt/MainWindow.cpp b/reactos/dll/win32/devmgr_new/devmgmt/MainWindow.cpp index c1185fdff73..fa0bc768e4e 100644 --- a/reactos/dll/win32/devmgr_new/devmgmt/MainWindow.cpp +++ b/reactos/dll/win32/devmgr_new/devmgmt/MainWindow.cpp @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Device Manager * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll/win32/devmgr/devmgr/MainWindow.cpp + * FILE: dll/win32/devmgr/devmgmt/MainWindow.cpp * PURPOSE: Implements the main container window for the device view * COPYRIGHT: Copyright 2014 - 2015 Ged Murphy */ @@ -60,18 +60,18 @@ static const MENU_HINT SystemMenuHintTable[] = {SC_SIZE, IDS_HINT_SYS_SIZE}, {SC_MINIMIZE, IDS_HINT_SYS_MINIMIZE}, {SC_MAXIMIZE, IDS_HINT_SYS_MAXIMIZE}, - {SC_CLOSE, IDS_HINT_SYS_CLOSE}, + {SC_CLOSE, IDS_HINT_SYS_CLOSE} }; static TBBUTTON TbButtons[] = { - { BTN_PROPERTIES, IDC_PROPERTIES, TBSTATE_ENABLED, BTNS_BUTTON, 0, 0 }, - { BTN_SCAN_HARDWARE, IDC_SCAN_HARDWARE, TBSTATE_ENABLED, BTNS_BUTTON, 0, 0 }, - { 2, IDC_STATIC, TBSTATE_ENABLED, BTNS_SEP, 0, 0 }, - { BTN_ENABLE_DRV, IDC_ENABLE_DRV, TBSTATE_ENABLED, BTNS_BUTTON, 0, 0 }, - { BTN_DISABLE_DRV, IDC_DISABLE_DRV, TBSTATE_ENABLED, BTNS_BUTTON, 0, 0 }, - { BTN_UPDATE_DRV, IDC_UPDATE_DRV, TBSTATE_ENABLED, BTNS_BUTTON, 0, 0 }, - { BTN_UNINSTALL_DRV, IDC_UNINSTALL_DRV, TBSTATE_ENABLED, BTNS_BUTTON, 0, 0 } + { BTN_PROPERTIES, IDC_PROPERTIES, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, + { BTN_SCAN_HARDWARE, IDC_SCAN_HARDWARE, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, + { 2, IDC_STATIC, TBSTATE_ENABLED, BTNS_SEP, {0}, 0, 0 }, + { BTN_ENABLE_DRV, IDC_ENABLE_DRV, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, + { BTN_DISABLE_DRV, IDC_DISABLE_DRV, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, + { BTN_UPDATE_DRV, IDC_UPDATE_DRV, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 }, + { BTN_UNINSTALL_DRV, IDC_UNINSTALL_DRV, TBSTATE_ENABLED, BTNS_BUTTON, {0}, 0, 0 } }; @@ -245,7 +245,6 @@ bool CDeviceManager::RefreshView(_In_ ViewType Type) { UINT CheckId = 0; - BOOL bSuccess; // Refreshed the cached view m_DeviceView->Refresh(Type, FALSE, TRUE, NULL); @@ -261,20 +260,19 @@ CDeviceManager::RefreshView(_In_ ViewType Type) } // Set the new check item - bSuccess = CheckMenuRadioItem(m_hMenu, - IDC_DEVBYTYPE, - IDC_RESBYCONN, - CheckId, - MF_BYCOMMAND); + CheckMenuRadioItem(m_hMenu, + IDC_DEVBYTYPE, + IDC_RESBYCONN, + CheckId, + MF_BYCOMMAND); - return TRUE; + return true; } bool CDeviceManager::CreateToolBar(void) { TBADDBITMAP TbAddBitmap; - INT Index; DWORD dwStyles = WS_CHILDWINDOW | TBSTYLE_FLAT | TBSTYLE_WRAPABLE | TBSTYLE_TOOLTIPS | CCS_NODIVIDER; DWORD dwExStyles = WS_EX_LEFT | WS_EX_LTRREADING | WS_EX_RIGHTSCROLLBAR; @@ -307,7 +305,7 @@ CDeviceManager::CreateToolBar(void) TbAddBitmap.hInst = g_hThisInstance; TbAddBitmap.nID = IDB_TOOLBAR; - Index = SendMessageW(m_hToolBar, TB_ADDBITMAP, _countof(TbButtons), (LPARAM)&TbAddBitmap); + SendMessageW(m_hToolBar, TB_ADDBITMAP, _countof(TbButtons), (LPARAM)&TbAddBitmap); SendMessageW(m_hToolBar, TB_ADDBUTTONSW, _countof(TbButtons), (LPARAM)TbButtons); SendMessageW(m_hToolBar, TB_AUTOSIZE, 0, 0); @@ -496,7 +494,7 @@ LRESULT CDeviceManager::OnNotify(_In_ LPARAM lParam) { LPNMHDR NmHdr = (LPNMHDR)lParam; - LRESULT Ret; + LRESULT Ret = 0; switch (NmHdr->code) { @@ -556,7 +554,7 @@ CDeviceManager::OnNotify(_In_ LPARAM lParam) } } - return 0; + return Ret; } LRESULT diff --git a/reactos/dll/win32/devmgr_new/devmgmt/Node.cpp b/reactos/dll/win32/devmgr_new/devmgmt/Node.cpp index 0d6d610b1f3..1925d2db756 100644 --- a/reactos/dll/win32/devmgr_new/devmgmt/Node.cpp +++ b/reactos/dll/win32/devmgr_new/devmgmt/Node.cpp @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Device Manager * LICENSE: GPL - See COPYING in the top level directory -* FILE: dll/win32/devmgr/devmgr/node.cpp +* FILE: dll/win32/devmgr/devmgmt/node.cpp * PURPOSE: Abstract base object for each node in the tree * COPYRIGHT: Copyright 2015 Ged Murphy * diff --git a/reactos/dll/win32/devmgr_new/devmgmt/Node.h b/reactos/dll/win32/devmgr_new/devmgmt/Node.h index b200ba68d39..373d27bea97 100644 --- a/reactos/dll/win32/devmgr_new/devmgmt/Node.h +++ b/reactos/dll/win32/devmgr_new/devmgmt/Node.h @@ -12,12 +12,12 @@ enum NodeType class CNode { protected: + NodeType m_NodeType; PSP_CLASSIMAGELIST_DATA m_ImageListData; LPWSTR m_DeviceId; WCHAR m_DisplayName[DISPLAY_NAME_LEN]; GUID m_ClassGuid; INT m_ClassImage; - NodeType m_NodeType; public: CNode( @@ -25,7 +25,7 @@ public: _In_ PSP_CLASSIMAGELIST_DATA ImageListData ); - ~CNode(); + virtual ~CNode(); virtual bool SetupNode() = 0; diff --git a/reactos/dll/win32/devmgr_new/devmgmt/RootNode.cpp b/reactos/dll/win32/devmgr_new/devmgmt/RootNode.cpp index b43a7fbd75e..edb2d3cbdac 100644 --- a/reactos/dll/win32/devmgr_new/devmgmt/RootNode.cpp +++ b/reactos/dll/win32/devmgr_new/devmgmt/RootNode.cpp @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Device Manager * LICENSE: GPL - See COPYING in the top level directory -* FILE: dll/win32/devmgr/devmgr/RootNode.cpp +* FILE: dll/win32/devmgr/devmgmt/RootNode.cpp * PURPOSE: Root object for * COPYRIGHT: Copyright 2015 Ged Murphy *