From 74450c6b81b2536b24e8ae6abbe31bea3aea2592 Mon Sep 17 00:00:00 2001
From: Thomas Faber <thomas.faber@reactos.org>
Date: Sat, 21 Mar 2015 08:39:54 +0000
Subject: [PATCH] [NTOS:WMI] - Fill out WmipGenericMapping according to
 kmtest:ObTypes

svn path=/trunk/; revision=66845
---
 reactos/include/psdk/wmistr.h  |  2 ++
 reactos/ntoskrnl/wmi/guidobj.c | 10 ++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/reactos/include/psdk/wmistr.h b/reactos/include/psdk/wmistr.h
index 00b28b5ca68..9a926c20674 100644
--- a/reactos/include/psdk/wmistr.h
+++ b/reactos/include/psdk/wmistr.h
@@ -170,4 +170,6 @@ typedef enum
 #define TRACELOG_ACCESS_REALTIME      0x0400
 #define TRACELOG_REGISTER_GUIDS       0x0800
 
+#define WMIGUID_ALL_ACCESS (STANDARD_RIGHTS_READ | SYNCHRONIZE | 0xFFF)
+
 #endif /* _WMISTR_ */
diff --git a/reactos/ntoskrnl/wmi/guidobj.c b/reactos/ntoskrnl/wmi/guidobj.c
index b1e5c91d5fe..166df525fde 100644
--- a/reactos/ntoskrnl/wmi/guidobj.c
+++ b/reactos/ntoskrnl/wmi/guidobj.c
@@ -19,7 +19,13 @@
 /* GLOBALS ******************************************************************/
 
 POBJECT_TYPE WmipGuidObjectType;
-GENERIC_MAPPING WmipGenericMapping;
+GENERIC_MAPPING WmipGenericMapping =
+{
+    WMIGUID_QUERY,
+    WMIGUID_SET,
+    WMIGUID_EXECUTE,
+    WMIGUID_ALL_ACCESS
+};
 
 
 /* FUNCTIONS *****************************************************************/
@@ -120,7 +126,7 @@ WmipInitializeGuidObjectType(
     ObjectTypeInitializer.MaintainHandleCount = FALSE;
     ObjectTypeInitializer.ValidAccessMask = STANDARD_RIGHTS_ALL | 0xFFF;
     ObjectTypeInitializer.SecurityRequired = TRUE;
-    ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(WMIP_GUID_OBJECT);;
+    ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(WMIP_GUID_OBJECT);
     ObjectTypeInitializer.SecurityProcedure = WmipSecurityMethod;
     ObjectTypeInitializer.DeleteProcedure = WmipDeleteMethod;
     ObjectTypeInitializer.CloseProcedure = WmipCloseMethod;