From 72cf18964b73b38a5cedba523b2be1264f71b0a2 Mon Sep 17 00:00:00 2001
From: Thomas Faber <thomas.faber@reactos.org>
Date: Thu, 31 Mar 2016 07:51:08 +0000
Subject: [PATCH] [NTOS:PNP] - Avoid INVALID_HANDLE_VALUE, it's not meant for
 the kernel.

svn path=/trunk/; revision=71082
---
 reactos/ntoskrnl/io/pnpmgr/pnpmgr.c  |  6 +++---
 reactos/ntoskrnl/io/pnpmgr/pnproot.c | 20 ++++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c b/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c
index 608ab159432..2676837b790 100644
--- a/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c
+++ b/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c
@@ -781,7 +781,7 @@ IopStartDevice(
    PDEVICE_NODE DeviceNode)
 {
    NTSTATUS Status;
-   HANDLE InstanceHandle = INVALID_HANDLE_VALUE, ControlHandle = INVALID_HANDLE_VALUE;
+   HANDLE InstanceHandle = NULL, ControlHandle = NULL;
    UNICODE_STRING KeyName;
    OBJECT_ATTRIBUTES ObjectAttributes;
 
@@ -817,10 +817,10 @@ IopStartDevice(
    // }
 
 ByeBye:
-   if (ControlHandle != INVALID_HANDLE_VALUE)
+   if (ControlHandle != NULL)
        ZwClose(ControlHandle);
 
-   if (InstanceHandle != INVALID_HANDLE_VALUE)
+   if (InstanceHandle != NULL)
        ZwClose(InstanceHandle);
 
    return Status;
diff --git a/reactos/ntoskrnl/io/pnpmgr/pnproot.c b/reactos/ntoskrnl/io/pnpmgr/pnproot.c
index 65915d57037..93746fdfe82 100644
--- a/reactos/ntoskrnl/io/pnpmgr/pnproot.c
+++ b/reactos/ntoskrnl/io/pnpmgr/pnproot.c
@@ -198,7 +198,7 @@ PnpRootCreateDevice(
     UNICODE_STRING PathSep = RTL_CONSTANT_STRING(L"\\");
     ULONG NextInstance;
     UNICODE_STRING EnumKeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\" REGSTR_PATH_SYSTEMENUM);
-    HANDLE EnumHandle, DeviceKeyHandle = INVALID_HANDLE_VALUE, InstanceKeyHandle;
+    HANDLE EnumHandle, DeviceKeyHandle = NULL, InstanceKeyHandle;
     RTL_QUERY_REGISTRY_TABLE QueryTable[2];
     OBJECT_ATTRIBUTES ObjectAttributes;
 
@@ -377,7 +377,7 @@ cleanup:
         RtlFreeUnicodeString(&Device->InstanceID);
         ExFreePoolWithTag(Device, TAG_PNP_ROOT);
     }
-    if (DeviceKeyHandle != INVALID_HANDLE_VALUE)
+    if (DeviceKeyHandle != NULL)
         ObCloseHandle(DeviceKeyHandle, KernelMode);
     return Status;
 }
@@ -447,9 +447,9 @@ EnumerateDevices(
     WCHAR DevicePath[MAX_PATH + 1];
     RTL_QUERY_REGISTRY_TABLE QueryTable[4];
     PPNPROOT_DEVICE Device = NULL;
-    HANDLE KeyHandle = INVALID_HANDLE_VALUE;
-    HANDLE SubKeyHandle = INVALID_HANDLE_VALUE;
-    HANDLE DeviceKeyHandle = INVALID_HANDLE_VALUE;
+    HANDLE KeyHandle = NULL;
+    HANDLE SubKeyHandle = NULL;
+    HANDLE DeviceKeyHandle = NULL;
     ULONG BufferSize;
     ULONG ResultSize;
     ULONG Index1, Index2;
@@ -627,7 +627,7 @@ EnumerateDevices(
                 }
 
                 ZwClose(DeviceKeyHandle);
-                DeviceKeyHandle = INVALID_HANDLE_VALUE;
+                DeviceKeyHandle = NULL;
 
                 /* Insert the newly created device into the list */
                 InsertTailList(
@@ -641,7 +641,7 @@ EnumerateDevices(
         }
 
         ZwClose(SubKeyHandle);
-        SubKeyHandle = INVALID_HANDLE_VALUE;
+        SubKeyHandle = NULL;
         Index1++;
     }
 
@@ -652,11 +652,11 @@ cleanup:
         /* FIXME */
         ExFreePoolWithTag(Device, TAG_PNP_ROOT);
     }
-    if (DeviceKeyHandle != INVALID_HANDLE_VALUE)
+    if (DeviceKeyHandle != NULL)
         ZwClose(DeviceKeyHandle);
-    if (SubKeyHandle != INVALID_HANDLE_VALUE)
+    if (SubKeyHandle != NULL)
         ZwClose(SubKeyHandle);
-    if (KeyHandle != INVALID_HANDLE_VALUE)
+    if (KeyHandle != NULL)
         ZwClose(KeyHandle);
     if (KeyInfo)
         ExFreePoolWithTag(KeyInfo, TAG_PNP_ROOT);
-- 
2.17.1