Reintegrate header branch part 5/x

- Formatting and properties
- delete xmldsodid.h

svn path=/trunk/; revision=46551

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

diff --git a/reactos/include/ddk/xmldsodid.h b/reactos/include/ddk/xmldsodid.h
deleted file mode 100644 (file)
index d80d146..0000000
--- a/reactos/include/ddk/xmldsodid.h
+++ /dev/null
@@ -1,10 +0,0 @@
-
-#ifndef __XMLDSODID_H__
-#define __XMLDSODID_H__
-#define DISPID_XOBJ_MIN                         0x00010000
-#define DISPID_XOBJ_MAX                         0x0001FFFF
-#define DISPID_XOBJ_BASE                        DISPID_XOBJ_MIN
-#define  DISPID_XMLDSO                          DISPID_XOBJ_BASE
-#define  DISPID_XMLDSO_DOCUMENT                 DISPID_XMLDSO  +  1
-#define  DISPID_XMLDSO_JAVADSOCOMPATIBLE        DISPID_XMLDSO_DOCUMENT  +  1
-#endif
\ No newline at end of file

diff --git a/reactos/include/ndk/pstypes.h b/reactos/include/ndk/pstypes.h
index d423b7a..43b4468 100644 (file)
--- a/reactos/include/ndk/pstypes.h
+++ b/reactos/include/ndk/pstypes.h
@@ -703,7 +703,7 @@ typedef struct _PROCESS_BASIC_INFORMATION
     KPRIORITY BasePriority;
     ULONG_PTR UniqueProcessId;
     ULONG_PTR InheritedFromUniqueProcessId;
-} PROCESS_BASIC_INFORMATION,*PPROCESS_BASIC_INFORMATION;
+} PROCESS_BASIC_INFORMATION, *PPROCESS_BASIC_INFORMATION;
 
 typedef struct _PROCESS_ACCESS_TOKEN
 {

diff --git a/reactos/include/ndk/rtlfuncs.h b/reactos/include/ndk/rtlfuncs.h
index 210dd2f..18aa474 100644 (file)
--- a/reactos/include/ndk/rtlfuncs.h
+++ b/reactos/include/ndk/rtlfuncs.h
@@ -1690,6 +1690,18 @@ RtlDuplicateUnicodeString(
     OUT PUNICODE_STRING DestinationString
 );
 
+//
+// Memory Functions
+//
+NTSYSAPI
+VOID
+NTAPI
+RtlFillMemoryUlong(
+    IN PVOID Destination,
+    IN ULONG Length,
+    IN ULONG Fill
+);
+
 #endif
 
 NTSYSAPI
@@ -1912,18 +1924,6 @@ RtlLookupAtomInAtomTable(
     OUT PRTL_ATOM Atom
 );
 
-//
-// Memory Functions
-//
-NTSYSAPI
-VOID
-NTAPI
-RtlFillMemoryUlong(
-    IN PVOID Destination,
-    IN ULONG Length,
-    IN ULONG Fill
-);
-
 //
 // Process Management Functions
 //

diff --git a/reactos/include/psdk/usbioctl.h b/reactos/include/psdk/usbioctl.h
index 69541cb..d9aebda 100644 (file)
--- a/reactos/include/psdk/usbioctl.h
+++ b/reactos/include/psdk/usbioctl.h
@@ -665,6 +665,8 @@ typedef struct _USB_DEVICE_PERFORMANCE_INFO {
 
 #include <poppack.h>
 
+#endif /* USB_KERNEL_IOCTL */
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/reactos/subsystems/subsystems.rbuild b/reactos/subsystems/subsystems.rbuild
index 8dc8794..3bbdd8c 100644 (file)
--- a/reactos/subsystems/subsystems.rbuild
+++ b/reactos/subsystems/subsystems.rbuild
@@ -2,9 +2,9 @@
 <!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
        <if property="ARCH" value="i386">
-               <directory name="ntvdm">
-                       <xi:include href="ntvdm/ntvdm.rbuild" />
-               </directory>
+<directory name="ntvdm">
+       <xi:include href="ntvdm/ntvdm.rbuild" />
+</directory>
        </if>
 <directory name="win32">
        <xi:include href="win32/win32.rbuild" />