[ros-diffs] [janderwald] 40711: - Fix warning - Fix KSALLOCATOR_FRAMING structure

Author: janderwald
Date: Mon Apr 27 04:15:52 2009
New Revision: 40711

URL: http://svn.reactos.org/svn/reactos?rev=40711&view=rev
Log:
- Fix warning
- Fix KSALLOCATOR_FRAMING structure

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

Modified: trunk/reactos/include/ddk/drmk.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/drmk.h?rev=407…
==============================================================================
--- trunk/reactos/include/ddk/drmk.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/drmk.h [iso-8859-1] Mon Apr 27 04:15:52 2009
@@ -82,6 +82,9 @@
 DEFINE_GUID(IID_IDrmAudioStream,
     0x1915c967, 0x3299, 0x48cb, 0xa3, 0xe4, 0x69, 0xfd, 0x1d, 0x1b, 0x30, 0x6e);
 
+#undef INTERFACE
+#define INTERFACE IDrmAudioStream
+
 DECLARE_INTERFACE_(IDrmAudioStream, IUnknown)
 {
     STDMETHOD_(NTSTATUS, QueryInterface)(THIS_

Modified: trunk/reactos/include/psdk/ks.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=4071…
==============================================================================
--- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Mon Apr 27 04:15:52 2009
@@ -1417,6 +1417,19 @@
 
 typedef struct
 {
+    union {
+        ULONG       OptionsFlags;
+        ULONG       RequirementsFlags;
+    };
+#if defined(_NTDDK_)
+    POOL_TYPE   PoolType;
+#else
+    ULONG       PoolType;
+#endif 
+    ULONG       Frames;
+    ULONG       FrameSize;
+    ULONG       FileAlignment;
+    ULONG       Reserved;
 } KSALLOCATOR_FRAMING, *PKSALLOCATOR_FRAMING;
 
 typedef struct