From 2ea155305ae4e458444e5819bc09e2bba303c84f Mon Sep 17 00:00:00 2001
From: Thomas Faber <thomas.faber@reactos.org>
Date: Sat, 19 Sep 2015 21:46:40 +0000
Subject: [PATCH] [KMTESTS] - Add missing OBJ_KERNEL_HANDLE - OBJ_KERNEL_HANDLE
 in user mode has no effect... no reason to make a define around it CORE-10207

svn path=/trunk/; revision=69296
---
 rostests/kmtests/ntos_io/IoCreateFile.c |  6 +++---
 rostests/kmtests/ntos_ke/KeEvent.c      |  8 +++++++-
 rostests/kmtests/rtl/RtlRegistry.c      | 10 ++--------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/rostests/kmtests/ntos_io/IoCreateFile.c b/rostests/kmtests/ntos_io/IoCreateFile.c
index 836274535d9..6de3c42e195 100644
--- a/rostests/kmtests/ntos_io/IoCreateFile.c
+++ b/rostests/kmtests/ntos_io/IoCreateFile.c
@@ -454,7 +454,7 @@ UserModeTest(VOID)
     ok_eq_hex(IoStatusBlock.Status, 0xFFFFFFFF);
     if (Status == STATUS_SUCCESS)
     {
-        ObCloseHandle(ParentHandle, KernelMode);
+        ObCloseHandle(ParentHandle, UserMode);
     }
 
     /* Attempt relative target open */
@@ -462,7 +462,7 @@ UserModeTest(VOID)
     IoStatusBlock.Information = 0xFFFFFFFF;
     InitializeObjectAttributes(&ObjectAttributes,
                                &SystemRoot,
-                               OBJ_CASE_INSENSITIVE,
+                               OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE,
                                NULL, NULL);
     Status = ZwOpenFile(&SystemRootHandle,
                         GENERIC_WRITE | GENERIC_READ | SYNCHRONIZE,
@@ -478,7 +478,7 @@ UserModeTest(VOID)
         IoStatusBlock.Information = 0xFFFFFFFF;
         InitializeObjectAttributes(&ObjectAttributes,
                                    &Regedit,
-                                   OBJ_CASE_INSENSITIVE,
+                                   OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE,
                                    SystemRootHandle,
                                    NULL);
         Status = IoCreateFile(&ParentHandle,
diff --git a/rostests/kmtests/ntos_ke/KeEvent.c b/rostests/kmtests/ntos_ke/KeEvent.c
index 831e194c031..2cf19026c88 100644
--- a/rostests/kmtests/ntos_ke/KeEvent.c
+++ b/rostests/kmtests/ntos_ke/KeEvent.c
@@ -155,6 +155,7 @@ TestEventConcurrent(
     PVOID ThreadObjects[RTL_NUMBER_OF(Threads)];
     LONG State;
     PKTHREAD Thread = KeGetCurrentThread();
+    OBJECT_ATTRIBUTES ObjectAttributes;
 
     LongTimeout.QuadPart = -100 * MILLISECOND;
     ShortTimeout.QuadPart = -1 * MILLISECOND;
@@ -165,7 +166,12 @@ TestEventConcurrent(
     {
         Threads[i].Event = Event;
         Threads[i].Signal = FALSE;
-        Status = PsCreateSystemThread(&Threads[i].Handle, GENERIC_ALL, NULL, NULL, NULL, WaitForEventThread, &Threads[i]);
+        InitializeObjectAttributes(&ObjectAttributes,
+                                   NULL,
+                                   OBJ_KERNEL_HANDLE,
+                                   NULL,
+                                   NULL);
+        Status = PsCreateSystemThread(&Threads[i].Handle, GENERIC_ALL, &ObjectAttributes, NULL, NULL, WaitForEventThread, &Threads[i]);
         ok_eq_hex(Status, STATUS_SUCCESS);
         Status = ObReferenceObjectByHandle(Threads[i].Handle, SYNCHRONIZE, *PsThreadType, KernelMode, (PVOID *)&Threads[i].Thread, NULL);
         ok_eq_hex(Status, STATUS_SUCCESS);
diff --git a/rostests/kmtests/rtl/RtlRegistry.c b/rostests/kmtests/rtl/RtlRegistry.c
index a439e637bf0..a6fbd5f579c 100644
--- a/rostests/kmtests/rtl/RtlRegistry.c
+++ b/rostests/kmtests/rtl/RtlRegistry.c
@@ -8,12 +8,6 @@
 #define KMT_EMULATE_KERNEL
 #include <kmt_test.h>
 
-#ifdef KMT_KERNEL_MODE
-#define KMT_KERNEL_HANDLE OBJ_KERNEL_HANDLE
-#else
-#define KMT_KERNEL_HANDLE 0
-#endif
-
 #ifndef RTL_NUMBER_OF
 #define RTL_NUMBER_OF(x) (sizeof(x) / sizeof(x[0]))
 #endif
@@ -212,7 +206,7 @@ START_TEST(RtlRegistry)
     RtlInitUnicodeString(&KeyName, L"\\Registry\\MACHINE\\Software");
     InitializeObjectAttributes(&ObjectAttributes,
                                &KeyName,
-                               OBJ_CASE_INSENSITIVE | KMT_KERNEL_HANDLE,
+                               OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE,
                                NULL,
                                NULL);
     Status = ZwOpenKey(&SoftwareHandle,
@@ -225,7 +219,7 @@ START_TEST(RtlRegistry)
     RtlInitUnicodeString(&KeyName, L"RtlRegistryKmtestKey");
     InitializeObjectAttributes(&ObjectAttributes,
                                &KeyName,
-                               OBJ_CASE_INSENSITIVE | KMT_KERNEL_HANDLE,
+                               OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE,
                                SoftwareHandle,
                                NULL);
     Status = ZwCreateKey(&KeyHandle,