From 5ad3e6fe728cf37c1205f565d653100ad345acf6 Mon Sep 17 00:00:00 2001
From: Eric Kohl <eric.kohl@reactos.org>
Date: Wed, 30 Dec 2009 13:57:47 +0000
Subject: [PATCH] [umpnpmgr] Move device instance action constants into the idf
 file and use them instead of hardcoded values.

svn path=/trunk/; revision=44813
---
 reactos/base/services/umpnpmgr/umpnpmgr.c |  3 ---
 reactos/dll/win32/setupapi/cfgmgr.c       | 10 +++++-----
 reactos/include/reactos/idl/pnp.idl       |  5 +++++
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/reactos/base/services/umpnpmgr/umpnpmgr.c b/reactos/base/services/umpnpmgr/umpnpmgr.c
index 8fd96c4d8c6..d01f1c2de1f 100644
--- a/reactos/base/services/umpnpmgr/umpnpmgr.c
+++ b/reactos/base/services/umpnpmgr/umpnpmgr.c
@@ -1086,9 +1086,6 @@ DWORD PNP_CreateDevInst(
 
 
 /* Function 29 */
-#define PNP_DEVINST_SETUP       0x3
-#define PNP_DEVINST_ENABLE      0x4
-#define PNP_DEVINST_REENUMERATE 0x7
 DWORD PNP_DeviceInstanceAction(
     handle_t hBinding,
     DWORD ulMajorAction,
diff --git a/reactos/dll/win32/setupapi/cfgmgr.c b/reactos/dll/win32/setupapi/cfgmgr.c
index 4e103baece1..abd4bb11cec 100644
--- a/reactos/dll/win32/setupapi/cfgmgr.c
+++ b/reactos/dll/win32/setupapi/cfgmgr.c
@@ -745,7 +745,7 @@ CONFIGRET WINAPI CM_Disable_DevNode_Ex(
     RpcTryExcept
     {
         ret = PNP_DeviceInstanceAction(BindingHandle,
-                                       5,
+                                       PNP_DEVINST_DISABLE,
                                        ulFlags,
                                        lpDevInst,
                                        NULL);
@@ -844,7 +844,7 @@ CONFIGRET WINAPI CM_Enable_DevNode_Ex(
     RpcTryExcept
     {
         ret = PNP_DeviceInstanceAction(BindingHandle,
-                                       4,
+                                       PNP_DEVINST_ENABLE,
                                        ulFlags,
                                        lpDevInst,
                                        NULL);
@@ -3044,7 +3044,7 @@ CONFIGRET WINAPI CM_Move_DevNode_Ex(
     RpcTryExcept
     {
         ret = PNP_DeviceInstanceAction(BindingHandle,
-                                       2,
+                                       PNP_DEVINST_MOVE,
                                        ulFlags,
                                        lpFromDevInst,
                                        lpToDevInst);
@@ -3301,7 +3301,7 @@ CM_Reenumerate_DevNode_Ex(
     RpcTryExcept
     {
         ret = PNP_DeviceInstanceAction(BindingHandle,
-                                       7,
+                                       PNP_DEVINST_REENUMERATE,
                                        ulFlags,
                                        lpDevInst,
                                        NULL);
@@ -3935,7 +3935,7 @@ CONFIGRET WINAPI CM_Setup_DevNode_Ex(
     RpcTryExcept
     {
         ret = PNP_DeviceInstanceAction(BindingHandle,
-                                       3,
+                                       PNP_DEVINST_SETUP,
                                        ulFlags,
                                        lpDevInst,
                                        NULL);
diff --git a/reactos/include/reactos/idl/pnp.idl b/reactos/include/reactos/idl/pnp.idl
index cf3fc891253..b6d03bd18ec 100644
--- a/reactos/include/reactos/idl/pnp.idl
+++ b/reactos/include/reactos/idl/pnp.idl
@@ -482,6 +482,11 @@ interface pnp
         [in] DWORD ulFlags);
 
     /* Function 29 */
+    cpp_quote("#define PNP_DEVINST_MOVE        0x2")
+    cpp_quote("#define PNP_DEVINST_SETUP       0x3")
+    cpp_quote("#define PNP_DEVINST_ENABLE      0x4")
+    cpp_quote("#define PNP_DEVINST_DISABLE     0x5")
+    cpp_quote("#define PNP_DEVINST_REENUMERATE 0x7")
     DWORD PNP_DeviceInstanceAction(
         [in] handle_t hBinding,
         [in] DWORD ulMajorAction,