[ros-diffs] [gedmurphy] 69700: [DEVMGR] - Fix overlay icon for problem devices

Author: gedmurphy
Date: Sun Oct 25 17:01:19 2015
New Revision: 69700

URL: http://svn.reactos.org/svn/reactos?rev=69700&view=rev
Log:
[DEVMGR]
- Fix overlay icon for problem devices

Modified:
    trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp
    trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.h

Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D…
==============================================================================
--- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.cpp	[iso-8859-1] Sun Oct 25 17:01:19
2015
@@ -96,17 +96,20 @@
     }
 
 
-    // Set the overlay if the device has a problem
+    // Check if the device has a problem
     if (HasProblem())
     {
-        m_OverlayImage = 1;
-    }
-
-    // The disabled overlay takes precidence over the problem overlay
-    if (IsDisabled())
-    {
-        m_OverlayImage = 2;
-    }
+        if (IsDisabled())
+        {
+            m_OverlayImage = OverlayDisabled;
+        }
+        else
+        {
+            m_OverlayImage = OverlayProblem;
+        }
+    }
+
+
 
 
     // Get the class guid for this device
@@ -227,7 +230,7 @@
                                   NULL);
     if (cr == CR_SUCCESS)
     {
-        return ((m_ProblemNumber & (CM_PROB_DISABLED | CM_PROB_HARDWARE_DISABLED)) !=
0);
+        return ((m_ProblemNumber == CM_PROB_DISABLED) || (m_ProblemNumber ==
CM_PROB_HARDWARE_DISABLED));
     }
 
     return false;

Modified: trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgmt/D…
==============================================================================
--- trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/devmgr/devmgmt/DeviceNode.h	[iso-8859-1] Sun Oct 25 17:01:19
2015
@@ -1,5 +1,12 @@
 #pragma once
 #include "Node.h"
+
+enum IconOverlays
+{
+    OverlayProblem = 1,
+    OverlayDisabled,
+    OverlayInfo
+};
 
 class CDeviceNode : public CNode
 {