[MMENT4]

* Remove one time inclusions from the main header and put them back where they belong.
* Cleanup the main header.
CORE-7716

svn path=/trunk/; revision=61512

diff --git a/reactos/lib/drivers/sound/mment4/control.c b/reactos/lib/drivers/sound/mment4/control.c
index 66a5c09..d454bea 100644 (file)
--- a/reactos/lib/drivers/sound/mment4/control.c
+++ b/reactos/lib/drivers/sound/mment4/control.c
@@ -8,9 +8,11 @@
  * PROGRAMMERS: Andrew Greenwood (silverblade@reactos.org)
 */
 
  * PROGRAMMERS: Andrew Greenwood (silverblade@reactos.org)
 */
 

-#define NDEBUG

 #include "precomp.h"
 
 #include "precomp.h"
 

+#include <winioctl.h>
+#include <ntddsnd.h>
+

 /*
     Convenience routine for getting the path of a device and opening it.
 */
 /*
     Convenience routine for getting the path of a device and opening it.
 */

diff --git a/reactos/lib/drivers/sound/mment4/detect.c b/reactos/lib/drivers/sound/mment4/detect.c
index dd5d9ac..2daa8b4 100644 (file)
--- a/reactos/lib/drivers/sound/mment4/detect.c
+++ b/reactos/lib/drivers/sound/mment4/detect.c
@@ -13,6 +13,8 @@
 
 #include "precomp.h"
 
 
 #include "precomp.h"
 

+#include <mment4.h>
+

 /*
     This is the "nice" way to discover audio devices in NT4 - go into the
     service registry key and enumerate the Parameters\Device*\Devices
 /*
     This is the "nice" way to discover audio devices in NT4 - go into the
     service registry key and enumerate the Parameters\Device*\Devices

diff --git a/reactos/lib/drivers/sound/mment4/precomp.h b/reactos/lib/drivers/sound/mment4/precomp.h
index cece5d1..848b5c8 100644 (file)
--- a/reactos/lib/drivers/sound/mment4/precomp.h
+++ b/reactos/lib/drivers/sound/mment4/precomp.h
@@ -1,8 +1,9 @@
-#include <windows.h>
-#include <mmsystem.h>
+#include <stdarg.h>
+#include <windef.h>
+#include <winbase.h>
+#include <winreg.h>
+#include <winuser.h>

 #include <mmddk.h>
 #include <mmddk.h>

-#include <ntddsnd.h>

 #include <sndnames.h>
 #include <sndtypes.h>
 #include <mmebuddy.h>
 #include <sndnames.h>
 #include <sndtypes.h>
 #include <mmebuddy.h>

-#include <mment4.h>