Revert r46466 this time for real

[reactos.git] / reactos / include / ddk / wmilib.h

diff --git a/reactos/include/ddk/wmilib.h b/reactos/include/ddk/wmilib.h
index a0a5bdc..22bb087 100644 (file)
--- a/reactos/include/ddk/wmilib.h
+++ b/reactos/include/ddk/wmilib.h
@@ -30,14 +30,6 @@ typedef NTSTATUS
   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) (
@@ -51,34 +43,42 @@ typedef NTSTATUS
   OUT PUCHAR Buffer OPTIONAL);
 
 typedef NTSTATUS
-(NTAPI *PWMI_EXECUTE_METHOD) (
+(NTAPI *PWMI_SET_DATABLOCK) (
   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);
+  IN ULONG BufferSize,
+  IN PUCHAR Buffer);
 
 typedef NTSTATUS
-(NTAPI *PWMI_SET_DATABLOCK) (
+(NTAPI *PWMI_SET_DATAITEM) (
   IN OUT PDEVICE_OBJECT DeviceObject,
   IN OUT PIRP Irp,
   IN ULONG GuidIndex,
   IN ULONG InstanceIndex,
+  IN ULONG DataItemId,
   IN ULONG BufferSize,
   IN PUCHAR Buffer);
 
 typedef NTSTATUS
-(NTAPI *PWMI_SET_DATAITEM) (
+(NTAPI *PWMI_EXECUTE_METHOD) (
   IN OUT PDEVICE_OBJECT DeviceObject,
   IN OUT PIRP Irp,
   IN ULONG GuidIndex,
   IN ULONG InstanceIndex,
-  IN ULONG DataItemId,
-  IN ULONG BufferSize,
-  IN PUCHAR Buffer);
+  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;