[PATCH v2] ntoskrnl.exe: Implement ObGetObjectType.

[Derek Lesho]

Signed-off-by: Derek Lesho 
---

v2: Add test for ObGetObjectType.

dlls/ntoskrnl.exe/ntoskrnl.c     | 5 ++---
 dlls/ntoskrnl.exe/tests/driver.c | 8 ++++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
index 4ff4a75972..d84f1250c5 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
@@ -2914,9 +2914,8 @@ USHORT WINAPI ObGetFilterVersion(void)
  */
 POBJECT_TYPE WINAPI ObGetObjectType(void *object)
 {
-    FIXME("stub: %p\n", object);
-
-    return NULL;
+    struct object_header *header = (struct object_header *)object - 1;
+    return header->type;
 }

/***********************************************************************
diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c
index 73d067c2bc..faa3b763bb 100644
--- a/dlls/ntoskrnl.exe/tests/driver.c
+++ b/dlls/ntoskrnl.exe/tests/driver.c
@@ -696,10 +696,12 @@ static void WINAPI thread_proc(void *arg)

static void test_ob_reference(const WCHAR *test_path)
 {
+    POBJECT_TYPE (WINAPI *pObGetObjectType)(void*);
     OBJECT_ATTRIBUTES attr = { sizeof(attr) };
     HANDLE event_handle, file_handle, file_handle2, thread_handle;
     FILE_OBJECT *file;
     void *obj1, *obj2;
+    POBJECT_TYPE obj1_type;
     UNICODE_STRING pathU;
     IO_STATUS_BLOCK io;
     WCHAR *tmp_path;
@@ -708,6 +710,9 @@ static void test_ob_reference(const WCHAR *test_path)

static const WCHAR tmpW[] = {'.','t','m','p',0};

+    pObGetObjectType = get_proc_address("ObGetObjectType");
+    ok(!!pObGetObjectType, "ObGetObjectType not found\n");
+
     InitializeObjectAttributes(&attr, NULL, OBJ_KERNEL_HANDLE, NULL, NULL);
     status = ZwCreateEvent(&event_handle, SYNCHRONIZE, &attr, NotificationEvent, TRUE);
     ok(!status, "ZwCreateEvent failed: %#x\n", status);
@@ -742,6 +747,9 @@ static void test_ob_reference(const WCHAR *test_path)
     status = ObReferenceObjectByHandle(event_handle, SYNCHRONIZE, NULL, KernelMode, &obj1, NULL);
     ok(!status, "ObReferenceObjectByHandle failed: %#x\n", status);

+    obj1_type = pObGetObjectType(obj1);
+    ok(obj1_type == *pExEventObjectType, "ObGetObjectType returned %p\n", obj1_type);
+
     if (sizeof(void *) != 4) /* avoid dealing with fastcall */
     {
         ObfReferenceObject(obj1);

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=49703

Your paranoid android.

=== wxppro (task log) ===

Task errors:
An error occurred while waiting for the test to complete: network read timed out (wait2/connect:AgentVersion.h:0/9)
The test VM has crashed, rebooted or lost connectivity (or the TestAgent server died)
The previous 2 run(s) terminated abnormally

=== w2003std (task log) ===

Task errors:
An error occurred while waiting for the test to complete: the "nc -q0 '10.42.42.140' '4242'" command returned 1 (wait2/connect)
The test VM has crashed, rebooted or lost connectivity (or the TestAgent server died)
The previous 2 run(s) terminated abnormally