[akhaldi] 46186: [DDK] - Fix wmilib.h

Author: akhaldi
Date: Sat Mar 13 21:47:12 2010
New Revision: 46186

URL: http://svn.reactos.org/svn/reactos?rev=46186&view=rev
Log:
[DDK]
- Fix wmilib.h

Modified:
    branches/header-work/include/ddk/wmilib.h

Modified: branches/header-work/include/ddk/wmilib.h
URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/wmilib.h...
==============================================================================
--- branches/header-work/include/ddk/wmilib.h [iso-8859-1] (original)
+++ branches/header-work/include/ddk/wmilib.h [iso-8859-1] Sat Mar 13 21:47:12 2010
@@ -22,17 +22,6 @@
   ULONG Flags;
 } WMIGUIDREGINFO, *PWMIGUIDREGINFO;

-typedef struct _WMILIB_CONTEXT {
-  ULONG GuidCount;
-  PWMIGUIDREGINFO GuidList;
-  PWMI_QUERY_REGINFO QueryWmiRegInfo;
-  PWMI_QUERY_DATABLOCK QueryWmiDataBlock;
-  PWMI_SET_DATABLOCK SetWmiDataBlock;
-  PWMI_SET_DATAITEM SetWmiDataItem;
-  PWMI_EXECUTE_METHOD ExecuteWmiMethod;
-  PWMI_FUNCTION_CONTROL WmiFunctionControl;
-} WMILIB_CONTEXT, *PWMILIB_CONTEXT;
-
 typedef NTSTATUS
 (NTAPI *PWMI_QUERY_REGINFO) (
   IN OUT PDEVICE_OBJECT DeviceObject,
@@ -41,6 +30,14 @@
   OUT PUNICODE_STRING *RegistryPath OPTIONAL,
   IN OUT PUNICODE_STRING MofResourceName,
   OUT PDEVICE_OBJECT *Pdo OPTIONAL);
+  
+typedef NTSTATUS
+(NTAPI *PWMI_FUNCTION_CONTROL) (
+  IN OUT PDEVICE_OBJECT DeviceObject,
+  IN OUT PIRP Irp,
+  IN ULONG GuidIndex,
+  IN WMIENABLEDISABLECONTROL Function,
+  IN BOOLEAN Enable);

typedef NTSTATUS
 (NTAPI *PWMI_QUERY_DATABLOCK) (
@@ -52,6 +49,17 @@
   OUT PULONG InstanceLengthArray OPTIONAL,
   IN ULONG BufferAvail,
   OUT PUCHAR Buffer OPTIONAL);
+
+typedef NTSTATUS
+(NTAPI *PWMI_EXECUTE_METHOD) (
+  IN OUT PDEVICE_OBJECT DeviceObject,
+  IN OUT PIRP Irp,
+  IN ULONG GuidIndex,
+  IN ULONG InstanceIndex,
+  IN ULONG MethodId,
+  IN ULONG InBufferSize,
+  IN ULONG OutBufferSize,
+  IN OUT PUCHAR Buffer);

typedef NTSTATUS
 (NTAPI *PWMI_SET_DATABLOCK) (
@@ -72,24 +80,16 @@
   IN ULONG BufferSize,
   IN PUCHAR Buffer);

-typedef NTSTATUS
-(NTAPI *PWMI_EXECUTE_METHOD) (
-  IN OUT PDEVICE_OBJECT DeviceObject,
-  IN OUT PIRP Irp,
-  IN ULONG GuidIndex,
-  IN ULONG InstanceIndex,
-  IN ULONG MethodId,
-  IN ULONG InBufferSize,
-  IN ULONG OutBufferSize,
-  IN OUT PUCHAR Buffer);
-
-typedef NTSTATUS
-(NTAPI *PWMI_FUNCTION_CONTROL) (
-  IN OUT PDEVICE_OBJECT DeviceObject,
-  IN OUT PIRP Irp,
-  IN ULONG GuidIndex,
-  IN WMIENABLEDISABLECONTROL Function,
-  IN BOOLEAN Enable);
+typedef struct _WMILIB_CONTEXT {
+  ULONG GuidCount;
+  PWMIGUIDREGINFO GuidList;
+  PWMI_QUERY_REGINFO QueryWmiRegInfo;
+  PWMI_QUERY_DATABLOCK QueryWmiDataBlock;
+  PWMI_SET_DATABLOCK SetWmiDataBlock;
+  PWMI_SET_DATAITEM SetWmiDataItem;
+  PWMI_EXECUTE_METHOD ExecuteWmiMethod;
+  PWMI_FUNCTION_CONTROL WmiFunctionControl;
+} WMILIB_CONTEXT, *PWMILIB_CONTEXT;

#if (NTDDI_VERSION >= NTDDI_WIN2K)