[greatlrd] 32267: fixet more building issue with trunk

Author: greatlrd
Date: Sun Feb 10 19:21:07 2008
New Revision: 32267

URL: http://svn.reactos.org/svn/reactos?rev=32267&view=rev
Log:
fixet more building issue with trunk

Modified:
    branches/reactx/reactos/include/dxsdk/ks.h

Modified: branches/reactx/reactos/include/dxsdk/ks.h
URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/include/dxsdk/ks....
==============================================================================
--- branches/reactx/reactos/include/dxsdk/ks.h (original)
+++ branches/reactx/reactos/include/dxsdk/ks.h Sun Feb 10 19:21:07 2008
@@ -601,11 +601,7 @@
         KSGRAPHMANAGER_FUNCTIONTABLE FunctionTable;
     } KSPROPERTY_GRAPHMANAGER_INTERFACE, *PKSPROPERTY_GRAPHMANAGER_INTERFACE;

-    typedef struct
-    {
-        ULONG Count;
-        PKSATTRIBUTE* Attributes;
-    } KSATTRIBUTE_LIST, *PKSATTRIBUTE_LIST;
+

#endif // DDK

@@ -1423,6 +1419,12 @@

typedef struct
     {
+        ULONG Count;
+        PKSATTRIBUTE* Attributes;
+    } KSATTRIBUTE_LIST, *PKSATTRIBUTE_LIST;
+
+    typedef struct
+    {
         ULONG InterfacesCount;
         const KSPIN_INTERFACE* Interfaces;
         ULONG MediumsCount;
@@ -1481,12 +1483,9 @@
     typedef VOID (*PFNKSDEFAULTFREE)(IN PVOID Context, IN PVOID Buffer);
     typedef NTSTATUS (*PFNKSINITIALIZEALLOCATOR)(IN PVOID InitialContext, IN PKSALLOCATOR_FRAMING AllocatorFraming, OUT PVOID* Context);
     typedef VOID (*PFNKSDELETEALLOCATOR)(IN PVOID Context);
-
-    typedef struct
-    {
-        PFNALLOCATOR_ALLOCATEFRAME AllocateFrame;
-        PFNALLOCATOR_FREEFRAME FreeFrame;
-    } KSSTREAMALLOCATOR_FUNCTIONTABLE, *PKSSTREAMALLOCATOR_FUNCTIONTABLE;
+    typedef LONGLONG (FASTCALL *PFNKSCLOCK_GETTIME)(IN PFILE_OBJECT FileObject);
+    typedef LONGLONG (FASTCALL *PFNKSCLOCK_CORRELATEDTIME)(IN PFILE_OBJECT FileObject, OUT PLONGLONG SystemTime);
+

typedef struct
     {
@@ -1711,9 +1710,7 @@
 #if defined(_NTDDK_)

typedef NTSTATUS (*PFNALLOCATOR_ALLOCATEFRAME)(IN PFILE_OBJECT FileObject, PVOID *Frame);
-    typedef VOID (*PFNALLOCATOR_FREEFRAME)(IN PFILE_OBJECT FileObject, IN PVOID Frame);
-    typedef LONGLONG (FASTCALL *PFNKSCLOCK_GETTIME)(IN PFILE_OBJECT FileObject);
-    typedef LONGLONG (FASTCALL *PFNKSCLOCK_CORRELATEDTIME)(IN PFILE_OBJECT FileObject, OUT PLONGLONG SystemTime);
+    typedef VOID (*PFNALLOCATOR_FREEFRAME)(IN PFILE_OBJECT FileObject, IN PVOID Frame);       
     typedef BOOLEAN (*PFNKSSETTIMER)(IN PVOID Context, IN PKTIMER Timer, IN LARGE_INTEGER DueTime, IN PKDPC Dpc);
     typedef BOOLEAN (*PFNKSCANCELTIMER)(IN PVOID Context, IN PKTIMER Timer);
     typedef LONGLONG (FASTCALL *PFNKSCORRELATEDTIME)(IN PVOID Context, OUT PLONGLONG SystemTime);
@@ -1723,8 +1720,12 @@
     typedef NTSTATUS (*PFNKSALLOCATOR)(IN PIRP Irp, IN ULONG BufferSize, IN BOOLEAN InputOperation);
     typedef BOOLEAN (*PFNKSFASTHANDLER)(IN PFILE_OBJECT FileObject, IN PKSIDENTIFIER Request, IN ULONG RequestLength,
                                         IN OUT PVOID Data, IN ULONG DataLength, OUT PIO_STATUS_BLOCK IoStatus);
-

+    typedef struct
+    {
+        PFNALLOCATOR_ALLOCATEFRAME AllocateFrame;
+        PFNALLOCATOR_FREEFRAME FreeFrame;
+    } KSSTREAMALLOCATOR_FUNCTIONTABLE, *PKSSTREAMALLOCATOR_FUNCTIONTABLE;

typedef struct
     {
@@ -1818,6 +1819,9 @@
         ULONG FastIoCount;
         const KSFASTMETHOD_ITEM*FastIoTable;
     } KSMETHOD_SET, *PKSMETHOD_SET;
+
+    typedef NTSTATUS (*PFNKSADDEVENT)(IN PIRP Irp, IN PKSEVENTDATA EventData, IN struct _KSEVENT_ENTRY* EventEntry);
+    typedef VOID (*PFNKSREMOVEEVENT)(IN PFILE_OBJECT FileObject, IN struct _KSEVENT_ENTRY* EventEntry );

typedef struct
     {
@@ -1898,6 +1902,10 @@
         PFAST_IO_WRITE FastWrite;
     } KSDISPATCH_TABLE, *PKSDISPATCH_TABLE;

+    typedef VOID (*PFNREFERENCEDEVICEOBJECT)(  IN PVOID Context );
+    typedef  VOID (*PFNDEREFERENCEDEVICEOBJECT)( IN PVOID Context );
+    typedef NTSTATUS (*PFNQUERYREFERENCESTRING)( IN PVOID Context, IN OUT PWCHAR *String);
+
     typedef struct
     {
         INTERFACE Interface;
@@ -1906,13 +1914,10 @@
         PFNQUERYREFERENCESTRING QueryReferenceString;
     } BUS_INTERFACE_REFERENCE, *PBUS_INTERFACE_REFERENCE;

-    typedef NTSTATUS (*PFNKSADDEVENT)(IN PIRP Irp, IN PKSEVENTDATA EventData, IN struct _KSEVENT_ENTRY* EventEntry);
-    typedef VOID (*PFNKSREMOVEEVENT)(IN PFILE_OBJECT FileObject, IN struct _KSEVENT_ENTRY* EventEntry );
+    
+   
     typedef VOID (*PFNKSITEMFREECALLBACK)( IN PKSOBJECT_CREATE_ITEM CreateItem );
-    typedef NTSTATUS (*PFNKSIRPLISTCALLBACK)( IN PIRP Irp, IN PVOID Context );
-    typedef VOID (*PFNREFERENCEDEVICEOBJECT)(  IN PVOID Context );
-    typedef  VOID (*PFNDEREFERENCEDEVICEOBJECT)( IN PVOID Context );
-    typedef NTSTATUS (*PFNQUERYREFERENCESTRING)( IN PVOID Context, IN OUT PWCHAR *String);
+    typedef NTSTATUS (*PFNKSIRPLISTCALLBACK)( IN PIRP Irp, IN PVOID Context );            
     typedef NTSTATUS (*PFNQUERYMEDIUMSLIST)( IN PVOID Context, OUT ULONG* MediumsCount, OUT PKSPIN_MEDIUM* MediumList);

@@ -2186,6 +2191,7 @@
         PFNQUERYMEDIUMSLIST QueryMediumsList;
     } BUS_INTERFACE_MEDIUMS, *PBUS_INTERFACE_MEDIUMS;

+    
     struct KSAUTOMATION_TABLE_
     {
         ULONG PropertySetsCount;
@@ -2201,6 +2207,7 @@
             PVOID Alignment;
         #endif
     } KSAUTOMATION_TABLE, *PKSAUTOMATION_TABLE;
+    #define DEFINE_KSAUTOMATION_TABLE(table)        const KSAUTOMATION_TABLE table =

struct _KSDEVICE_DISPATCH
     {
@@ -2355,7 +2362,7 @@
         KSSTATE ClientState;
     };

-    #define DEFINE_KSAUTOMATION_TABLE(table)        const KSAUTOMATION_TABLE table =
+    
     #define DEFINE_KSAUTOMATION_PROPERTIES(table)   SIZEOF_ARRAY(table), sizeof(KSPROPERTY_ITEM), table
     #define DEFINE_KSAUTOMATION_METHODS(table)      SIZEOF_ARRAY(table), sizeof(KSMETHOD_ITEM), table
     #define DEFINE_KSAUTOMATION_EVENTS(table)       SIZEOF_ARRAY(table), sizeof(KSEVENT_ITEM), table