Fix (USERMODE=0) build :

[WMILIB]
- Add WmiSystemControl
[NDK]
- KeGetPcr : Correct KPCR member name

svn path=/branches/header-work/; revision=46146

diff --git a/include/ddk/wmlib.h b/include/ddk/wmlib.h
index 6d48b77..98b8575 100644 (file)
--- a/include/ddk/wmlib.h
+++ b/include/ddk/wmlib.h
@@ -111,6 +111,16 @@ typedef struct _WMILIB_CONTEXT {
   PWMI_FUNCTION_CONTROL WmiFunctionControl;
 } WMILIB_CONTEXT, *PWMILIB_CONTEXT;
 
+#if (NTDDI_VERSION >= NTDDI_WIN2K)
+NTSTATUS
+NTAPI
+WmiSystemControl(
+  IN PWMILIB_CONTEXT WmiLibInfo,
+  IN PDEVICE_OBJECT DeviceObject,
+  IN OUT PIRP Irp,
+  OUT PSYSCTL_IRP_DISPOSITION IrpDisposition);
+#endif
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/include/ndk/i386/ketypes.h b/include/ndk/i386/ketypes.h
index b84178a..f90a39e 100644 (file)
--- a/include/ndk/i386/ketypes.h
+++ b/include/ndk/i386/ketypes.h
@@ -30,7 +30,7 @@ Author:
 #define PCR                     ((KPCR * const)K0IPCR)
 #if defined(CONFIG_SMP) || defined(NT_BUILD)
 #undef  KeGetPcr
-#define KeGetPcr()              ((KPCR * const)__readfsdword(FIELD_OFFSET(KPCR, Self)))
+#define KeGetPcr()              ((KPCR * const)__readfsdword(FIELD_OFFSET(KPCR, SelfPcr)))
 #endif
 
 //