Author: tfaber
Date: Thu Oct 13 09:21:57 2016
New Revision: 72963
URL: http://svn.reactos.org/svn/reactos?rev=72963&view=rev
Log:
[PSDK]
- ksmedia.h requires ks.h to be included first. Based on a patch by Lee
Schroeder.
CORE-6783
Modified:
trunk/reactos/base/services/audiosrv/pnp.c
trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h
trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c
trunk/reactos/sdk/include/psdk/ksmedia.h
trunk/reactos/sdk/lib/drivers/sound/mmixer/precomp.h
trunk/rostests/winetests/amstream/amstream.c
trunk/rostests/winetests/dsound/ds3d8.c
trunk/rostests/winetests/dsound/dsound.c
trunk/rostests/winetests/dsound/dsound8.c
Modified: trunk/reactos/base/services/audiosrv/pnp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/audiosrv/pnp.c?rev=72963&r1=72962&r2=72963&view=diff
==============================================================================
--- trunk/reactos/base/services/audiosrv/pnp.c [iso-8859-1] (original)
+++ trunk/reactos/base/services/audiosrv/pnp.c [iso-8859-1] Thu Oct 13
09:21:57 2016
@@ -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;
Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h?rev=72963&r1=72962&r2=72963&view=diff
==============================================================================
--- trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/wdmaud.drv/wdmaud.h [iso-8859-1] Thu Oct 13
09:21:57 2016
@@ -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>
Modified: trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c?rev=72963&r1=72962&r2=72963&view=diff
==============================================================================
--- trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c
[iso-8859-1] (original)
+++ trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c
[iso-8859-1] Thu Oct 13 09:21:57 2016
@@ -8,6 +8,7 @@
#include <math.h>
#include <setupapi.h>
#include <ndk/umtypes.h>
+#include <ks.h>
#include <ksmedia.h>
#include "interface.h"
Modified: trunk/reactos/sdk/include/psdk/ksmedia.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/ksmedia.h?rev=72963&r1=72962&r2=72963&view=diff
==============================================================================
--- trunk/reactos/sdk/include/psdk/ksmedia.h [iso-8859-1] (original)
+++ trunk/reactos/sdk/include/psdk/ksmedia.h [iso-8859-1] Thu Oct 13
09:21:57 2016
@@ -5,10 +5,12 @@
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
Modified: trunk/reactos/sdk/lib/drivers/sound/mmixer/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/drivers/sound/mmixer/precomp.h?rev=72963&r1=72962&r2=72963&view=diff
==============================================================================
--- trunk/reactos/sdk/lib/drivers/sound/mmixer/precomp.h [iso-8859-1]
(original)
+++ trunk/reactos/sdk/lib/drivers/sound/mmixer/precomp.h [iso-8859-1]
Thu Oct 13 09:21:57 2016
@@ -5,6 +5,7 @@
#include <windef.h>
#define NOBITMAP
#include <mmreg.h>
+#include <ks.h>
#include <ksmedia.h>
#include <mmsystem.h>
Modified: trunk/rostests/winetests/amstream/amstream.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/amstream/amstream.c?rev=72963&r1=72962&r2=72963&view=diff
==============================================================================
--- trunk/rostests/winetests/amstream/amstream.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/amstream/amstream.c [iso-8859-1] Thu Oct 13
09:21:57 2016
@@ -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>
Modified: trunk/rostests/winetests/dsound/ds3d8.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dsound/ds3d8.c?rev=72963&r1=72962&r2=72963&view=diff
==============================================================================
--- trunk/rostests/winetests/dsound/ds3d8.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/dsound/ds3d8.c [iso-8859-1] Thu Oct 13
09:21:57 2016
@@ -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"
Modified: trunk/rostests/winetests/dsound/dsound.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dsound/dsound.c?rev=72963&r1=72962&r2=72963&view=diff
==============================================================================
--- trunk/rostests/winetests/dsound/dsound.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/dsound/dsound.c [iso-8859-1] Thu Oct 13
09:21:57 2016
@@ -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"
Modified: trunk/rostests/winetests/dsound/dsound8.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/dsound/dsound8.c?rev=72963&r1=72962&r2=72963&view=diff
==============================================================================
--- trunk/rostests/winetests/dsound/dsound8.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/dsound/dsound8.c [iso-8859-1] Thu Oct 13
09:21:57 2016
@@ -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>
