From 4b9d31d916a876cb2d14097f90aeec5d866ca952 Mon Sep 17 00:00:00 2001
From: Thomas Faber <thomas.faber@reactos.org>
Date: Thu, 13 Oct 2016 09:21:57 +0000
Subject: [PATCH] [PSDK] - ksmedia.h requires ks.h to be included first. Based
 on a patch by Lee Schroeder. CORE-6783

svn path=/trunk/; revision=72963
---
 reactos/base/services/audiosrv/pnp.c                      | 1 +
 reactos/dll/win32/wdmaud.drv/wdmaud.h                     | 1 +
 reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c | 1 +
 reactos/sdk/include/psdk/ksmedia.h                        | 6 ++++--
 reactos/sdk/lib/drivers/sound/mmixer/precomp.h            | 1 +
 rostests/winetests/amstream/amstream.c                    | 1 +
 rostests/winetests/dsound/ds3d8.c                         | 2 +-
 rostests/winetests/dsound/dsound.c                        | 2 +-
 rostests/winetests/dsound/dsound8.c                       | 2 +-
 9 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/reactos/base/services/audiosrv/pnp.c b/reactos/base/services/audiosrv/pnp.c
index 8ab76fbf9da..764c4215baf 100644
--- a/reactos/base/services/audiosrv/pnp.c
+++ b/reactos/base/services/audiosrv/pnp.c
@@ -12,6 +12,7 @@
 #include <winuser.h>
 #include <mmsystem.h>
 #include <setupapi.h>
+#include <ks.h>
 #include <ksmedia.h>
 
 static HDEVNOTIFY device_notification_handle = NULL;
diff --git a/reactos/dll/win32/wdmaud.drv/wdmaud.h b/reactos/dll/win32/wdmaud.drv/wdmaud.h
index 4b7dab93132..d3900b3adfa 100644
--- a/reactos/dll/win32/wdmaud.drv/wdmaud.h
+++ b/reactos/dll/win32/wdmaud.drv/wdmaud.h
@@ -14,6 +14,7 @@
 #include <winuser.h>
 #include <mmddk.h>
 #include <mmebuddy.h>
+#include <ks.h>
 #include <ksmedia.h>
 #include <interface.h>
 #include <devioctl.h>
diff --git a/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c b/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c
index 92b7f6514ac..c831595f24d 100644
--- a/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c
+++ b/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c
@@ -8,6 +8,7 @@
 #include <math.h>
 #include <setupapi.h>
 #include <ndk/umtypes.h>
+#include <ks.h>
 #include <ksmedia.h>
 #include "interface.h"
 
diff --git a/reactos/sdk/include/psdk/ksmedia.h b/reactos/sdk/include/psdk/ksmedia.h
index 148c76ba370..adfeef662e8 100644
--- a/reactos/sdk/include/psdk/ksmedia.h
+++ b/reactos/sdk/include/psdk/ksmedia.h
@@ -5,11 +5,13 @@
     Please see COPYING in the top level directory for license information.
 */
 
+#ifndef _KS_
+#error ks.h needs to be included before ksmedia.h
+#endif /* _KS_ */
+
 #ifndef KSMEDIA_H
 #define KSMEDIA_H
 
-#include <ks.h>
-
 /*
     KS CATEGORIES
 */
diff --git a/reactos/sdk/lib/drivers/sound/mmixer/precomp.h b/reactos/sdk/lib/drivers/sound/mmixer/precomp.h
index cf641b47164..5d6aaec2d6f 100644
--- a/reactos/sdk/lib/drivers/sound/mmixer/precomp.h
+++ b/reactos/sdk/lib/drivers/sound/mmixer/precomp.h
@@ -5,6 +5,7 @@
 #include <windef.h>
 #define NOBITMAP
 #include <mmreg.h>
+#include <ks.h>
 #include <ksmedia.h>
 #include <mmsystem.h>
 
diff --git a/rostests/winetests/amstream/amstream.c b/rostests/winetests/amstream/amstream.c
index ba1bbc511e6..0da89fbee42 100644
--- a/rostests/winetests/amstream/amstream.c
+++ b/rostests/winetests/amstream/amstream.c
@@ -30,6 +30,7 @@
 #include <vfwmsgs.h>
 #include <objbase.h>
 #include <mmreg.h>
+#include <ks.h>
 #include <ksmedia.h>
 #include <initguid.h>
 #include <amstream.h>
diff --git a/rostests/winetests/dsound/ds3d8.c b/rostests/winetests/dsound/ds3d8.c
index 9ad1d0fb50e..f18b362e07f 100644
--- a/rostests/winetests/dsound/ds3d8.c
+++ b/rostests/winetests/dsound/ds3d8.c
@@ -35,7 +35,7 @@
 #include <wingdi.h>
 #include <mmreg.h>
 #include <dsound.h>
-//#include "ks.h"
+#include <ks.h>
 #include <ksmedia.h>
 #include "dsound_test.h"
 
diff --git a/rostests/winetests/dsound/dsound.c b/rostests/winetests/dsound/dsound.c
index 577d707c50d..12f865a6cf4 100644
--- a/rostests/winetests/dsound/dsound.c
+++ b/rostests/winetests/dsound/dsound.c
@@ -38,7 +38,7 @@
 #include <dsound.h>
 #include <dsconf.h>
 //#include "initguid.h"
-//#include "ks.h"
+#include <ks.h>
 #include <ksmedia.h>
 
 #include "dsound_test.h"
diff --git a/rostests/winetests/dsound/dsound8.c b/rostests/winetests/dsound/dsound8.c
index 880357445a3..fd88441aac4 100644
--- a/rostests/winetests/dsound/dsound8.c
+++ b/rostests/winetests/dsound/dsound8.c
@@ -39,7 +39,7 @@
 #include <mmreg.h>
 #include <dsound.h>
 #include <dsconf.h>
-//#include "ks.h"
+#include <ks.h>
 #include <ksmedia.h>
 #include <initguid.h>
 #include <mmdeviceapi.h>