[akhaldi] 61395: [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

Author: akhaldi
Date: Wed Dec 25 10:39:58 2013
New Revision: 61395

URL: http://svn.reactos.org/svn/reactos?rev=61395&view=rev
Log:
[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

Modified:
    trunk/reactos/dll/win32/mmdrv/common.c
    trunk/reactos/dll/win32/mmdrv/entry.c
    trunk/reactos/dll/win32/mmdrv/kernel.c
    trunk/reactos/dll/win32/mmdrv/mmddk.h
    trunk/reactos/dll/win32/mmdrv/mmdef.h
    trunk/reactos/dll/win32/mmdrv/mmdrv.h
    trunk/reactos/dll/win32/mmdrv/mme.c
    trunk/reactos/dll/win32/mmdrv/mmioctl.h
    trunk/reactos/dll/win32/mmdrv/session.c
    trunk/reactos/dll/win32/mmdrv/utils.c
    trunk/reactos/dll/win32/mmdrv/wave.c
    trunk/reactos/dll/win32/mmdrv/wave.h
    trunk/reactos/dll/win32/mmdrv/wave_io.c

Modified: trunk/reactos/dll/win32/mmdrv/common.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/common.c?r…
==============================================================================
--- trunk/reactos/dll/win32/mmdrv/common.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mmdrv/common.c	[iso-8859-1] Wed Dec 25 10:39:58 2013
@@ -11,6 +11,9 @@
 
 #include "mmdrv.h"
 
+#define NDEBUG
+#include <debug.h>
+
 /*
     Translates errors to MMRESULT codes.
 */

Modified: trunk/reactos/dll/win32/mmdrv/entry.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/entry.c?re…
==============================================================================
--- trunk/reactos/dll/win32/mmdrv/entry.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mmdrv/entry.c	[iso-8859-1] Wed Dec 25 10:39:58 2013
@@ -11,6 +11,8 @@
 
 #include "mmdrv.h"
 
+#define NDEBUG
+#include <debug.h>
 
 /*
     Nothing particularly special happens here.

Modified: trunk/reactos/dll/win32/mmdrv/kernel.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/kernel.c?r…
==============================================================================
--- trunk/reactos/dll/win32/mmdrv/kernel.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mmdrv/kernel.c	[iso-8859-1] Wed Dec 25 10:39:58 2013
@@ -10,6 +10,11 @@
  */
 
 #include "mmdrv.h"
+
+#include <winuser.h>
+
+#define NDEBUG
+#include <debug.h>
 
 /*
     Devices that we provide access to follow a standard naming convention.

Modified: trunk/reactos/dll/win32/mmdrv/mmddk.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/mmddk.h?re…
==============================================================================
--- trunk/reactos/dll/win32/mmdrv/mmddk.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mmdrv/mmddk.h	[iso-8859-1] Wed Dec 25 10:39:58 2013
@@ -27,7 +27,6 @@
 #define __MMDDK_H
 
 #include <mmsystem.h>
-//#include <winbase.h>
 
 typedef VOID (TASKCALLBACK) (DWORD dwInst);
 

Modified: trunk/reactos/dll/win32/mmdrv/mmdef.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/mmdef.h?re…
==============================================================================
--- trunk/reactos/dll/win32/mmdrv/mmdef.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mmdrv/mmdef.h	[iso-8859-1] Wed Dec 25 10:39:58 2013
@@ -16,17 +16,8 @@
 #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

Modified: trunk/reactos/dll/win32/mmdrv/mmdrv.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/mmdrv.h?re…
==============================================================================
--- trunk/reactos/dll/win32/mmdrv/mmdrv.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mmdrv/mmdrv.h	[iso-8859-1] Wed Dec 25 10:39:58 2013
@@ -14,14 +14,16 @@
 #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

Modified: trunk/reactos/dll/win32/mmdrv/mme.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/mme.c?rev=…
==============================================================================
--- trunk/reactos/dll/win32/mmdrv/mme.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mmdrv/mme.c	[iso-8859-1] Wed Dec 25 10:39:58 2013
@@ -11,6 +11,9 @@
  */
 
 #include "mmdrv.h"
+
+#define NDEBUG
+#include <debug.h>
 
 /*
     Sends a message to the client (application), such as WOM_DONE. This

Modified: trunk/reactos/dll/win32/mmdrv/mmioctl.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/mmioctl.h?…
==============================================================================
--- trunk/reactos/dll/win32/mmdrv/mmioctl.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mmdrv/mmioctl.h	[iso-8859-1] Wed Dec 25 10:39:58 2013
@@ -11,12 +11,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

Modified: trunk/reactos/dll/win32/mmdrv/session.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/session.c?…
==============================================================================
--- trunk/reactos/dll/win32/mmdrv/session.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mmdrv/session.c	[iso-8859-1] Wed Dec 25 10:39:58 2013
@@ -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;

Modified: trunk/reactos/dll/win32/mmdrv/utils.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/utils.c?re…
==============================================================================
--- trunk/reactos/dll/win32/mmdrv/utils.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mmdrv/utils.c	[iso-8859-1] Wed Dec 25 10:39:58 2013
@@ -9,7 +9,7 @@
  *                       Jan 30, 2004: Imported into ReactOS tree
  */
 
-//#include "mmdrv.h"
+#include "mmdrv.h"
 
 #define NDEBUG
 #include <debug.h>

Modified: trunk/reactos/dll/win32/mmdrv/wave.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/wave.c?rev…
==============================================================================
--- trunk/reactos/dll/win32/mmdrv/wave.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mmdrv/wave.c	[iso-8859-1] Wed Dec 25 10:39:58 2013
@@ -12,6 +12,8 @@
 
 #include "mmdrv.h"
 
+#define NDEBUG
+#include <debug.h>
 
 #define MAX_WAVE_BUFFER_SIZE    65536
 

Modified: trunk/reactos/dll/win32/mmdrv/wave.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/wave.h?rev…
==============================================================================
--- trunk/reactos/dll/win32/mmdrv/wave.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mmdrv/wave.h	[iso-8859-1] Wed Dec 25 10:39:58 2013
@@ -1,3 +1,4 @@
+#pragma once
 
 // FIXME: Should be moved somewhere else?
 typedef struct _WAVE_DD_VOLUME {

Modified: trunk/reactos/dll/win32/mmdrv/wave_io.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mmdrv/wave_io.c?…
==============================================================================
--- trunk/reactos/dll/win32/mmdrv/wave_io.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/mmdrv/wave_io.c	[iso-8859-1] Wed Dec 25 10:39:58 2013
@@ -3,6 +3,9 @@
 */
 
 #include "mmdrv.h"
+
+#define NDEBUG
+#include <debug.h>
 
 /*
     Complete a partial wave buffer transaction