[MMDRV]

* Move some inclusions to the main header.
* Do not include debug.h into the main header.
* Remove inclusions and definitions that already exist in the main header.
CORE-7716

svn path=/trunk/; revision=61395

reactos/dll/win32/mmdrv/common.c

@@ -11,6 +11,9 @@
 
 #include "mmdrv.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /*
     Translates errors to MMRESULT codes.
 */

reactos/dll/win32/mmdrv/entry.c

@@ -11,6 +11,8 @@
 
 #include "mmdrv.h"
 
+#define NDEBUG
+#include <debug.h>
 
 /*
     Nothing particularly special happens here.

reactos/dll/win32/mmdrv/kernel.c

@@ -11,6 +11,11 @@
 
 #include "mmdrv.h"
 
+#include <winuser.h>
+
+#define NDEBUG
+#include <debug.h>
+
 /*
     Devices that we provide access to follow a standard naming convention.
     The first wave output, for example, appears as \Device\WaveOut0

reactos/dll/win32/mmdrv/mmddk.h

@@ -27,7 +27,6 @@
 #define __MMDDK_H
 
 #include <mmsystem.h>
-//#include <winbase.h>
 
 typedef VOID (TASKCALLBACK) (DWORD dwInst);
 

reactos/dll/win32/mmdrv/mmdef.h

@@ -16,18 +16,9 @@
 #define EXPORT __declspec(dllexport)
 
 
-//#include <stdio.h>
-//#include <windows.h>
-//#include <mmsystem.h>
-//#include <mmddk.h>
-
 // This needs to be done to get winioctl.h to work:
 //typedef unsigned __int64 DWORD64, *PDWORD64;
 
-//#include <winioctl.h>
-//#include "mmddk.h"
-
-
 #define SOUND_MAX_DEVICE_NAME 1024   // GUESSWORK
 #define SOUND_MAX_DEVICES 256       // GUESSWORK
 

reactos/dll/win32/mmdrv/mmdrv.h

@@ -14,15 +14,17 @@
 #ifndef MMDRV_H
 #define MMDRV_H
 
+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
-#define WIN32_LEAN_AND_MEAN
+
+#include <windef.h>
+#include <winbase.h>
+#include <winioctl.h>
 
 #include "mmioctl.h"
 #include "mmddk.h"
 
-//#include <stdio.h>
-#include <debug.h>
-
 /* Need to check these */
 #define MAX_DEVICES             256
 #define MAX_DEVICE_NAME_LENGTH  256

reactos/dll/win32/mmdrv/mme.c

@@ -12,6 +12,9 @@
 
 #include "mmdrv.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /*
     Sends a message to the client (application), such as WOM_DONE. This
     is just a wrapper around DriverCallback which translates the

reactos/dll/win32/mmdrv/mmioctl.h

@@ -12,12 +12,6 @@
 #ifndef MMDRV_IOCTLS
 #define MMDRV_IOCTLS
 
-#include <windows.h>
-//#include <mmsystem.h>
-//#include <mmddk.h>
-#include <winioctl.h>
-
-
 /*
     Base names of the supported devices, as provided by drivers running in
     kernel mode.

reactos/dll/win32/mmdrv/session.c

@@ -11,6 +11,9 @@
 
 #include "mmdrv.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /* Each session is tracked, but the list must be locked when in use  */
 
 SessionInfo* session_list = NULL;

reactos/dll/win32/mmdrv/utils.c

@@ -9,7 +9,7 @@
  *                       Jan 30, 2004: Imported into ReactOS tree
  */
 
-//#include "mmdrv.h"
+#include "mmdrv.h"
 
 #define NDEBUG
 #include <debug.h>

reactos/dll/win32/mmdrv/wave.c

@@ -12,6 +12,8 @@
 
 #include "mmdrv.h"
 
+#define NDEBUG
+#include <debug.h>
 
 #define MAX_WAVE_BUFFER_SIZE    65536
 

reactos/dll/win32/mmdrv/wave.h

@@ -1,3 +1,4 @@
+#pragma once
 
 // FIXME: Should be moved somewhere else?
 typedef struct _WAVE_DD_VOLUME {

reactos/dll/win32/mmdrv/wave_io.c

@@ -4,6 +4,9 @@
 
 #include "mmdrv.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /*
     Complete a partial wave buffer transaction
 */