[ros-diffs] [janderwald] 39632: - Fix build

Author: janderwald
Date: Mon Feb 16 18:39:40 2009
New Revision: 39632

URL: http://svn.reactos.org/svn/reactos?rev=39632&view=rev
Log:
- Fix build

Modified:
    trunk/reactos/include/psdk/ks.h

Modified: trunk/reactos/include/psdk/ks.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=39632...
==============================================================================
--- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Mon Feb 16 18:39:40 2009
@@ -1198,6 +1198,18 @@

typedef struct
 {
+} KSPROPERTY_POSITIONS, *PKSPROPERTY_POSITIONS;
+
+typedef struct
+{
+} KSPROPERTY_SERIAL, *PKSPROPERTY_SERIAL;
+
+typedef struct
+{
+} KSPROPERTY_SERIALHDR, *PKSPROPERTY_SERIALHDR;
+
+typedef struct
+{
 } KSPROPERTY_BOUNDS_LONG, *PKSPROPERTY_BOUNDS_LONG;

typedef struct
@@ -1207,6 +1219,10 @@
 typedef struct
 {
 } KSPROPERTY_DESCRIPTION, *PKSPROPERTY_DESCRIPTION;
+
+typedef struct
+{
+} KSPROPERTY_MEDIAAVAILABLE, *PKSPROPERTY_MEDIAAVAILABLE;

typedef struct
@@ -1228,6 +1244,7 @@
     const KSPROPERTY_MEMBERSLIST*   MembersList;
 } KSPROPERTY_VALUES, *PKSPROPERTY_VALUES;

+#if defined(_NTDDK_)
 typedef NTSTATUS (*PFNKSHANDLER)(
     IN  PIRP Irp,
     IN  PKSIDENTIFIER Request,
@@ -1254,23 +1271,6 @@
     ULONG SerializedSize;
 } KSPROPERTY_ITEM, *PKSPROPERTY_ITEM;

-typedef struct
-{
-} KSPROPERTY_MEDIAAVAILABLE, *PKSPROPERTY_MEDIAAVAILABLE;
-
-
-
-typedef struct
-{
-} KSPROPERTY_POSITIONS, *PKSPROPERTY_POSITIONS;
-
-typedef struct
-{
-} KSPROPERTY_SERIAL, *PKSPROPERTY_SERIAL;
-
-typedef struct
-{
-} KSPROPERTY_SERIALHDR, *PKSPROPERTY_SERIALHDR;

typedef
 BOOLEAN
@@ -1305,6 +1305,8 @@
     const KSFASTPROPERTY_ITEM* FastIoTable;
 } KSPROPERTY_SET, *PKSPROPERTY_SET;

+#endif
+
 typedef struct
 {
 } KSPROPERTY_STEPPING_LONG, *PKSPROPERTY_STEPPING_LONG;
@@ -1530,6 +1532,8 @@
 typedef struct
 {
 } KSPIN_DISPATCH, *PKSPIN_DISPATCH;
+
+#if defined(_NTDDK_)

typedef struct
 {
@@ -1547,8 +1551,27 @@
 #endif
 } KSAUTOMATION_TABLE, *PKSAUTOMATION_TABLE;

-typedef struct
-{
+
+
+typedef struct
+{
+    ULONG                   InterfacesCount;
+    const KSPIN_INTERFACE*  Interfaces;
+    ULONG                   MediumsCount;
+    const KSPIN_MEDIUM*     Mediums;
+    ULONG                   DataRangesCount;
+    const PKSDATARANGE*     DataRanges;
+    KSPIN_DATAFLOW          DataFlow;
+    KSPIN_COMMUNICATION     Communication;
+    const GUID*             Category;
+    const GUID*             Name;
+    union {
+        LONGLONG            Reserved;
+        struct {
+            ULONG           ConstrainedDataRangesCount;
+            PKSDATARANGE*   ConstrainedDataRanges;
+        };
+    };
 } KSPIN_DESCRIPTOR, *PKSPIN_DESCRIPTOR;

/* TODO */
@@ -1611,16 +1634,6 @@
     KSSTATE ClientState;
 } KSPIN, *PKSPIN;

-typedef struct
-{
-    KSPIN_INTERFACE Interface;
-    KSPIN_MEDIUM Medium;
-    ULONG PinId;
-    HANDLE PinToHandle;
-    KSPRIORITY Priority;
-} KSPIN_CONNECT, *PKSPIN_CONNECT;
-
-
 #define DEFINE_KSPROPERTY_ITEM_PIN_CINSTANCES(Handler)\
     DEFINE_KSPROPERTY_ITEM(\
         KSPROPERTY_PIN_CINSTANCES,\
@@ -1784,6 +1797,17 @@

#define DEFINE_KSPROPERTY_TABLE(tablename)\
     const KSPROPERTY_ITEM tablename[] =
+
+#endif
+
+typedef struct
+{
+    KSPIN_INTERFACE Interface;
+    KSPIN_MEDIUM Medium;
+    ULONG PinId;
+    HANDLE PinToHandle;
+    KSPRIORITY Priority;
+} KSPIN_CONNECT, *PKSPIN_CONNECT;

/* ===============================================================
     Topology