Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-18 16:51:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

[DEVMGR]

Browse source 
A few g++ fixes

svn path=/trunk/; revision=69517
This commit is contained in:
Ged Murphy 2015-10-12 19:18:47 +00:00
parent fedc72ff66
commit bea3c348a8
9 changed files with 34 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/devmgr_new/devmgmt/ClassNode.cpp
View file

@ -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 <gedmurphy@reactos.org>
*

2
reactos/dll/win32/devmgr_new/devmgmt/DeviceNode.cpp
View file

@ -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 <gedmurphy@reactos.org>
*

3
reactos/dll/win32/devmgr_new/devmgmt/DeviceNode.h
View file

@ -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;

4
reactos/dll/win32/devmgr_new/devmgmt/DeviceView.cpp
View file

@ -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 <gedmurphy@reactos.org>
*/
@ -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));

10
reactos/dll/win32/devmgr_new/devmgmt/DeviceView.h
View file

@ -14,10 +14,7 @@ enum ViewType
class CDeviceView
{
CRootNode *m_RootNode;
CAtlList<CClassNode *> m_ClassNodeList;
CAtlList<CDeviceNode *> 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<CClassNode *> m_ClassNodeList;
CAtlList<CDeviceNode *> m_DeviceNodeList;
SP_CLASSIMAGELIST_DATA m_ImageListData;
public:
CDeviceView(
HWND hMainWnd

38
reactos/dll/win32/devmgr_new/devmgmt/MainWindow.cpp
View file

@ -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 <gedmurphy@reactos.org>
*/
@ -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

2
reactos/dll/win32/devmgr_new/devmgmt/Node.cpp
View file

@ -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 <gedmurphy@reactos.org>
*

4
reactos/dll/win32/devmgr_new/devmgmt/Node.h
View file

@ -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;

2
reactos/dll/win32/devmgr_new/devmgmt/RootNode.cpp
View file

@ -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 <gedmurphy@reactos.org>
*