From dc97dbb8671762e129a1b7279c7dc858260157f3 Mon Sep 17 00:00:00 2001 From: Johannes Anderwald Date: Mon, 27 Apr 2009 00:15:52 +0000 Subject: [PATCH] - Fix warning - Fix KSALLOCATOR_FRAMING structure svn path=/trunk/; revision=40711 --- reactos/include/ddk/drmk.h | 3 +++ reactos/include/psdk/ks.h | 13 +++++++++++++ 2 files changed, 16 insertions(+) diff --git a/reactos/include/ddk/drmk.h b/reactos/include/ddk/drmk.h index d4bee5af530..2c400b436da 100644 --- a/reactos/include/ddk/drmk.h +++ b/reactos/include/ddk/drmk.h @@ -82,6 +82,9 @@ DrmGetContentRights( 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_ diff --git a/reactos/include/psdk/ks.h b/reactos/include/psdk/ks.h index 8a489f14400..decc544a9f0 100644 --- a/reactos/include/psdk/ks.h +++ b/reactos/include/psdk/ks.h @@ -1417,6 +1417,19 @@ typedef struct 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