From 4d38c295f01f346087b3e0ee2214f9e031e21327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Wed, 8 Mar 2017 03:44:19 +0100
Subject: server: Rename ObjectType to Type.

---
 dlls/ntdll/tests/om.c | 2 +-
 server/directory.c    | 2 +-
 server/object.c       | 2 +-
 server/object.h       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c
index dbe7be39..a94b9866 100644
--- a/dlls/ntdll/tests/om.c
+++ b/dlls/ntdll/tests/om.c
@@ -1625,7 +1625,7 @@ static void test_query_object_types(void)
 
         if (i == 0)
         {
-            todo_wine ok( type->TypeName.Length == sizeof(typeW) && !strncmpW(typeW, type->TypeName.Buffer, 4),
+            ok( type->TypeName.Length == sizeof(typeW) && !strncmpW(typeW, type->TypeName.Buffer, 4),
                 "Expected 'Type' as first type, got %s\n", wine_dbgstr_us(&type->TypeName) );
         }
 
diff --git a/server/directory.c b/server/directory.c
index 65a77a89..79bd46fc 100644
--- a/server/directory.c
+++ b/server/directory.c
@@ -119,7 +119,7 @@ static void object_type_dump( struct object *obj, int verbose )
 
 static struct object_type *object_type_get_type( struct object *obj )
 {
-    static const struct unicode_str str = { type_ObjectType, sizeof(type_ObjectType) };
+    static const struct unicode_str str = { type_Type, sizeof(type_Type) };
     return get_object_type( &str );
 }
 
diff --git a/server/object.c b/server/object.c
index 8b4a8429..f7182eca 100644
--- a/server/object.c
+++ b/server/object.c
@@ -703,7 +703,7 @@ void no_destroy( struct object *obj )
 
 static const struct unicode_str type_array[] =
 {
-    {type_ObjectType,    sizeof(type_ObjectType)},
+    {type_Type,          sizeof(type_Type)},
     {type_Directory,     sizeof(type_Directory)},
     {type_SymbolicLink,  sizeof(type_SymbolicLink)},
     {type_Token,         sizeof(type_Token)},
diff --git a/server/object.h b/server/object.h
index f75ccc0c..58ad2da1 100644
--- a/server/object.h
+++ b/server/object.h
@@ -245,7 +245,6 @@ static const WCHAR type_Job[] =           {'J','o','b'};
 static const WCHAR type_Key[] =           {'K','e','y'};
 static const WCHAR type_KeyedEvent[] =    {'K','e','y','e','d','E','v','e','n','t'};
 static const WCHAR type_Mutant[] =        {'M','u','t','a','n','t'};
-static const WCHAR type_ObjectType[] =    {'O','b','j','e','c','t','T','y','p','e'};
 static const WCHAR type_Process[] =       {'P','r','o','c','e','s','s'};
 static const WCHAR type_Section[] =       {'S','e','c','t','i','o','n'};
 static const WCHAR type_Semaphore[] =     {'S','e','m','a','p','h','o','r','e'};
@@ -253,6 +252,7 @@ static const WCHAR type_SymbolicLink[] =  {'S','y','m','b','o','l','i','c','L','
 static const WCHAR type_Thread[] =        {'T','h','r','e','a','d'};
 static const WCHAR type_Timer[] =         {'T','i','m','e','r'};
 static const WCHAR type_Token[] =         {'T','o','k','e','n'};
+static const WCHAR type_Type[] =          {'T','y','p','e'};
 static const WCHAR type_WindowStation[] = {'W','i','n','d','o','w','S','t','a','t','i','o','n'};
 
 extern void init_types(void);
-- 
2.20.1

